[SVN] r702 - in /branches/cyrus23: ./ cyrus-imapd-2.3-2.3.8/
cyrus-imapd-2.3-2.3.8/CVS/ cyrus-imapd-2.3-2.3.8/IMAP-Cyrus/
cyrus-imapd-2.3-2.3.8/IMAP-Cyrus/Cyrus/
cyrus-imapd-2.3-2.3.8/IMAP-Cyrus/examples/
cyrus-imapd-2.3-2.3.8/IMAP-Cyrus/t/ cyrus-imapd-2.3-2.3.8/SIEVE-Cyrus/
cyrus-imapd-2.3-2.3.8/SIEVE/ cyrus-imapd-2.3-2.3.8/SIEVE/Cyrus/
cyrus-imapd-2.3-2.3.8/SIEVE/acap/ cyrus-imapd-2.3-2.3.8/SIEVE/scripts/
cyrus-imapd-2.3-2.3.8/SIEVE/timsieved/ cyrus-imapd-2.3-2.3.8/acap/
cyrus-imapd-2.3-2.3.8/amssync/ cyrus-imapd-2.3-2.3.8/cmulocal-old/
cyrus-imapd-2.3-2.3.8/cmulocal/ cyrus-imapd-2.3-2.3.8/cmulocal/CVS/
cyrus-imapd-2.3-2.3.8/contrib/ cyrus-imapd-2.3-2.3.8/contrib/CVS/
cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/CVS/
cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/cgi-bin/CVS/
cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/html/CVS/
cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/script/CVS/
cyrus-imapd-2.3-2.3.8/contrib/notify_unix/CVS/
cyrus-imapd-2.3-2.3.8/cyradm/ cyrus-imapd-2.3-2.3.8/debian/
cyrus-imapd-2.3-2.3.8/debian/patches/ cyrus-imapd-2.3-2.3.8/depot/
cyrus-imapd-2.3-2.3.8/depot/CVS/ cyrus-imapd-2.3-2.3.8/doc/
cyrus-imapd-2.3-2.3.8/doc/CVS/ cyrus-imapd-2.3-2.3.8/doc/html/
cyrus-imapd-2.3-2.3.8/doc/internal/ cyrus-imapd-2.3-2.3.8/doc/internal/CVS/
cyrus-imapd-2.3-2.3.8/doc/text/CVS/ cyrus-imapd-2.3-2.3.8/et/CVS/
cyrus-imapd-2.3-2.3.8/imap/ cyrus-imapd-2.3-2.3.8/imap/CVS/
cyrus-imapd-2.3-2.3.8/imtest/ cyrus-imapd-2.3-2.3.8/imtest/CVS/
cyrus-imapd-2.3-2.3.8/installsieve/CVS/ cyrus-imapd-2.3-2.3.8/lib/
cyrus-imapd-2.3-2.3.8/lib/CVS/ cyrus-imapd-2.3-2.3.8/lib/charset/CVS/
cyrus-imapd-2.3-2.3.8/lib/test/CVS/ cyrus-imapd-2.3-2.3.8/makedepend/CVS/
cyrus-imapd-2.3-2.3.8/man/ cyrus-imapd-2.3-2.3.8/man/CVS/
cyrus-imapd-2.3-2.3.8/master/ cyrus-imapd-2.3-2.3.8/master/CVS/
cyrus-imapd-2.3-2.3.8/master/conf/CVS/ cyrus-imapd-2.3-2.3.8/netnews/
cyrus-imapd-2.3-2.3.8/netnews/CVS/ cyrus-imapd-2.3-2.3.8/notifyd/
cyrus-imapd-2.3-2.3.8/notifyd/CVS/ cyrus-imapd-2.3-2.3.8/perl/CVS/
cyrus-imapd-2.3-2.3.8/perl/imap/ cyrus-imapd-2.3-2.3.8/perl/imap/CVS/
cyrus-imapd-2.3-2.3.8/perl/imap/Cyrus/ cyrus-imapd-2.3-2.3.8/perl/imap/IMAP/
cyrus-imapd-2.3-2.3.8/perl/imap/IMAP/CVS/
cyrus-imapd-2.3-2.3.8/perl/imap/examples/
cyrus-imapd-2.3-2.3.8/perl/imap/examples/CVS/
cyrus-imapd-2.3-2.3.8/perl/imap/t/CVS/ cyrus-imapd-2.3-2.3.8/perl/sieve/CVS/
cyrus-imapd-2.3-2.3.8/perl/sieve/acap/ cyrus-imapd-2.3-2.3.8/perl/sieve/lib/
cyrus-imapd-2.3-2.3.8/perl/sieve/lib/CVS/
cyrus-imapd-2.3-2.3.8/perl/sieve/managesieve/
cyrus-imapd-2.3-2.3.8/perl/sieve/managesieve/CVS/
cyrus-imapd-2.3-2.3.8/perl/sieve/scripts/
cyrus-imapd-2.3-2.3.8/perl/sieve/scripts/CVS/
cyrus-imapd-2.3-2.3.8/ptclient/ cyrus-imapd-2.3-2.3.8/ptclient/CVS/
cyrus-imapd-2.3-2.3.8/pwcheck/ cyrus-imapd-2.3-2.3.8/sieve/
cyrus-imapd-2.3-2.3.8/sieve/CVS/ cyrus-imapd-2.3-2.3.8/sieve/tests/CVS/
cyrus-imapd-2.3-2.3.8/sieve/tests/action/CVS/
cyrus-imapd-2.3-2.3.8/sieve/tests/action/serverm/CVS/
cyrus-imapd-2.3-2.3.8/sieve/tests/action/testm/CVS/
cyrus-imapd-2.3-2.3.8/sieve/tests/actionExtensions/CVS/
cyrus-imapd-2.3-2.3.8/sieve/tests/actionExtensions/serverm/CVS/
cyrus-imapd-2.3-2.3.8/sieve/tests/actionExtensions/testm/CVS/
cyrus-imapd-2.3-2.3.8/sieve/tests/test/CVS/
cyrus-imapd-2.3-2.3.8/sieve/tests/test/serverm/CVS/
cyrus-imapd-2.3-2.3.8/sieve/tests/test/testm/CVS/
cyrus-imapd-2.3-2.3.8/sieve/tests/testExtension/CVS/
cyrus-imapd-2.3-2.3.8/sieve/tests/testExtension/serverm/CVS/
cyrus-imapd-2.3-2.3.8/sieve/tests/testExtension/testm/CVS/
cyrus-imapd-2.3-2.3.8/snmp/ cyrus-imapd-2.3-2.3.8/snmp/CVS/
cyrus-imapd-2.3-2.3.8/syslog/CVS/ cyrus-imapd-2.3-2.3.8/timsieved/
cyrus-imapd-2.3-2.3.8/timsieved/CVS/ cyrus-imapd-2.3-2.3.8/tools/
cyrus-imapd-2.3-2.3.8/tools/CVS/
debian at incase.de
debian at incase.de
Tue Feb 27 04:17:22 CET 2007
Author: sven
Date: Tue Feb 27 04:17:11 2007
New Revision: 702
URL: https://mail.incase.de/viewcvs?rev=702&root=cyrus22&view=rev
Log:
Add cyrus-imapd 2.3.8, updated all patches to apply
Added:
branches/cyrus23/cyrus-imapd-2.3-2.3.8/
- copied from r688, branches/cyrus23/cyrus-imapd-2.3-2.3.7/
branches/cyrus23/cyrus-imapd-2.3-2.3.8/IMAP-Cyrus/
branches/cyrus23/cyrus-imapd-2.3-2.3.8/IMAP-Cyrus/Cyrus/
branches/cyrus23/cyrus-imapd-2.3-2.3.8/IMAP-Cyrus/examples/
branches/cyrus23/cyrus-imapd-2.3-2.3.8/IMAP-Cyrus/t/
branches/cyrus23/cyrus-imapd-2.3-2.3.8/SIEVE/
branches/cyrus23/cyrus-imapd-2.3-2.3.8/SIEVE-Cyrus/
branches/cyrus23/cyrus-imapd-2.3-2.3.8/SIEVE/Cyrus/
branches/cyrus23/cyrus-imapd-2.3-2.3.8/SIEVE/acap/
branches/cyrus23/cyrus-imapd-2.3-2.3.8/SIEVE/scripts/
branches/cyrus23/cyrus-imapd-2.3-2.3.8/SIEVE/timsieved/
branches/cyrus23/cyrus-imapd-2.3-2.3.8/acap/
branches/cyrus23/cyrus-imapd-2.3-2.3.8/amssync/
branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal-old/
branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/CVS/Entries.Log
branches/cyrus23/cyrus-imapd-2.3-2.3.8/cyradm/
branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/CVS/Entries.Log
branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/html/
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/cyr_dbtool.c (with props)
branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/Cyrus/
branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/CVS/Entries.Log
branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/acap/
branches/cyrus23/cyrus-imapd-2.3-2.3.8/pwcheck/
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/CVS/Entries.Log
branches/cyrus23/cyrus-imapd-2.3_2.3.8.orig.tar.gz (with props)
Removed:
branches/cyrus23/cyrus-imapd-2.3-2.3.8/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/cgi-bin/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/html/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/script/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/notify_unix/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/depot/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/internal/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/text/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/et/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imtest/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/installsieve/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/charset/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/test/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/makedepend/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/conf/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/netnews/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/notifyd/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/IMAP/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/examples/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/t/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/lib/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/managesieve/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/scripts/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/ptclient/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/action/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/action/serverm/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/action/testm/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/actionExtensions/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/actionExtensions/serverm/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/actionExtensions/testm/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/test/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/test/serverm/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/test/testm/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/testExtension/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/testExtension/serverm/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/testExtension/testm/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/snmp/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/syslog/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/CVS/Tag
branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/CVS/Tag
Modified:
branches/cyrus23/cyrus-imapd-2.3-2.3.8/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/CVS/Entries.Log
branches/cyrus23/cyrus-imapd-2.3-2.3.8/Makefile.in
branches/cyrus23/cyrus-imapd-2.3-2.3.8/README
branches/cyrus23/cyrus-imapd-2.3-2.3.8/README.andrew
branches/cyrus23/cyrus-imapd-2.3-2.3.8/SMakefile
branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/afs.m4
branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/arx.m4
branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/ax_path_bdb.m4
branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/berkdb.m4
branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/bsd_sockets.m4
branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/clamav.m4
branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/com_err_link.m4
branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/common.m4
branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/db.m4
branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/heimdal.m4
branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/kafs.m4
branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/kerberos_v4.m4
branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/kerberos_v5.m4
branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/libXau.m4
branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/libcyrus.m4
branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/libloguse.m4
branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/libnet.m4
branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/libpcap.m4
branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/librestrict.m4
branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/libssl.m4
branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/libwrap.m4
branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/openldap.m4
branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/openssl.m4
branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/sasl.m4
branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/sasl2.m4
branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/telnet.m4
branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/ucdsnmp.m4
branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/zephyr.m4
branches/cyrus23/cyrus-imapd-2.3-2.3.8/config.h.in
branches/cyrus23/cyrus-imapd-2.3-2.3.8/configure.in
branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/cgi-bin/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/html/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/script/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/drac_auth.patch
branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/notify_unix/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/changelog
branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/deletable.files
branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/patches/05-fix_programnames.dpatch
branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/patches/30-update_perlcalling.sh.dpatch
branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/patches/70-allow-larger-buffers.dpatch
branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/patches/72-faster-isdigit.dpatch
branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/patches/99-update-autoconf.dpatch
branches/cyrus23/cyrus-imapd-2.3-2.3.8/depot/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/depot/depot.conf
branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/bugs.html
branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/changes.html
branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/faq.html
branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/index.html
branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-admin-mb.html
branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-compile.html
branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-configure.html
branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-murder.html
branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-netnews.html
branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-replication.html
branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-testing.html
branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-upgrade.html
branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-virtdomains.html
branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install.html
branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/internal/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/internal/database-formats.html
branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/internal/mailbox-format.html
branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/mailing-list.html
branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/man.html
branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/overview.html
branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/readme.html
branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/specs.html
branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/text/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/et/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/.cvsignore
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/Makefile.dist
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/Makefile.in
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/annotate.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/annotate.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/append.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/append.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/arbitron.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/backend.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/backend.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/chk_cyrus.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/cli_fatal.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/ctl_cyrusdb.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/ctl_deliver.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/ctl_mboxlist.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/cvt_cyrusdb.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/cyr_expire.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/cyrdump.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/deliver.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/delivered_prune.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/duplicate.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/duplicate.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/fetchnews.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/fud.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/global.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/global.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/idle.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/idle.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/idled.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/idled.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/imap_err.et
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/imap_proxy.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/imap_proxy.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/imapd.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/imapd.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/imapparse.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/index.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/index.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/ipurge.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/lmtp_sieve.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/lmtp_sieve.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/lmtpd.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/lmtpd.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/lmtpengine.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/lmtpengine.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mailbox.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mailbox.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mbdump.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mbdump.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mbexamine.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mboxkey.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mboxkey.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mboxlist.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mboxlist.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mboxname.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mboxname.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mbpath.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/message.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/message.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mupdate-client.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mupdate-client.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mupdate-slave.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mupdate.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mupdate.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/nntpd.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/notify.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/pop3d.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/protocol.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/protocol.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/proxy.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/proxy.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/quota.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/quota.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/quota_db.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/reconstruct.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/saslclient.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/saslserver.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/search_engines.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/seen_bigdb.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/seen_db.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/seen_local.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/signals.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/signals.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/smmapd.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/spool.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/spool.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/squat.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/squat_build.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/squatter.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_client.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_commit.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_commit.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_log.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_log.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_reset.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_server.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_support.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_support.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/syncnews.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/tls.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/tls_prune.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/unexpunge.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/user.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/version.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/version.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imtest/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imtest/Makefile.in
branches/cyrus23/cyrus-imapd-2.3-2.3.8/imtest/imtest.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/installsieve/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/Makefile.in
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/acl.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/acl.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/acl_afs.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/auth.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/auth.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/auth_krb.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/auth_krb5.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/auth_pts.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/auth_pts.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/auth_unix.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/bsearch.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/bsearch.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/byteorder64.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/byteorder64.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/charset.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/charset.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/charset/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/cyrusdb.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/cyrusdb.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/cyrusdb_berkeley.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/cyrusdb_flat.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/cyrusdb_quotalegacy.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/cyrusdb_skiplist.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/glob.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/gmtoff_tm.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/hash.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/hmac-md5.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/imapoptions
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/imapurl.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/imapurl.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/imclient.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/imclient.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/iptostring.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/libconfig.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/libconfig.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/libcyr_cfg.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/libcyr_cfg.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/message_uuid.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/message_uuid.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/mpool.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/mpool.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/prot.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/prot.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/retry.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/test/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/util.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/util.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/xmalloc.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/xmalloc.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/xstrlcat.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/xstrlcat.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/xstrlcpy.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/xstrlcpy.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/makedepend/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/Makefile.dist
branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/Makefile.in
branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/arbitron.8
branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/ctl_mboxlist.8
branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/cyr_expire.8
branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/cyrus.conf.5
branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/deliver.8
branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/fetchnews.8
branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/imclient.3
branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/imtest.1
branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/ipurge.8
branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/lmtptest.1
branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/master.8
branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/mbpath.8
branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/mupdatetest.1
branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/nntpd.8
branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/nntptest.1
branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/pop3d.8
branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/pop3test.1
branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/reconstruct.8
branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/sivtest.1
branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/smmapd.8
branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/smtptest.1
branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/sync_client.8
branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/sync_reset.8
branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/sync_server.8
branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/timsieved.8
branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/unexpunge.8
branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/Makefile.in
branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/conf/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/cyrusMasterMIB.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/master.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/master.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/masterconf.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/message_uuid_master.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/service-thread.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/service.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/netnews/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/netnews/Makefile.in
branches/cyrus23/cyrus-imapd-2.3-2.3.8/notifyd/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/notifyd/Makefile.in
branches/cyrus23/cyrus-imapd-2.3-2.3.8/notifyd/notify_mailto.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/notifyd/notify_zephyr.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/notifyd/notifyd.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/CVS/Entries.Log
branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/IMAP.pm
branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/IMAP.xs
branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/IMAP/Admin.pm
branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/IMAP/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/IMAP/Shell.pm
branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/Makefile.PL
branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/README
branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/cyradm.sh
branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/examples/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/examples/auditmbox.pl
branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/t/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/lib/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/lib/Makefile.in
branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/lib/isieve.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/lib/lex.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/managesieve/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/managesieve/Makefile.PL
branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/managesieve/managesieve.xs
branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/scripts/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/scripts/sieveshell.pl
branches/cyrus23/cyrus-imapd-2.3-2.3.8/ptclient/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/ptclient/Makefile.in
branches/cyrus23/cyrus-imapd-2.3-2.3.8/ptclient/afskrb.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/ptclient/ldap.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/ptclient/ptdump.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/ptclient/ptexpire.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/ptclient/ptloader.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/ptclient/ptloader.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/AUTHORS
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/Makefile.dist
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/Makefile.in
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/README
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/addr-lex.l
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/addr.y
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/bc_dump.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/bc_emit.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/bc_eval.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/bc_generate.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/comparator.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/comparator.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/interp.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/interp.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/message.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/message.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/script.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/script.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/sieve-lex.l
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/sieve.y
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/sieve_interface.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/sievec.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/sieved.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/test.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/action/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/action/serverm/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/action/testm/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/actionExtensions/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/actionExtensions/serverm/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/actionExtensions/testm/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/test/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/test/serverm/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/test/testm/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/testExtension/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/testExtension/serverm/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/testExtension/testm/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tree.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tree.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/snmp/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/snmp/snmpgen
branches/cyrus23/cyrus-imapd-2.3-2.3.8/syslog/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/Makefile.in
branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/actions.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/lex.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/mystring.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/parser.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/scripttest.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/scripttest.h
branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/timsieved.c
branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/CVS/Entries
branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/config2header
branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/config2man
branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/dohash
branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/masssievec
branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/migrate-metadata
branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/mkimap
branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/rehash
branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/translatesieve
branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/undohash
branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/upgradesieve
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,11 +1,11 @@
-/.cvsignore/1.2/Fri Oct 4 14:09:26 2002//Tcyrus-release-2-3-7
-/COPYRIGHT/1.7/Thu Oct 12 20:45:21 2000//Tcyrus-release-2-3-7
-/Makefile.in/1.67.2.14/Mon Jul 10 13:46:19 2006//Tcyrus-release-2-3-7
-/README/1.13/Wed Oct 22 18:50:01 2003//Tcyrus-release-2-3-7
-/README.andrew/1.32.8.2/Mon Jun 19 19:06:43 2006//Tcyrus-release-2-3-7
-/SMakefile/1.92.2.2/Wed Jun 2 19:58:27 2004//Tcyrus-release-2-3-7
-/config.guess/1.1/Tue Apr 25 04:42:12 2000//Tcyrus-release-2-3-7
-/config.sub/1.1/Tue Apr 25 04:42:12 2000//Tcyrus-release-2-3-7
-/configure.in/1.268.2.23/Tue Apr 12 20:05:20 2005//Tcyrus-release-2-3-7
-/install-sh/1.1/Fri Feb 10 19:26:06 1995//Tcyrus-release-2-3-7
+/.cvsignore/1.2/Fri Oct 4 14:09:26 2002//
+/COPYRIGHT/1.7/Thu Oct 12 20:45:21 2000//
+/Makefile.in/1.87/Tue Feb 6 18:07:42 2007//
+/README/1.14/Wed Feb 7 18:58:07 2007//
+/README.andrew/1.36/Mon Jan 15 15:45:16 2007//
+/SMakefile/1.98/Thu Nov 30 17:11:16 2006//
+/config.guess/1.1/Tue Apr 25 04:42:12 2000//
+/config.sub/1.1/Tue Apr 25 04:42:12 2000//
+/configure.in/1.297/Thu Nov 30 17:11:16 2006//
+/install-sh/1.1/Fri Feb 10 19:26:06 1995//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/CVS/Entries.Log
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/CVS/Entries.Log?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/CVS/Entries.Log (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/CVS/Entries.Log Tue Feb 27 04:17:11 2007
@@ -27,11 +27,3 @@
A D/cmulocal////
A D/sieve////
A D/acap////
-R D/acap////
-R D/pwcheck////
-R D/cyradm////
-R D/cmulocal-old////
-R D/amssync////
-R D/SIEVE-Cyrus////
-R D/SIEVE////
-R D/IMAP-Cyrus////
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/Makefile.in
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/Makefile.in?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/Makefile.in (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/Makefile.in Tue Feb 27 04:17:11 2007
@@ -62,7 +62,7 @@
LEX = @LEX@
COMPILE_ET = @COMPILE_ET@
-VERSION = 2.3.7
+VERSION = 2.3.8
all::
@for d in $(SUBDIRS); \
@@ -93,7 +93,7 @@
if [ \! -d dist ]; then mkdir dist ; fi
@echo "checking out the distribution"
@cd dist ; cvs -Q -d :pserver:anoncvs at cvs.andrew.cmu.edu:/cvs \
- co -r cyrus-imapd-2_3 -d cyrus-imapd-$(VERSION) cyrus
+ co -d cyrus-imapd-$(VERSION) cyrus
touch distcvs
install::
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/README
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/README?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/README (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/README Tue Feb 27 04:17:11 2007
@@ -1,4 +1,4 @@
-$Id: README,v 1.13 2003/10/22 18:50:01 rjs3 Exp $
+$Id: README,v 1.14 2007/02/07 18:58:07 murch Exp $
This is the Carnegie Mellon University Cyrus IMAP Server.
@@ -26,7 +26,7 @@
read doc/readme.html first!).
* To obtain updates to this software, visit the web page
- http://asg.web.cmu.edu/cyrus
+ http://cyrusimap.web.cmu.edu/downloads.html
or ftp directly from
ftp://ftp.andrew.cmu.edu/pub/cyrus-mail
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/README.andrew
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/README.andrew?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/README.andrew (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/README.andrew Tue Feb 27 04:17:11 2007
@@ -33,6 +33,7 @@
- make sure the version number is correct (Makefile.in, imap/version.h)
- add upgrade notes to doc/install-upgrade.html
- add changes to doc/changes.html
+- make sure that contrib/drac_auth.patch applies cleanly
- commit to repository
- make dist
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/SMakefile
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/SMakefile?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/SMakefile (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/SMakefile Tue Feb 27 04:17:11 2007
@@ -40,7 +40,7 @@
# This file is specific to Carnegie Mellon University's
# software build process
#
-# $Id: SMakefile,v 1.92.2.2 2004/06/02 19:58:27 ken3 Exp $
+# $Id: SMakefile,v 1.98 2006/11/30 17:11:16 murch Exp $
#
NEW_AUTOTOOLS=yes
@@ -70,7 +70,16 @@
LOCALDEFS="-DEXTRA_IDENT=\\\"$VER\\\""
# PERL CONFIGURATION
-PERL_MM_OPT="INSTALLPRIVLIB=${DESTDIR}/usr/local/lib/perl5 INSTALLARCHLIB=${DESTDIR}/usr/local/lib/perl5/5.6.1 INSTALLSITELIB=${DESTDIR}/usr/local/lib/perl5/site_perl/5.6.1 INSTALLSITEARCH=${DESTDIR}/usr/local/lib/perl5/site_perl/5.6.1 INSTALLBIN=${DESTDIR}/usr/local/bin INSTALLSCRIPT=${DESTDIR}/usr/local/bin INSTALLMAN1DIR=${DESTDIR}/usr/local/man/man1 INSTALLMAN3DIR=${DESTDIR}/usr/local/man/man3"
+if perl -e 'exit ($] != 5.006001)'; then
+ PERL_MM_OPT="INSTALLPRIVLIB=${DESTDIR}/usr/local/lib/perl5 INSTALLARCHLIB=${DESTDIR}/usr/local/lib/perl5/5.6.1 INSTALLSITELIB=${DESTDIR}/usr/local/lib/perl5/site_perl/5.6.1 INSTALLSITEARCH=${DESTDIR}/usr/local/lib/perl5/site_perl/5.6.1 INSTALLBIN=${DESTDIR}/usr/local/bin INSTALLSCRIPT=${DESTDIR}/usr/local/bin INSTALLMAN1DIR=${DESTDIR}/usr/local/man/man1 INSTALLMAN3DIR=${DESTDIR}/usr/local/man/man3"
+else
+ if perl -e 'exit ($] < 5.008005)'; then
+ # MakeMaker now supports DESTDIR!
+ PERL_MM_OPT=""
+ else
+ echo "no support for thus perl version in SMakefile"
+ fi
+fi
export PERL_MM_OPT
# end perl configuration
@@ -80,7 +89,7 @@
CFLAGS="-g"
else
CC="gcc"
- CFLAGS="${CFLAGS} -O3 -g -Wall -W"
+ CFLAGS="${CFLAGS} -g -Wall -W"
fi
if test "${WASH_CYRUS_DEBUG}" = "t"; then
@@ -104,10 +113,21 @@
;;
esac
+case `sys` in
+ i386_fc3)
+ LIBS="$LIBS -ldes"
+ OS_CONFIG="--with-krbdes"
+ ;;
+ sun4x_s10)
+ LIBS="$LIBS -ldes"
+ OS_CONFIG="--with-krbdes"
+ ;;
+esac
+
# settings; we have to disable these on some platforms
DEBUG=""
-WITHAUTH="--with-auth=pts --enable-krb5afspts --without-krbdes"
+WITHAUTH="--with-auth=pts --with-afs=/usr/local --enable-krb5afspts --without-krbdes"
SSL_CONFIG="--with-openssl=/usr/local/lib"
# the defaults are good enough for us
@@ -115,8 +135,9 @@
# the following is for staticly linking SASL only
SASL_CONFIG="--with-staticsasl=/usr/local --with-gssapi=/usr/local"
-KRB_CONFIG="--enable-statickrb --with-krb=/usr/local"
-FEATURE_CONFIG="--enable-murder --enable-cmulocal"
+#KRB_CONFIG="--enable-statickrb --with-krb=/usr/local"
+KRB_CONFIG="--with-krb=/usr/local"
+FEATURE_CONFIG="--enable-murder --enable-cmulocal --enable-nntp --enable-idled"
EXT_PACKAGE_CONFIG="--with-inn=/usr/news --with-ucdsnmp=/usr/local"
MFCOMMAND="./configure $WITHAUTH $KRB_CONFIG $DB_CONFIG --enable-experiment --with-cyrus-group=staff $FEATURE_CONFIG $EXT_PACKAGE_CONFIG $SASL_CONFIG $DEBUG"
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,48 +1,48 @@
-/COPYING/1.1/Fri Oct 2 21:35:59 1998//Tcyrus-release-2-3-7
-/README.andrew/1.10.30.1/Thu Feb 19 01:42:44 2004//Tcyrus-release-2-3-7
-/afs.m4/1.26.4.3/Tue May 23 13:27:14 2006//Tcyrus-release-2-3-7
-/agentx.m4/1.5/Wed Oct 8 20:35:24 2003//Tcyrus-release-2-3-7
-/arx.m4/1.5.4.1/Tue May 23 13:27:14 2006//Tcyrus-release-2-3-7
-/ax_path_bdb.m4/1.1.2.1/Tue May 23 13:27:14 2006//Tcyrus-release-2-3-7
-/berkdb.m4/1.12.4.7/Tue May 23 13:27:15 2006//Tcyrus-release-2-3-7
-/bsd_sockets.m4/1.9.4.1/Tue May 23 13:27:15 2006//Tcyrus-release-2-3-7
-/c-attribute.m4/1.3/Wed Oct 8 20:35:24 2003//Tcyrus-release-2-3-7
-/c-fpic.m4/1.2/Wed Oct 8 20:35:24 2003//Tcyrus-release-2-3-7
-/clamav.m4/1.2.2.1/Tue May 23 13:27:15 2006//Tcyrus-release-2-3-7
-/com_err.m4/1.6/Wed Oct 8 20:35:24 2003//Tcyrus-release-2-3-7
-/com_err_link.m4/1.7.4.1/Tue May 23 13:27:15 2006//Tcyrus-release-2-3-7
-/common.m4/1.11.4.1/Tue May 23 13:27:16 2006//Tcyrus-release-2-3-7
-/cyrus.m4/1.4/Wed Oct 8 20:35:24 2003//Tcyrus-release-2-3-7
-/db.m4/1.1.24.2/Tue May 23 13:27:16 2006//Tcyrus-release-2-3-7
-/find-func-no-libs.m4/1.2/Wed Oct 8 20:35:24 2003//Tcyrus-release-2-3-7
-/find-func-no-libs2.m4/1.2/Wed Oct 8 20:35:24 2003//Tcyrus-release-2-3-7
-/find-func.m4/1.2/Wed Oct 8 20:35:24 2003//Tcyrus-release-2-3-7
-/heimdal.m4/1.7.4.2/Tue May 23 13:27:16 2006//Tcyrus-release-2-3-7
-/init_automake.m4/1.4/Wed Oct 8 20:35:24 2003//Tcyrus-release-2-3-7
-/ipv6.m4/1.5.4.1/Fri Dec 19 18:33:23 2003//Tcyrus-release-2-3-7
-/kafs.m4/1.6.4.1/Tue May 23 13:27:16 2006//Tcyrus-release-2-3-7
-/kerberos_v4.m4/1.26.4.2/Tue May 23 13:27:17 2006//Tcyrus-release-2-3-7
-/kerberos_v5.m4/1.7.4.2/Tue May 23 13:27:17 2006//Tcyrus-release-2-3-7
-/libXau.m4/1.4.4.1/Tue May 23 13:27:17 2006//Tcyrus-release-2-3-7
-/libcyrus.m4/1.19.4.1/Tue May 23 13:27:17 2006//Tcyrus-release-2-3-7
-/libloguse.m4/1.5.4.1/Tue May 23 13:27:18 2006//Tcyrus-release-2-3-7
-/libnet.m4/1.7.4.1/Tue May 23 13:27:18 2006//Tcyrus-release-2-3-7
-/libpcap.m4/1.8.4.1/Tue May 23 13:27:18 2006//Tcyrus-release-2-3-7
-/librestrict.m4/1.4.4.1/Tue May 23 13:27:18 2006//Tcyrus-release-2-3-7
-/libssl.m4/1.9.4.1/Tue May 23 13:27:18 2006//Tcyrus-release-2-3-7
-/libtoolhack.m4/1.4/Wed Oct 8 20:35:25 2003//Tcyrus-release-2-3-7
-/libwrap.m4/1.9.2.1/Tue May 23 13:27:19 2006//Tcyrus-release-2-3-7
-/mips-abi.m4/1.5/Wed Oct 8 20:35:25 2003//Tcyrus-release-2-3-7
-/nadine.m4/1.6/Wed Oct 8 20:35:25 2003//Tcyrus-release-2-3-7
-/nana.m4/1.5/Wed Oct 8 20:35:25 2003//Tcyrus-release-2-3-7
-/openldap.m4/1.2.2.1/Tue May 23 13:27:19 2006//Tcyrus-release-2-3-7
-/openssl.m4/1.8.4.2/Tue May 23 13:27:19 2006//Tcyrus-release-2-3-7
-/pthreads.m4/1.11/Wed Oct 8 20:35:25 2003//Tcyrus-release-2-3-7
-/sasl.m4/1.22.4.1/Tue May 23 13:27:19 2006//Tcyrus-release-2-3-7
-/sasl2.m4/1.36.2.6/Tue May 23 13:27:20 2006//Tcyrus-release-2-3-7
-/tcl.m4/1.4/Wed Oct 8 20:35:25 2003//Tcyrus-release-2-3-7
-/telnet.m4/1.12.4.1/Tue May 23 13:27:20 2006//Tcyrus-release-2-3-7
-/ucdsnmp.m4/1.8.2.2/Tue May 23 13:27:20 2006//Tcyrus-release-2-3-7
-/util.m4/1.10/Wed Oct 8 20:35:26 2003//Tcyrus-release-2-3-7
-/zephyr.m4/1.1.2.2/Tue May 23 13:27:21 2006//Tcyrus-release-2-3-7
+/COPYING/1.1/Fri Oct 2 21:35:59 1998//
+/README.andrew/1.11/Mon Feb 16 16:23:42 2004//
+/afs.m4/1.29/Tue Apr 26 19:14:07 2005//
+/agentx.m4/1.5/Wed Oct 8 20:35:24 2003//
+/arx.m4/1.6/Tue Apr 26 19:14:07 2005//
+/ax_path_bdb.m4/1.1/Thu Jan 6 20:24:52 2005//
+/berkdb.m4/1.20/Tue Apr 26 19:14:07 2005//
+/bsd_sockets.m4/1.10/Tue Apr 26 19:14:07 2005//
+/c-attribute.m4/1.3/Wed Oct 8 20:35:24 2003//
+/c-fpic.m4/1.2/Wed Oct 8 20:35:24 2003//
+/clamav.m4/1.2/Sat May 28 02:26:59 2005//
+/com_err.m4/1.6/Wed Oct 8 20:35:24 2003//
+/com_err_link.m4/1.9/Sat Feb 25 18:32:46 2006//
+/common.m4/1.13/Sat Feb 25 18:29:46 2006//
+/cyrus.m4/1.4/Wed Oct 8 20:35:24 2003//
+/db.m4/1.2/Sat Feb 14 21:16:18 2004//
+/find-func-no-libs.m4/1.2/Wed Oct 8 20:35:24 2003//
+/find-func-no-libs2.m4/1.2/Wed Oct 8 20:35:24 2003//
+/find-func.m4/1.2/Wed Oct 8 20:35:24 2003//
+/heimdal.m4/1.9/Tue Apr 26 19:14:07 2005//
+/init_automake.m4/1.4/Wed Oct 8 20:35:24 2003//
+/ipv6.m4/1.6/Wed Dec 10 17:59:31 2003//
+/kafs.m4/1.7/Tue Apr 26 19:14:07 2005//
+/kerberos_v4.m4/1.28/Tue Apr 26 19:14:08 2005//
+/kerberos_v5.m4/1.9/Tue Apr 26 19:14:08 2005//
+/libXau.m4/1.5/Tue Apr 26 19:14:08 2005//
+/libcyrus.m4/1.20/Tue Apr 26 19:14:08 2005//
+/libloguse.m4/1.7/Sat Feb 25 18:26:22 2006//
+/libnet.m4/1.8/Tue Apr 26 19:14:08 2005//
+/libpcap.m4/1.9/Tue Apr 26 19:14:08 2005//
+/librestrict.m4/1.6/Sat Feb 25 18:26:22 2006//
+/libssl.m4/1.10/Tue Apr 26 19:14:08 2005//
+/libtoolhack.m4/1.4/Wed Oct 8 20:35:25 2003//
+/libwrap.m4/1.10/Tue Apr 26 19:14:08 2005//
+/mips-abi.m4/1.5/Wed Oct 8 20:35:25 2003//
+/nadine.m4/1.6/Wed Oct 8 20:35:25 2003//
+/nana.m4/1.5/Wed Oct 8 20:35:25 2003//
+/openldap.m4/1.2/Mon Mar 13 19:16:11 2006//
+/openssl.m4/1.11/Wed May 17 18:30:19 2006//
+/pthreads.m4/1.11/Wed Oct 8 20:35:25 2003//
+/sasl.m4/1.23/Tue Apr 26 19:14:08 2005//
+/sasl2.m4/1.52/Thu May 18 19:25:00 2006//
+/tcl.m4/1.4/Wed Oct 8 20:35:25 2003//
+/telnet.m4/1.13/Sat Feb 25 18:36:36 2006//
+/ucdsnmp.m4/1.11/Tue Apr 26 19:14:08 2005//
+/util.m4/1.10/Wed Oct 8 20:35:26 2003//
+/zephyr.m4/1.2/Tue Apr 26 19:14:08 2005//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/afs.m4
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/afs.m4?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/afs.m4 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/afs.m4 Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
dnl afs.m4--AFS libraries, includes, and dependencies
-dnl $Id: afs.m4,v 1.26.4.3 2006/05/23 13:27:14 murch Exp $
+dnl $Id: afs.m4,v 1.29 2005/04/26 19:14:07 shadow Exp $
dnl Chaskiel Grundman
dnl based on kerberos_v4.m4
dnl Derrick Brashear
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/arx.m4
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/arx.m4?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/arx.m4 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/arx.m4 Tue Feb 27 04:17:11 2007
@@ -1,4 +1,4 @@
-dnl $Id: arx.m4,v 1.5.4.1 2006/05/23 13:27:14 murch Exp $
+dnl $Id: arx.m4,v 1.6 2005/04/26 19:14:07 shadow Exp $
AC_DEFUN([CMU_ARX_INC_WHERE1], [
saved_CPPFLAGS=$CPPFLAGS
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/ax_path_bdb.m4
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/ax_path_bdb.m4?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/ax_path_bdb.m4 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/ax_path_bdb.m4 Tue Feb 27 04:17:11 2007
@@ -50,7 +50,7 @@
dnl from Guido Draheim, without which this macro would be far less robust,
dnl and have poor and inconsistent cross compilation support.
dnl
-dnl @version $Id: ax_path_bdb.m4,v 1.1.2.1 2006/05/23 13:27:14 murch Exp $
+dnl @version $Id: ax_path_bdb.m4,v 1.1 2005/01/06 20:24:52 shadow Exp $
dnl @author Tim Toolan <toolan at ele.uri.edu>
dnl
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/berkdb.m4
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/berkdb.m4?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/berkdb.m4 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/berkdb.m4 Tue Feb 27 04:17:11 2007
@@ -1,4 +1,4 @@
-dnl $Id: berkdb.m4,v 1.12.4.7 2006/05/23 13:27:15 murch Exp $
+dnl $Id: berkdb.m4,v 1.20 2005/04/26 19:14:07 shadow Exp $
AC_DEFUN([CMU_DB_INC_WHERE1], [
saved_CPPFLAGS=$CPPFLAGS
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/bsd_sockets.m4
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/bsd_sockets.m4?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/bsd_sockets.m4 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/bsd_sockets.m4 Tue Feb 27 04:17:11 2007
@@ -1,7 +1,7 @@
dnl bsd_sockets.m4--which socket libraries do we need?
dnl Derrick Brashear
dnl from Zephyr
-dnl $Id: bsd_sockets.m4,v 1.9.4.1 2006/05/23 13:27:15 murch Exp $
+dnl $Id: bsd_sockets.m4,v 1.10 2005/04/26 19:14:07 shadow 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
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/clamav.m4
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/clamav.m4?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/clamav.m4 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/clamav.m4 Tue Feb 27 04:17:11 2007
@@ -1,6 +1,6 @@
dnl
dnl macros for configure.in to detect clamav library
-dnl $Id: clamav.m4,v 1.2.2.1 2006/05/23 13:27:15 murch Exp $
+dnl $Id: clamav.m4,v 1.2 2005/05/28 02:26:59 shadow Exp $
dnl
AC_DEFUN([CMU_CLAMAV], [
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/com_err_link.m4
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/com_err_link.m4?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/com_err_link.m4 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/com_err_link.m4 Tue Feb 27 04:17:11 2007
@@ -2,7 +2,7 @@
dnl library with the collection, I just want to know where it's installed,
dnl so don't bitch, Rob...
dnl Derrick Brashear
-dnl $Id: com_err_link.m4,v 1.7.4.1 2006/05/23 13:27:15 murch Exp $
+dnl $Id: com_err_link.m4,v 1.9 2006/02/25 18:32:46 cg2v Exp $
AC_DEFUN([CMU_COMERR_INC_WHERE1], [
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/common.m4
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/common.m4?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/common.m4 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/common.m4 Tue Feb 27 04:17:11 2007
@@ -1,4 +1,4 @@
-dnl $Id: common.m4,v 1.11.4.1 2006/05/23 13:27:16 murch Exp $
+dnl $Id: common.m4,v 1.13 2006/02/25 18:29:46 cg2v Exp $
AC_DEFUN([CMU_TEST_LIBPATH], [
changequote(<<, >>)
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/db.m4
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/db.m4?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/db.m4 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/db.m4 Tue Feb 27 04:17:11 2007
@@ -1,4 +1,4 @@
-dnl $Id: db.m4,v 1.1.24.2 2006/05/23 13:27:16 murch Exp $
+dnl $Id: db.m4,v 1.2 2004/02/14 21:16:18 cg2v Exp $
dnl
dnl tests for various db libraries
dnl
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/heimdal.m4
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/heimdal.m4?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/heimdal.m4 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/heimdal.m4 Tue Feb 27 04:17:11 2007
@@ -1,7 +1,7 @@
dnl kerberos_v5.m4--Kerberos 5 libraries and includes
dnl Derrick Brashear
dnl from KTH krb and Arla
-dnl $Id: heimdal.m4,v 1.7.4.2 2006/05/23 13:27:16 murch Exp $
+dnl $Id: heimdal.m4,v 1.9 2005/04/26 19:14:07 shadow Exp $
AC_DEFUN([CMU_LIBHEIMDAL_INC_WHERE1], [
saved_CPPFLAGS=$CPPFLAGS
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/kafs.m4
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/kafs.m4?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/kafs.m4 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/kafs.m4 Tue Feb 27 04:17:11 2007
@@ -1,7 +1,7 @@
dnl kerberos_v4.m4--Kafs libraries and includes
dnl Derrick Brashear
dnl from KTH kafs and Arla
-dnl $Id: kafs.m4,v 1.6.4.1 2006/05/23 13:27:16 murch Exp $
+dnl $Id: kafs.m4,v 1.7 2005/04/26 19:14:07 shadow Exp $
AC_DEFUN([CMU_KAFS_INC_WHERE1], [
saved_CPPFLAGS=$CPPFLAGS
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/kerberos_v4.m4
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/kerberos_v4.m4?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/kerberos_v4.m4 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/kerberos_v4.m4 Tue Feb 27 04:17:11 2007
@@ -1,7 +1,7 @@
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.26.4.2 2006/05/23 13:27:17 murch Exp $
+dnl $Id: kerberos_v4.m4,v 1.28 2005/04/26 19:14:08 shadow Exp $
AC_DEFUN([CMU_KRB_SENDAUTH_PROTO], [
AC_MSG_CHECKING(for krb_sendauth prototype)
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/kerberos_v5.m4
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/kerberos_v5.m4?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/kerberos_v5.m4 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/kerberos_v5.m4 Tue Feb 27 04:17:11 2007
@@ -1,7 +1,7 @@
dnl kerberos_v5.m4--Kerberos 5 libraries and includes
dnl Derrick Brashear
dnl from KTH krb and Arla
-dnl $Id: kerberos_v5.m4,v 1.7.4.2 2006/05/23 13:27:17 murch Exp $
+dnl $Id: kerberos_v5.m4,v 1.9 2005/04/26 19:14:08 shadow Exp $
AC_DEFUN([CMU_KRB5_INC_WHERE1], [
saved_CPPFLAGS=$CPPFLAGS
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/libXau.m4
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/libXau.m4?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/libXau.m4 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/libXau.m4 Tue Feb 27 04:17:11 2007
@@ -1,4 +1,4 @@
-dnl $Id: libXau.m4,v 1.4.4.1 2006/05/23 13:27:17 murch Exp $
+dnl $Id: libXau.m4,v 1.5 2005/04/26 19:14:08 shadow Exp $
AC_DEFUN([CMU_XAU_INC_WHERE1], [
saved_CPPFLAGS=$CPPFLAGS
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/libcyrus.m4
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/libcyrus.m4?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/libcyrus.m4 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/libcyrus.m4 Tue Feb 27 04:17:11 2007
@@ -1,7 +1,7 @@
dnl libcyrus.m4--Cyrus libraries and includes
dnl Derrick Brashear
dnl from KTH kafs and Arla
-dnl $Id: libcyrus.m4,v 1.19.4.1 2006/05/23 13:27:17 murch Exp $
+dnl $Id: libcyrus.m4,v 1.20 2005/04/26 19:14:08 shadow Exp $
AC_DEFUN([CMU_LIBCYRUS_INC_WHERE1], [
saved_CPPFLAGS=$CPPFLAGS
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/libloguse.m4
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/libloguse.m4?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/libloguse.m4 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/libloguse.m4 Tue Feb 27 04:17:11 2007
@@ -1,7 +1,7 @@
dnl libloguse.m4--LOGUSE libraries and includes
dnl Derrick Brashear
dnl from KTH krb and Arla
-dnl $Id: libloguse.m4,v 1.5.4.1 2006/05/23 13:27:18 murch Exp $
+dnl $Id: libloguse.m4,v 1.7 2006/02/25 18:26:22 cg2v Exp $
AC_DEFUN([CMU_LOGUSE_LIB_WHERE1], [
saved_LIBS=$LIBS
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/libnet.m4
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/libnet.m4?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/libnet.m4 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/libnet.m4 Tue Feb 27 04:17:11 2007
@@ -1,7 +1,7 @@
dnl libnet.m4--libnet and includes
dnl Derrick Brashear
dnl from KTH krb and Arla
-dnl $Id: libnet.m4,v 1.7.4.1 2006/05/23 13:27:18 murch Exp $
+dnl $Id: libnet.m4,v 1.8 2005/04/26 19:14:08 shadow Exp $
AC_DEFUN([CMU_LIBNET_CFG_WHERE1], [
ac_cv_found_libnet_bin=no
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/libpcap.m4
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/libpcap.m4?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/libpcap.m4 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/libpcap.m4 Tue Feb 27 04:17:11 2007
@@ -1,7 +1,7 @@
dnl libpcap.m4--PCAP libraries and includes
dnl Derrick Brashear
dnl from KTH krb and Arla
-dnl $Id: libpcap.m4,v 1.8.4.1 2006/05/23 13:27:18 murch Exp $
+dnl $Id: libpcap.m4,v 1.9 2005/04/26 19:14:08 shadow Exp $
AC_DEFUN([CMU_PCAP_INC_WHERE1], [
ac_cv_found_pcap_inc=no
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/librestrict.m4
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/librestrict.m4?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/librestrict.m4 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/librestrict.m4 Tue Feb 27 04:17:11 2007
@@ -1,7 +1,7 @@
dnl librestrict.m4--restrict libraries and includes
dnl Derrick Brashear
dnl from KTH krb and Arla
-dnl $Id: librestrict.m4,v 1.4.4.1 2006/05/23 13:27:18 murch Exp $
+dnl $Id: librestrict.m4,v 1.6 2006/02/25 18:26:22 cg2v Exp $
AC_DEFUN([CMU_RESTRICT_LIB_WHERE1], [
saved_LIBS=$LIBS
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/libssl.m4
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/libssl.m4?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/libssl.m4 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/libssl.m4 Tue Feb 27 04:17:11 2007
@@ -1,7 +1,7 @@
dnl libssl.m4--Ssl libraries and includes
dnl Derrick Brashear
dnl from KTH kafs and Arla
-dnl $Id: libssl.m4,v 1.9.4.1 2006/05/23 13:27:18 murch Exp $
+dnl $Id: libssl.m4,v 1.10 2005/04/26 19:14:08 shadow Exp $
AC_DEFUN([CMU_LIBSSL_INC_WHERE1], [
saved_CPPFLAGS=$CPPFLAGS
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/libwrap.m4
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/libwrap.m4?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/libwrap.m4 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/libwrap.m4 Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
dnl libwrap.m4 --- do we have libwrap, the access control library?
-dnl $Id: libwrap.m4,v 1.9.2.1 2006/05/23 13:27:19 murch Exp $
+dnl $Id: libwrap.m4,v 1.10 2005/04/26 19:14:08 shadow Exp $
AC_DEFUN([CMU_LIBWRAP], [
AC_REQUIRE([CMU_FIND_LIB_SUBDIR])
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/openldap.m4
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/openldap.m4?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/openldap.m4 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/openldap.m4 Tue Feb 27 04:17:11 2007
@@ -1,6 +1,6 @@
dnl
dnl macros for configure.in to detect openldap
-dnl $Id: openldap.m4,v 1.2.2.1 2006/05/23 13:27:19 murch Exp $
+dnl $Id: openldap.m4,v 1.2 2006/03/13 19:16:11 mel Exp $
dnl
dnl
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/openssl.m4
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/openssl.m4?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/openssl.m4 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/openssl.m4 Tue Feb 27 04:17:11 2007
@@ -1,6 +1,6 @@
dnl
dnl macros for configure.in to detect openssl
-dnl $Id: openssl.m4,v 1.8.4.2 2006/05/23 13:27:19 murch Exp $
+dnl $Id: openssl.m4,v 1.11 2006/05/17 18:30:19 murch Exp $
dnl
AC_DEFUN([CMU_HAVE_OPENSSL], [
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/sasl.m4
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/sasl.m4?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/sasl.m4 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/sasl.m4 Tue Feb 27 04:17:11 2007
@@ -1,7 +1,7 @@
dnl sasl.m4--sasl libraries and includes
dnl Derrick Brashear
dnl from KTH sasl and Arla
-dnl $Id: sasl.m4,v 1.22.4.1 2006/05/23 13:27:19 murch Exp $
+dnl $Id: sasl.m4,v 1.23 2005/04/26 19:14:08 shadow Exp $
AC_DEFUN([CMU_SASL_INC_WHERE1], [
saved_CPPFLAGS=$CPPFLAGS
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/sasl2.m4
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/sasl2.m4?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/sasl2.m4 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/sasl2.m4 Tue Feb 27 04:17:11 2007
@@ -1,6 +1,6 @@
# sasl2.m4--sasl2 libraries and includes
# Rob Siemborski
-# $Id: sasl2.m4,v 1.36.2.6 2006/05/23 13:27:20 murch Exp $
+# $Id: sasl2.m4,v 1.52 2006/05/18 19:25:00 murch Exp $
# SASL2_CRYPT_CHK
# ---------------
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/telnet.m4
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/telnet.m4?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/telnet.m4 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/telnet.m4 Tue Feb 27 04:17:11 2007
@@ -1,6 +1,6 @@
dnl telnet.m4--telnet special macros
dnl Derrick Brashear
-dnl $Id: telnet.m4,v 1.12.4.1 2006/05/23 13:27:20 murch Exp $
+dnl $Id: telnet.m4,v 1.13 2006/02/25 18:36:36 cg2v Exp $
AC_DEFUN([CMU_TELNET_WHICH_TERM], [
AC_CHECK_LIB(termlib, setupterm, [
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/ucdsnmp.m4
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/ucdsnmp.m4?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/ucdsnmp.m4 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/ucdsnmp.m4 Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
dnl look for the (ucd|net)snmp libraries
-dnl $Id: ucdsnmp.m4,v 1.8.2.2 2006/05/23 13:27:20 murch Exp $
+dnl $Id: ucdsnmp.m4,v 1.11 2005/04/26 19:14:08 shadow Exp $
AC_DEFUN([CMU_UCDSNMP], [
AC_REQUIRE([CMU_FIND_LIB_SUBDIR])
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/zephyr.m4
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/zephyr.m4?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/zephyr.m4 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/cmulocal/zephyr.m4 Tue Feb 27 04:17:11 2007
@@ -2,7 +2,7 @@
dnl based on kafs.m4, by
dnl Derrick Brashear
dnl from KTH kafs and Arla
-dnl $Id: zephyr.m4,v 1.1.2.2 2006/05/23 13:27:21 murch Exp $
+dnl $Id: zephyr.m4,v 1.2 2005/04/26 19:14:08 shadow Exp $
AC_DEFUN([CMU_ZEPHYR_INC_WHERE1], [
saved_CPPFLAGS=$CPPFLAGS
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/config.h.in
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/config.h.in?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/config.h.in (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/config.h.in Tue Feb 27 04:17:11 2007
@@ -1,7 +1,7 @@
/* config.h.in. Generated from configure.in by autoheader. */
-/* $Id: configure.in,v 1.268.2.23 2005/04/12 20:05:20 shadow Exp $ */
+/* $Id: configure.in,v 1.297 2006/11/30 17:11:16 murch Exp $ */
/*
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/configure.in
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/configure.in?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/configure.in (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/configure.in Tue Feb 27 04:17:11 2007
@@ -42,7 +42,7 @@
dnl
dnl configure.in for the Cyrus imapd
-dnl $Id: configure.in,v 1.268.2.23 2005/04/12 20:05:20 shadow Exp $
+dnl $Id: configure.in,v 1.297 2006/11/30 17:11:16 murch Exp $
dnl
@@ -1054,7 +1054,7 @@
AC_SUBST(PERL)
AH_TOP([
-/* $Id: configure.in,v 1.268.2.23 2005/04/12 20:05:20 shadow Exp $ */
+/* $Id: configure.in,v 1.297 2006/11/30 17:11:16 murch Exp $ */
/*
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,10 +1,10 @@
-/README/1.3/Sat May 25 19:57:43 2002//Tcyrus-release-2-3-7
-/add-cyrus-user/1.1/Fri Jun 27 13:56:00 2003//Tcyrus-release-2-3-7
-/deliver-notify-zephyr.patch/1.2/Sat May 25 19:57:43 2002//Tcyrus-release-2-3-7
-/drac_auth.patch/1.17.2.7/Tue May 23 13:49:38 2006//Tcyrus-release-2-3-7
-/fud-client.c/1.5/Thu Feb 13 20:15:18 2003//Tcyrus-release-2-3-7
-/mupdate-test.pl/1.1.2.1/Fri Dec 19 18:33:25 2003//Tcyrus-release-2-3-7
-/sieve-spamasssassin/1.1/Thu May 9 22:00:46 2002//Tcyrus-release-2-3-7
-/squatrunner.pl/1.1/Thu Dec 19 21:56:03 2002//Tcyrus-release-2-3-7
-/squatrunner.txt/1.1/Thu Dec 19 21:56:03 2002//Tcyrus-release-2-3-7
+/README/1.3/Sat May 25 19:57:43 2002//
+/add-cyrus-user/1.1/Fri Jun 27 13:56:00 2003//
+/deliver-notify-zephyr.patch/1.2/Sat May 25 19:57:43 2002//
+/drac_auth.patch/1.20/Tue Feb 6 15:39:09 2007//
+/fud-client.c/1.5/Thu Feb 13 20:15:18 2003//
+/mupdate-test.pl/1.1/Thu Dec 18 20:26:01 2003//
+/sieve-spamasssassin/1.1/Thu May 9 22:00:46 2002//
+/squatrunner.pl/1.1/Thu Dec 19 21:56:03 2002//
+/squatrunner.txt/1.1/Thu Dec 19 21:56:03 2002//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,4 +1,2 @@
-/README/1.4/Mon Nov 19 23:18:21 2001//Tcyrus-release-2-3-7
-D/cgi-bin////
-D/html////
-D/script////
+/README/1.4/Mon Nov 19 23:18:21 2001//
+D
Added: branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/CVS/Entries.Log
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/CVS/Entries.Log?rev=702&root=cyrus22&view=auto
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/CVS/Entries.Log (added)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/CVS/Entries.Log Tue Feb 27 04:17:11 2007
@@ -1,0 +1,3 @@
+A D/cgi-bin////
+A D/html////
+A D/script////
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/cgi-bin/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/cgi-bin/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/cgi-bin/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/cgi-bin/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,4 +1,4 @@
-/cyrus_master.pl/1.1/Sun Jan 28 22:42:01 2001//Tcyrus-release-2-3-7
-/graph_cyrus_db-sum.pl/1.1/Sun Jan 28 22:42:01 2001//Tcyrus-release-2-3-7
-/graph_cyrus_db.pl/1.1/Sun Jan 28 22:42:01 2001//Tcyrus-release-2-3-7
+/cyrus_master.pl/1.1/Sun Jan 28 22:42:01 2001//
+/graph_cyrus_db-sum.pl/1.1/Sun Jan 28 22:42:01 2001//
+/graph_cyrus_db.pl/1.1/Sun Jan 28 22:42:01 2001//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/html/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/html/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/html/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/html/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,2 +1,2 @@
-/index.html/1.1/Sun Jan 28 22:42:01 2001//Tcyrus-release-2-3-7
+/index.html/1.1/Sun Jan 28 22:42:01 2001//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/script/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/script/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/script/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/script/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,4 +1,4 @@
-/cyrus.pl/1.1/Sun Jan 28 22:43:02 2001//Tcyrus-release-2-3-7
-/cyrusrc/1.1/Sun Jan 28 22:43:02 2001//Tcyrus-release-2-3-7
-/run/1.1/Sun Jan 28 22:43:02 2001//Tcyrus-release-2-3-7
+/cyrus.pl/1.1/Sun Jan 28 22:43:02 2001//
+/cyrusrc/1.1/Sun Jan 28 22:43:02 2001//
+/run/1.1/Sun Jan 28 22:43:02 2001//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/drac_auth.patch
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/drac_auth.patch?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/drac_auth.patch (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/drac_auth.patch Tue Feb 27 04:17:11 2007
@@ -1,4 +1,4 @@
-$Id: drac_auth.patch,v 1.17.2.7 2006/05/23 13:49:38 murch Exp $
+$Id: drac_auth.patch,v 1.20 2007/02/06 15:39:09 murch Exp $
Patch to add support for Dynamic Relay Authorization Control
@@ -67,10 +67,10 @@
Index: configure.in
===================================================================
RCS file: /afs/andrew/system/cvs/src/cyrus/configure.in,v
-retrieving revision 1.268.2.23
-diff -u -r1.268.2.23 configure.in
---- configure.in 12 Apr 2005 20:05:20 -0000 1.268.2.23
-+++ configure.in 23 May 2006 13:42:06 -0000
+retrieving revision 1.297
+diff -u -r1.297 configure.in
+--- configure.in 30 Nov 2006 17:11:16 -0000 1.297
++++ configure.in 6 Feb 2007 15:34:18 -0000
@@ -1003,6 +1003,19 @@
SNMP_SUBDIRS=""
AC_SUBST(SNMP_SUBDIRS)
@@ -94,10 +94,10 @@
Index: imap/Makefile.in
===================================================================
RCS file: /afs/andrew/system/cvs/src/cyrus/imap/Makefile.in,v
-retrieving revision 1.175.2.20
-diff -u -r1.175.2.20 Makefile.in
---- imap/Makefile.in 15 Mar 2006 18:56:29 -0000 1.175.2.20
-+++ imap/Makefile.in 23 May 2006 13:42:08 -0000
+retrieving revision 1.186
+diff -u -r1.186 Makefile.in
+--- imap/Makefile.in 9 Jan 2007 17:41:35 -0000 1.186
++++ imap/Makefile.in 6 Feb 2007 15:34:18 -0000
@@ -66,6 +66,7 @@
SIEVE_LIBS = @SIEVE_LIBS@
IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
@@ -139,11 +139,11 @@
Index: imap/imapd.c
===================================================================
RCS file: /afs/andrew/system/cvs/src/cyrus/imap/imapd.c,v
-retrieving revision 1.443.2.81
-diff -u -r1.443.2.81 imapd.c
---- imap/imapd.c 22 May 2006 20:37:14 -0000 1.443.2.81
-+++ imap/imapd.c 23 May 2006 13:42:08 -0000
-@@ -176,6 +176,18 @@
+retrieving revision 1.509
+diff -u -r1.509 imapd.c
+--- imap/imapd.c 5 Feb 2007 18:49:55 -0000 1.509
++++ imap/imapd.c 6 Feb 2007 15:34:18 -0000
+@@ -183,6 +183,18 @@
1, 1, &imapd_authstate, &imapd_userisadmin, &imapd_userisproxyadmin
};
@@ -162,7 +162,7 @@
/* current sub-user state */
static struct mailbox mboxstruct;
static struct mailbox *imapd_mailbox;
-@@ -646,6 +658,23 @@
+@@ -653,6 +665,23 @@
/* setup for sending IMAP IDLE notifications */
idle_enabled();
@@ -186,7 +186,7 @@
/* create connection to the SNMP listener, if available. */
snmp_connect(); /* ignore return code */
snmp_set_str(SERVER_NAME_VERSION,CYRUS_VERSION);
-@@ -750,6 +779,15 @@
+@@ -757,6 +786,15 @@
imapd_haveaddr = 1;
}
}
@@ -202,7 +202,7 @@
}
/* create the SASL connection */
-@@ -792,6 +830,11 @@
+@@ -799,6 +837,11 @@
prot_flush(imapd_out);
snmp_increment(ACTIVE_CONNECTIONS, -1);
@@ -214,7 +214,7 @@
/* cleanup */
imapd_reset();
-@@ -885,6 +928,10 @@
+@@ -892,6 +935,10 @@
cyrus_done();
@@ -225,7 +225,7 @@
exit(code);
}
-@@ -945,6 +992,35 @@
+@@ -952,6 +999,35 @@
}
}
@@ -261,7 +261,7 @@
/*
* Top-level command loop parsing
*/
-@@ -2052,6 +2128,11 @@
+@@ -2058,6 +2134,11 @@
capa_response(CAPA_PREAUTH|CAPA_POSTAUTH);
prot_printf(imapd_out, "] %s\r\n", reply);
@@ -273,7 +273,7 @@
/* Create telemetry log */
imapd_logfd = telemetry_log(imapd_userid, imapd_in, imapd_out, 0);
-@@ -2208,6 +2289,11 @@
+@@ -2214,6 +2295,11 @@
prot_setsasl(imapd_in, imapd_saslconn);
prot_setsasl(imapd_out, imapd_saslconn);
@@ -288,11 +288,11 @@
Index: imap/pop3d.c
===================================================================
RCS file: /afs/andrew/system/cvs/src/cyrus/imap/pop3d.c,v
-retrieving revision 1.144.2.42
-diff -u -r1.144.2.42 pop3d.c
---- imap/pop3d.c 22 May 2006 19:38:32 -0000 1.144.2.42
-+++ imap/pop3d.c 23 May 2006 13:42:08 -0000
-@@ -103,6 +103,10 @@
+retrieving revision 1.171
+diff -u -r1.171 pop3d.c
+--- imap/pop3d.c 5 Feb 2007 18:41:48 -0000 1.171
++++ imap/pop3d.c 6 Feb 2007 15:34:19 -0000
+@@ -105,6 +105,10 @@
extern int opterr;
@@ -303,7 +303,7 @@
#ifdef HAVE_SSL
static SSL *tls_conn;
-@@ -513,6 +517,10 @@
+@@ -522,6 +526,10 @@
prot_settimeout(popd_in, timeout*60);
prot_setflushonread(popd_in, popd_out);
@@ -314,7 +314,7 @@
if (kflag) kpop();
/* we were connected on pop3s port so we should do
-@@ -1648,6 +1656,21 @@
+@@ -1653,6 +1661,21 @@
popd_mailbox = &mboxstruct;
proc_register("pop3d", popd_clienthost, popd_userid,
popd_mailbox->name);
@@ -339,10 +339,10 @@
Index: imap/version.c
===================================================================
RCS file: /afs/andrew/system/cvs/src/cyrus/imap/version.c,v
-retrieving revision 1.14.2.5
-diff -u -r1.14.2.5 version.c
---- imap/version.c 16 Feb 2005 21:06:19 -0000 1.14.2.5
-+++ imap/version.c 23 May 2006 13:42:08 -0000
+retrieving revision 1.20
+diff -u -r1.20 version.c
+--- imap/version.c 30 Nov 2006 17:11:20 -0000 1.20
++++ imap/version.c 6 Feb 2007 15:34:19 -0000
@@ -151,6 +151,10 @@
snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
"; %s", SIEVE_VERSION);
@@ -357,11 +357,11 @@
Index: lib/imapoptions
===================================================================
RCS file: /afs/andrew/system/cvs/src/cyrus/lib/imapoptions,v
-retrieving revision 1.2.2.44
-diff -u -r1.2.2.44 imapoptions
---- lib/imapoptions 30 Mar 2006 16:06:46 -0000 1.2.2.44
-+++ lib/imapoptions 23 May 2006 13:42:08 -0000
-@@ -198,6 +198,14 @@
+retrieving revision 1.41
+diff -u -r1.41 imapoptions
+--- lib/imapoptions 9 Jan 2007 17:29:31 -0000 1.41
++++ lib/imapoptions 6 Feb 2007 15:34:19 -0000
+@@ -203,6 +203,14 @@
grant the user the ability to delete a mailbox. If a user has this
right, they will automatically be given the new 'x' right. */
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/notify_unix/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/notify_unix/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/notify_unix/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/contrib/notify_unix/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,6 +1,6 @@
-/README/1.1/Sat Jun 23 01:01:48 2001//Tcyrus-release-2-3-7
-/net-server-prefork-0.01.tgz/1.1/Sat Jun 23 01:01:48 2001//Tcyrus-release-2-3-7
-/notify/1.1/Sat Jun 23 01:01:48 2001//Tcyrus-release-2-3-7
-/simple_notify.pl/1.1/Sat Jun 23 01:01:49 2001//Tcyrus-release-2-3-7
-/sql_notify.pl/1.1/Sat Jun 23 01:01:49 2001//Tcyrus-release-2-3-7
+/README/1.1/Sat Jun 23 01:01:48 2001//
+/net-server-prefork-0.01.tgz/1.1/Sat Jun 23 01:01:48 2001//
+/notify/1.1/Sat Jun 23 01:01:48 2001//
+/simple_notify.pl/1.1/Sat Jun 23 01:01:49 2001//
+/sql_notify.pl/1.1/Sat Jun 23 01:01:49 2001//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/changelog
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/changelog?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/changelog (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/changelog Tue Feb 27 04:17:11 2007
@@ -1,3 +1,9 @@
+cyrus-imapd-2.3 (2.3.8-1~pr2) UNRELEASED-experimental; urgency=low
+
+ * Update to 2.3.8
+
+ -- Sven Mueller <sven at debian.org> Tue, 27 Feb 2007 02:21:44 +0100
+
cyrus-imapd-2.3 (2.3.7-1~pr1) UNRELEASED-experimental; urgency=low
* New upstream series release (Closes: #382376)
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/deletable.files
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/deletable.files?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/deletable.files (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/deletable.files Tue Feb 27 04:17:11 2007
@@ -59,6 +59,7 @@
doc/text/install-netnews
doc/text/install-perf
doc/text/install-prereq
+doc/text/install-replication
doc/text/install-sieve
doc/text/install-snmpmon
doc/text/install-testing
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/patches/05-fix_programnames.dpatch
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/patches/05-fix_programnames.dpatch?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/patches/05-fix_programnames.dpatch (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/patches/05-fix_programnames.dpatch Tue Feb 27 04:17:11 2007
@@ -6,10 +6,10 @@
## DP: program sources
@DPATCH@
-diff -urNad cyrus-imapd-2.3.7~/imap/deliver.c cyrus-imapd-2.3.7/imap/deliver.c
---- cyrus-imapd-2.3.7~/imap/deliver.c 2005-05-04 21:26:16.000000000 +0200
-+++ cyrus-imapd-2.3.7/imap/deliver.c 2006-08-11 11:50:41.000000000 +0200
-@@ -98,7 +98,7 @@
+diff -urNad cyrus-imapd-2.3-2.3.8/imap/deliver.c /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/imap/deliver.c
+--- cyrus-imapd-2.3-2.3.8/imap/deliver.c 2007-02-27 03:52:47.000000000 +0100
++++ /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/imap/deliver.c 2007-02-27 03:52:51.197072244 +0100
+@@ -101,7 +101,7 @@
static void usage()
{
fprintf(stderr,
@@ -18,10 +18,10 @@
" [-a auth] [-r return_path] [-l] [-D]\r\n");
fprintf(stderr, "421 4.3.0 %s\n", CYRUS_VERSION);
exit(EC_USAGE);
-diff -urNad cyrus-imapd-2.3.7~/imap/quota.c cyrus-imapd-2.3.7/imap/quota.c
---- cyrus-imapd-2.3.7~/imap/quota.c 2005-05-27 18:49:44.000000000 +0200
-+++ cyrus-imapd-2.3.7/imap/quota.c 2006-08-11 11:50:41.000000000 +0200
-@@ -208,7 +208,7 @@
+diff -urNad cyrus-imapd-2.3-2.3.8/imap/quota.c /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/imap/quota.c
+--- cyrus-imapd-2.3-2.3.8/imap/quota.c 2007-02-27 03:52:47.000000000 +0100
++++ /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/imap/quota.c 2007-02-27 03:52:51.197072244 +0100
+@@ -210,7 +210,7 @@
void usage(void)
{
fprintf(stderr,
@@ -30,68 +30,91 @@
exit(EC_USAGE);
}
-diff -urNad cyrus-imapd-2.3.7~/imap/reconstruct.c cyrus-imapd-2.3.7/imap/reconstruct.c
---- cyrus-imapd-2.3.7~/imap/reconstruct.c 2006-06-02 18:41:57.000000000 +0200
-+++ cyrus-imapd-2.3.7/imap/reconstruct.c 2006-08-11 11:50:41.000000000 +0200
-@@ -352,8 +352,8 @@
+diff -urNad cyrus-imapd-2.3-2.3.8/imap/reconstruct.c /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/imap/reconstruct.c
+--- cyrus-imapd-2.3-2.3.8/imap/reconstruct.c 2007-02-27 03:52:47.000000000 +0100
++++ /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/imap/reconstruct.c 2007-02-27 03:52:51.198072145 +0100
+@@ -377,8 +377,8 @@
void usage(void)
{
fprintf(stderr,
-- "usage: reconstruct [-C <alt_config>] [-p partition] [-rfx] mailbox...\n");
+- "usage: reconstruct [-C <alt_config>] [-p partition] [-ksrfx] mailbox...\n");
- fprintf(stderr, " reconstruct [-C <alt_config>] -m\n");
-+ "usage: cyrreconstruct [-C <alt_config>] [-p partition] [-rfx] mailbox...\n");
++ "usage: cyrreconstruct [-C <alt_config>] [-p partition] [-ksrfx] mailbox...\n");
+ fprintf(stderr, " cyrreconstruct [-C <alt_config>] -m\n");
exit(EC_USAGE);
}
-diff -urNad cyrus-imapd-2.3.7~/man/chk_cyrus.8 cyrus-imapd-2.3.7/man/chk_cyrus.8
---- cyrus-imapd-2.3.7~/man/chk_cyrus.8 2006-06-19 15:05:02.000000000 +0200
-+++ cyrus-imapd-2.3.7/man/chk_cyrus.8 2006-08-11 11:50:41.000000000 +0200
+diff -urNad cyrus-imapd-2.3-2.3.8/imap/reconstruct.c.rej /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/imap/reconstruct.c.rej
+--- cyrus-imapd-2.3-2.3.8/imap/reconstruct.c.rej 2007-02-27 03:52:47.000000000 +0100
++++ /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/imap/reconstruct.c.rej 1970-01-01 01:00:00.000000000 +0100
+@@ -1,19 +0,0 @@
+-***************
+-*** 352,359 ****
+- void usage(void)
+- {
+- fprintf(stderr,
+-- "usage: cyrreconstruct [-C <alt_config>] [-p partition] [-rfx] mailbox...\n");
+-- fprintf(stderr, " cyrreconstruct [-C <alt_config>] -m\n");
+- exit(EC_USAGE);
+- }
+-
+---- 352,359 ----
+- void usage(void)
+- {
+- fprintf(stderr,
+-+ "usage: reconstruct [-C <alt_config>] [-p partition] [-rfx] mailbox...\n");
+-+ fprintf(stderr, " reconstruct [-C <alt_config>] -m\n");
+- exit(EC_USAGE);
+- }
+-
+diff -urNad cyrus-imapd-2.3-2.3.8/man/chk_cyrus.8 /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/man/chk_cyrus.8
+--- cyrus-imapd-2.3-2.3.8/man/chk_cyrus.8 2007-02-27 03:52:47.000000000 +0100
++++ /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/man/chk_cyrus.8 2007-02-27 03:52:51.198072145 +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 cyrus-imapd-2.3.7~/man/ctl_cyrusdb.8 cyrus-imapd-2.3.7/man/ctl_cyrusdb.8
---- cyrus-imapd-2.3.7~/man/ctl_cyrusdb.8 2003-08-10 01:43:14.000000000 +0200
-+++ cyrus-imapd-2.3.7/man/ctl_cyrusdb.8 2006-08-11 11:50:41.000000000 +0200
+diff -urNad cyrus-imapd-2.3-2.3.8/man/ctl_cyrusdb.8 /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/man/ctl_cyrusdb.8
+--- cyrus-imapd-2.3-2.3.8/man/ctl_cyrusdb.8 2007-02-27 03:52:47.000000000 +0100
++++ /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/man/ctl_cyrusdb.8 2007-02-27 03:52:51.199072046 +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 cyrus-imapd-2.3.7~/man/ctl_deliver.8 cyrus-imapd-2.3.7/man/ctl_deliver.8
---- cyrus-imapd-2.3.7~/man/ctl_deliver.8 2003-10-22 20:50:13.000000000 +0200
-+++ cyrus-imapd-2.3.7/man/ctl_deliver.8 2006-08-11 11:50:41.000000000 +0200
+diff -urNad cyrus-imapd-2.3-2.3.8/man/ctl_deliver.8 /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/man/ctl_deliver.8
+--- cyrus-imapd-2.3-2.3.8/man/ctl_deliver.8 2007-02-27 03:52:47.000000000 +0100
++++ /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/man/ctl_deliver.8 2007-02-27 03:52:51.199072046 +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 cyrus-imapd-2.3.7~/man/ctl_mboxlist.8 cyrus-imapd-2.3.7/man/ctl_mboxlist.8
---- cyrus-imapd-2.3.7~/man/ctl_mboxlist.8 2006-04-06 17:42:11.000000000 +0200
-+++ cyrus-imapd-2.3.7/man/ctl_mboxlist.8 2006-08-11 11:50:41.000000000 +0200
+diff -urNad cyrus-imapd-2.3-2.3.8/man/ctl_mboxlist.8 /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/man/ctl_mboxlist.8
+--- cyrus-imapd-2.3-2.3.8/man/ctl_mboxlist.8 2007-02-27 03:52:47.000000000 +0100
++++ /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/man/ctl_mboxlist.8 2007-02-27 03:52:51.199072046 +0100
@@ -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 cyrus-imapd-2.3.7~/man/cyr_expire.8 cyrus-imapd-2.3.7/man/cyr_expire.8
---- cyrus-imapd-2.3.7~/man/cyr_expire.8 2004-04-03 20:44:55.000000000 +0200
-+++ cyrus-imapd-2.3.7/man/cyr_expire.8 2006-08-11 11:50:41.000000000 +0200
+diff -urNad cyrus-imapd-2.3-2.3.8/man/cyr_expire.8 /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/man/cyr_expire.8
+--- cyrus-imapd-2.3-2.3.8/man/cyr_expire.8 2007-02-27 03:52:47.000000000 +0100
++++ /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/man/cyr_expire.8 2007-02-27 03:52:51.200071946 +0100
@@ -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 cyrus-imapd-2.3.7~/man/cyrus.conf.5 cyrus-imapd-2.3.7/man/cyrus.conf.5
---- cyrus-imapd-2.3.7~/man/cyrus.conf.5 2005-04-24 22:20:26.000000000 +0200
-+++ cyrus-imapd-2.3.7/man/cyrus.conf.5 2006-08-11 11:50:41.000000000 +0200
+diff -urNad cyrus-imapd-2.3-2.3.8/man/cyrus.conf.5 /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/man/cyrus.conf.5
+--- cyrus-imapd-2.3-2.3.8/man/cyrus.conf.5 2007-02-27 03:52:47.000000000 +0100
++++ /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/man/cyrus.conf.5 2007-02-27 03:52:51.200071946 +0100
@@ -44,9 +44,9 @@
cyrus.conf \- Cyrus configuration file
.SH DESCRIPTION
@@ -121,9 +144,9 @@
+\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 cyrus-imapd-2.3.7~/man/deliver.8 cyrus-imapd-2.3.7/man/deliver.8
---- cyrus-imapd-2.3.7~/man/deliver.8 2006-05-26 18:27:21.000000000 +0200
-+++ cyrus-imapd-2.3.7/man/deliver.8 2006-08-11 11:50:41.000000000 +0200
+diff -urNad cyrus-imapd-2.3-2.3.8/man/deliver.8 /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/man/deliver.8
+--- cyrus-imapd-2.3-2.3.8/man/deliver.8 2007-02-27 03:52:47.000000000 +0100
++++ /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/man/deliver.8 2007-02-27 03:52:51.200071946 +0100
@@ -1,5 +1,5 @@
.\" -*- nroff -*-
-.TH DELIVER 8 "Project Cyrus" CMU
@@ -133,7 +156,7 @@
.\"
@@ -41,9 +41,9 @@
.\"
- .\" $Id: deliver.8,v 1.17.8.2 2006/05/26 16:27:21 murch Exp $
+ .\" $Id: deliver.8,v 1.19 2006/11/30 17:11:23 murch Exp $
.SH NAME
-deliver \- deliver mail to an IMAP mailbox
+cyrdeliver \- deliver mail to an IMAP mailbox
@@ -152,9 +175,9 @@
[
.B \-C
.I config-file
-diff -urNad cyrus-imapd-2.3.7~/man/fud.8 cyrus-imapd-2.3.7/man/fud.8
---- cyrus-imapd-2.3.7~/man/fud.8 2003-10-22 20:50:13.000000000 +0200
-+++ cyrus-imapd-2.3.7/man/fud.8 2006-08-11 11:50:41.000000000 +0200
+diff -urNad cyrus-imapd-2.3-2.3.8/man/fud.8 /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/man/fud.8
+--- cyrus-imapd-2.3-2.3.8/man/fud.8 2007-02-27 03:52:47.000000000 +0100
++++ /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/man/fud.8 2007-02-27 03:52:51.201071847 +0100
@@ -61,7 +61,7 @@
]
.SH DESCRIPTION
@@ -164,9 +187,9 @@
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 cyrus-imapd-2.3.7~/man/idled.8 cyrus-imapd-2.3.7/man/idled.8
---- cyrus-imapd-2.3.7~/man/idled.8 2003-08-10 01:43:14.000000000 +0200
-+++ cyrus-imapd-2.3.7/man/idled.8 2006-08-11 11:50:41.000000000 +0200
+diff -urNad cyrus-imapd-2.3-2.3.8/man/idled.8 /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/man/idled.8
+--- cyrus-imapd-2.3-2.3.8/man/idled.8 2007-02-27 03:52:47.000000000 +0100
++++ /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/man/idled.8 2007-02-27 03:52:51.201071847 +0100
@@ -56,7 +56,7 @@
to report the changes to the client.
.I Idled
@@ -182,9 +205,9 @@
.PP
-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
+\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
-diff -urNad cyrus-imapd-2.3.7~/man/imapd.8 cyrus-imapd-2.3.7/man/imapd.8
---- cyrus-imapd-2.3.7~/man/imapd.8 2002-10-03 21:02:41.000000000 +0200
-+++ cyrus-imapd-2.3.7/man/imapd.8 2006-08-11 11:50:41.000000000 +0200
+diff -urNad cyrus-imapd-2.3-2.3.8/man/imapd.8 /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/man/imapd.8
+--- cyrus-imapd-2.3-2.3.8/man/imapd.8 2007-02-27 03:52:47.000000000 +0100
++++ /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/man/imapd.8 2007-02-27 03:52:51.201071847 +0100
@@ -72,7 +72,7 @@
is an IMAP4rev1 server.
It accepts commands on its standard input and responds on its standard output.
@@ -200,9 +223,9 @@
.PP
-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
+\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
-diff -urNad cyrus-imapd-2.3.7~/man/lmtpd.8 cyrus-imapd-2.3.7/man/lmtpd.8
---- cyrus-imapd-2.3.7~/man/lmtpd.8 2002-10-03 21:02:41.000000000 +0200
-+++ cyrus-imapd-2.3.7/man/lmtpd.8 2006-08-11 11:50:41.000000000 +0200
+diff -urNad cyrus-imapd-2.3-2.3.8/man/lmtpd.8 /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/man/lmtpd.8
+--- cyrus-imapd-2.3-2.3.8/man/lmtpd.8 2007-02-27 03:52:47.000000000 +0100
++++ /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/man/lmtpd.8 2007-02-27 03:52:51.201071847 +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.
@@ -218,9 +241,9 @@
.PP
-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
+\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
-diff -urNad cyrus-imapd-2.3.7~/man/master.8 cyrus-imapd-2.3.7/man/master.8
---- cyrus-imapd-2.3.7~/man/master.8 2004-12-17 19:15:18.000000000 +0100
-+++ cyrus-imapd-2.3.7/man/master.8 2006-08-11 11:50:41.000000000 +0200
+diff -urNad cyrus-imapd-2.3-2.3.8/man/master.8 /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/man/master.8
+--- cyrus-imapd-2.3-2.3.8/man/master.8 2007-02-27 03:52:47.000000000 +0100
++++ /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/man/master.8 2007-02-27 03:52:51.202071748 +0100
@@ -1,5 +1,5 @@
.\" -*- nroff -*-
-.TH MASTER 8 "Project Cyrus" CMU
@@ -230,7 +253,7 @@
.\"
@@ -41,9 +41,9 @@
.\"
- .\" $Id: master.8,v 1.10.2.3 2004/12/17 18:15:18 ken3 Exp $
+ .\" $Id: master.8,v 1.14 2006/11/30 17:11:23 murch Exp $
.SH NAME
-master \- master Cyrus process
+cyrmaster \- master Cyrus process
@@ -309,9 +332,9 @@
.SH SEE ALSO
.PP
\fBcyrus.conf(5)\fR, \fBimapd.conf(5)\fR, \fBimapd(8)\fR,
-diff -urNad cyrus-imapd-2.3.7~/man/nntpd.8 cyrus-imapd-2.3.7/man/nntpd.8
---- cyrus-imapd-2.3.7~/man/nntpd.8 2006-05-26 17:50:11.000000000 +0200
-+++ cyrus-imapd-2.3.7/man/nntpd.8 2006-08-11 11:50:41.000000000 +0200
+diff -urNad cyrus-imapd-2.3-2.3.8/man/nntpd.8 /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/man/nntpd.8
+--- cyrus-imapd-2.3-2.3.8/man/nntpd.8 2007-02-27 03:52:47.000000000 +0100
++++ /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/man/nntpd.8 2007-02-27 03:52:51.202071748 +0100
@@ -78,7 +78,7 @@
is a NNTP server.
It accepts commands on its standard input and responds on its standard output.
@@ -327,9 +350,9 @@
.PP
-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
+\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
-diff -urNad cyrus-imapd-2.3.7~/man/notifyd.8 cyrus-imapd-2.3.7/man/notifyd.8
---- cyrus-imapd-2.3.7~/man/notifyd.8 2003-08-10 01:43:14.000000000 +0200
-+++ cyrus-imapd-2.3.7/man/notifyd.8 2006-08-11 11:50:41.000000000 +0200
+diff -urNad cyrus-imapd-2.3-2.3.8/man/notifyd.8 /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/man/notifyd.8
+--- cyrus-imapd-2.3-2.3.8/man/notifyd.8 2007-02-27 03:52:47.000000000 +0100
++++ /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/man/notifyd.8 2007-02-27 03:52:51.203071648 +0100
@@ -62,7 +62,7 @@
]
.SH DESCRIPTION
@@ -345,9 +368,9 @@
.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 cyrus-imapd-2.3.7~/man/pop3d.8 cyrus-imapd-2.3.7/man/pop3d.8
---- cyrus-imapd-2.3.7~/man/pop3d.8 2006-05-26 17:50:12.000000000 +0200
-+++ cyrus-imapd-2.3.7/man/pop3d.8 2006-08-11 11:50:41.000000000 +0200
+diff -urNad cyrus-imapd-2.3-2.3.8/man/pop3d.8 /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/man/pop3d.8
+--- cyrus-imapd-2.3-2.3.8/man/pop3d.8 2007-02-27 03:52:47.000000000 +0100
++++ /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/man/pop3d.8 2007-02-27 03:52:51.203071648 +0100
@@ -75,7 +75,7 @@
is a POP3 server.
It accepts commands on its standard input and responds on its standard output.
@@ -363,9 +386,9 @@
.PP
-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
+\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
-diff -urNad cyrus-imapd-2.3.7~/man/quota.8 cyrus-imapd-2.3.7/man/quota.8
---- cyrus-imapd-2.3.7~/man/quota.8 2003-10-22 20:50:13.000000000 +0200
-+++ cyrus-imapd-2.3.7/man/quota.8 2006-08-11 11:50:41.000000000 +0200
+diff -urNad cyrus-imapd-2.3-2.3.8/man/quota.8 /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/man/quota.8
+--- cyrus-imapd-2.3-2.3.8/man/quota.8 2007-02-27 03:52:47.000000000 +0100
++++ /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/man/quota.8 2007-02-27 03:52:51.203071648 +0100
@@ -1,5 +1,5 @@
.\" -*- nroff -*-
-.TH QUOTA 8 "Project Cyrus" CMU
@@ -417,9 +440,9 @@
reads its configuration options out of the
.IR imapd.conf (5)
file unless specified otherwise by \fB-C\fR.
-diff -urNad cyrus-imapd-2.3.7~/man/reconstruct.8 cyrus-imapd-2.3.7/man/reconstruct.8
---- cyrus-imapd-2.3.7~/man/reconstruct.8 2006-06-19 14:59:37.000000000 +0200
-+++ cyrus-imapd-2.3.7/man/reconstruct.8 2006-08-11 11:50:41.000000000 +0200
+diff -urNad cyrus-imapd-2.3-2.3.8/man/reconstruct.8 /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/man/reconstruct.8
+--- cyrus-imapd-2.3-2.3.8/man/reconstruct.8 2007-02-27 03:52:47.000000000 +0100
++++ /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/man/reconstruct.8 2007-02-27 03:52:51.204071549 +0100
@@ -1,5 +1,5 @@
.\" -*- nroff -*-
-.TH RECONSTRUCT 8 "Project Cyrus" CMU
@@ -429,7 +452,7 @@
.\"
@@ -41,9 +41,9 @@
.\"
- .\" $Id: reconstruct.8,v 1.18.2.2 2006/06/19 12:59:37 murch Exp $
+ .\" $Id: reconstruct.8,v 1.21 2006/11/30 17:11:23 murch Exp $
.SH NAME
-reconstruct \- reconstruct mailboxes
+cyrreconstruct \- reconstruct mailboxes
@@ -439,8 +462,8 @@
[
.B \-C
.I config-file
-@@ -63,14 +63,14 @@
- ]
+@@ -70,14 +70,14 @@
+
.IR mailbox ...
.br
-.B reconstruct
@@ -456,7 +479,7 @@
rebuilds one or more IMAP mailboxes. When invoked with the
.B \-m
switch, it rebuilds the master
-@@ -78,17 +78,17 @@
+@@ -85,17 +85,17 @@
almost any sort of data corruption.
.PP
If
@@ -478,7 +501,7 @@
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 @@
+@@ -103,12 +103,12 @@
.I partition-news
configuration option is assumed to be in news format.
.PP
@@ -494,9 +517,9 @@
with the
.I \-f
switch in order to fix the quota root files.
-diff -urNad cyrus-imapd-2.3.7~/man/smmapd.8 cyrus-imapd-2.3.7/man/smmapd.8
---- cyrus-imapd-2.3.7~/man/smmapd.8 2003-12-19 19:33:46.000000000 +0100
-+++ cyrus-imapd-2.3.7/man/smmapd.8 2006-08-11 11:50:41.000000000 +0200
+diff -urNad cyrus-imapd-2.3-2.3.8/man/smmapd.8 /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/man/smmapd.8
+--- cyrus-imapd-2.3-2.3.8/man/smmapd.8 2007-02-27 03:52:47.000000000 +0100
++++ /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/man/smmapd.8 2007-02-27 03:52:51.204071549 +0100
@@ -67,7 +67,7 @@
It accepts commands on its standard input and responds on its standard
output.
@@ -506,18 +529,18 @@
with those descriptors attached to a remote client connection.
.PP
.B SMMAPD
-diff -urNad cyrus-imapd-2.3.7~/man/timsieved.8 cyrus-imapd-2.3.7/man/timsieved.8
---- cyrus-imapd-2.3.7~/man/timsieved.8 2004-07-16 16:37:41.000000000 +0200
-+++ cyrus-imapd-2.3.7/man/timsieved.8 2006-08-11 11:50:41.000000000 +0200
+diff -urNad cyrus-imapd-2.3-2.3.8/man/timsieved.8 /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/man/timsieved.8
+--- cyrus-imapd-2.3-2.3.8/man/timsieved.8 2007-02-27 03:52:47.000000000 +0100
++++ /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/man/timsieved.8 2007-02-27 03:52:51.204071549 +0100
@@ -73,4 +73,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 cyrus-imapd-2.3.7~/man/tls_prune.8 cyrus-imapd-2.3.7/man/tls_prune.8
---- cyrus-imapd-2.3.7~/man/tls_prune.8 2003-08-10 01:43:15.000000000 +0200
-+++ cyrus-imapd-2.3.7/man/tls_prune.8 2006-08-11 11:50:41.000000000 +0200
+diff -urNad cyrus-imapd-2.3-2.3.8/man/tls_prune.8 /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/man/tls_prune.8
+--- cyrus-imapd-2.3-2.3.8/man/tls_prune.8 2007-02-27 03:52:47.000000000 +0100
++++ /tmp/dpep.QPQiDX/cyrus-imapd-2.3-2.3.8/man/tls_prune.8 2007-02-27 03:52:51.205071450 +0100
@@ -67,4 +67,4 @@
.B /etc/imapd.conf
.SH SEE ALSO
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/patches/30-update_perlcalling.sh.dpatch
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/patches/30-update_perlcalling.sh.dpatch?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/patches/30-update_perlcalling.sh.dpatch (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/patches/30-update_perlcalling.sh.dpatch Tue Feb 27 04:17:11 2007
@@ -9,81 +9,81 @@
## DP: This should be the default actually.
@DPATCH@
-diff -urNad cyrus-imapd-2.3.7~/contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_master.pl cyrus-imapd-2.3.7/contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_master.pl
---- cyrus-imapd-2.3.7~/contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_master.pl 2001-01-28 23:42:01.000000000 +0100
-+++ cyrus-imapd-2.3.7/contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_master.pl 2006-08-11 12:08:28.000000000 +0200
+diff -urNad cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_master.pl /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_master.pl
+--- cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_master.pl 2007-02-27 03:54:56.000000000 +0100
++++ /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_master.pl 2007-02-27 03:54:57.949483701 +0100
@@ -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.3.7~/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db-sum.pl cyrus-imapd-2.3.7/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db-sum.pl
---- cyrus-imapd-2.3.7~/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db-sum.pl 2001-01-28 23:42:01.000000000 +0100
-+++ cyrus-imapd-2.3.7/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db-sum.pl 2006-08-11 12:08:28.000000000 +0200
+diff -urNad cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db-sum.pl /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db-sum.pl
+--- cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db-sum.pl 2007-02-27 03:54:56.000000000 +0100
++++ /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db-sum.pl 2007-02-27 03:54:57.949483701 +0100
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl5
+#!/usr/bin/perl
#
# Created by Alison Greenwald 21 Sep 2000
-diff -urNad cyrus-imapd-2.3.7~/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db.pl cyrus-imapd-2.3.7/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db.pl
---- cyrus-imapd-2.3.7~/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db.pl 2001-01-28 23:42:01.000000000 +0100
-+++ cyrus-imapd-2.3.7/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db.pl 2006-08-11 12:08:28.000000000 +0200
+diff -urNad cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db.pl /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db.pl
+--- cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db.pl 2007-02-27 03:54:56.000000000 +0100
++++ /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db.pl 2007-02-27 03:54:57.949483701 +0100
@@ -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.3.7~/contrib/mupdate-test.pl cyrus-imapd-2.3.7/contrib/mupdate-test.pl
---- cyrus-imapd-2.3.7~/contrib/mupdate-test.pl 2003-12-19 19:33:25.000000000 +0100
-+++ cyrus-imapd-2.3.7/contrib/mupdate-test.pl 2006-08-11 12:08:28.000000000 +0200
+diff -urNad cyrus-imapd-2.3-2.3.8/contrib/mupdate-test.pl /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/contrib/mupdate-test.pl
+--- cyrus-imapd-2.3-2.3.8/contrib/mupdate-test.pl 2007-02-27 03:54:56.000000000 +0100
++++ /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/contrib/mupdate-test.pl 2007-02-27 03:54:57.949483701 +0100
@@ -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.3.7~/perl/imap/examples/auditmbox.pl cyrus-imapd-2.3.7/perl/imap/examples/auditmbox.pl
---- cyrus-imapd-2.3.7~/perl/imap/examples/auditmbox.pl 2003-12-19 19:33:52.000000000 +0100
-+++ cyrus-imapd-2.3.7/perl/imap/examples/auditmbox.pl 2006-08-11 12:08:28.000000000 +0200
+diff -urNad cyrus-imapd-2.3-2.3.8/perl/imap/examples/auditmbox.pl /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/perl/imap/examples/auditmbox.pl
+--- cyrus-imapd-2.3-2.3.8/perl/imap/examples/auditmbox.pl 2007-02-27 03:54:56.000000000 +0100
++++ /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/perl/imap/examples/auditmbox.pl 2007-02-27 03:54:57.950483602 +0100
@@ -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.3.7~/perl/imap/examples/imapcollate.pl cyrus-imapd-2.3.7/perl/imap/examples/imapcollate.pl
---- cyrus-imapd-2.3.7~/perl/imap/examples/imapcollate.pl 2002-05-25 21:57:50.000000000 +0200
-+++ cyrus-imapd-2.3.7/perl/imap/examples/imapcollate.pl 2006-08-11 12:08:28.000000000 +0200
+diff -urNad cyrus-imapd-2.3-2.3.8/perl/imap/examples/imapcollate.pl /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/perl/imap/examples/imapcollate.pl
+--- cyrus-imapd-2.3-2.3.8/perl/imap/examples/imapcollate.pl 2007-02-27 03:54:56.000000000 +0100
++++ /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/perl/imap/examples/imapcollate.pl 2007-02-27 03:54:57.950483602 +0100
@@ -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.3.7~/perl/imap/examples/imapdu.pl cyrus-imapd-2.3.7/perl/imap/examples/imapdu.pl
---- cyrus-imapd-2.3.7~/perl/imap/examples/imapdu.pl 2001-11-30 20:30:45.000000000 +0100
-+++ cyrus-imapd-2.3.7/perl/imap/examples/imapdu.pl 2006-08-11 12:08:28.000000000 +0200
+diff -urNad cyrus-imapd-2.3-2.3.8/perl/imap/examples/imapdu.pl /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/perl/imap/examples/imapdu.pl
+--- cyrus-imapd-2.3-2.3.8/perl/imap/examples/imapdu.pl 2007-02-27 03:54:56.000000000 +0100
++++ /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/perl/imap/examples/imapdu.pl 2007-02-27 03:54:57.950483602 +0100
@@ -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.3.7~/perl/imap/examples/test-imsp.pl cyrus-imapd-2.3.7/perl/imap/examples/test-imsp.pl
---- cyrus-imapd-2.3.7~/perl/imap/examples/test-imsp.pl 2002-05-25 21:57:50.000000000 +0200
-+++ cyrus-imapd-2.3.7/perl/imap/examples/test-imsp.pl 2006-08-11 12:08:28.000000000 +0200
+diff -urNad cyrus-imapd-2.3-2.3.8/perl/imap/examples/test-imsp.pl /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/perl/imap/examples/test-imsp.pl
+--- cyrus-imapd-2.3-2.3.8/perl/imap/examples/test-imsp.pl 2007-02-27 03:54:56.000000000 +0100
++++ /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/perl/imap/examples/test-imsp.pl 2007-02-27 03:54:57.951483503 +0100
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl -w
+#!/usr/bin/perl -w
# test-imsp.pl
#
-diff -urNad cyrus-imapd-2.3.7~/perl/sieve/scripts/installsieve.pl cyrus-imapd-2.3.7/perl/sieve/scripts/installsieve.pl
---- cyrus-imapd-2.3.7~/perl/sieve/scripts/installsieve.pl 2002-05-25 21:57:52.000000000 +0200
-+++ cyrus-imapd-2.3.7/perl/sieve/scripts/installsieve.pl 2006-08-11 12:08:28.000000000 +0200
+diff -urNad cyrus-imapd-2.3-2.3.8/perl/sieve/scripts/installsieve.pl /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/perl/sieve/scripts/installsieve.pl
+--- cyrus-imapd-2.3-2.3.8/perl/sieve/scripts/installsieve.pl 2007-02-27 03:54:56.000000000 +0100
++++ /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/perl/sieve/scripts/installsieve.pl 2007-02-27 03:54:57.951483503 +0100
@@ -1,6 +1,4 @@
-#! /bin/sh
-exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
@@ -92,9 +92,9 @@
#
# Copyright (c) 2000 Carnegie Mellon University. All rights reserved.
#
-diff -urNad cyrus-imapd-2.3.7~/perl/sieve/scripts/sieveshell.pl cyrus-imapd-2.3.7/perl/sieve/scripts/sieveshell.pl
---- cyrus-imapd-2.3.7~/perl/sieve/scripts/sieveshell.pl 2004-01-15 21:24:44.000000000 +0100
-+++ cyrus-imapd-2.3.7/perl/sieve/scripts/sieveshell.pl 2006-08-11 12:08:28.000000000 +0200
+diff -urNad cyrus-imapd-2.3-2.3.8/perl/sieve/scripts/sieveshell.pl /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/perl/sieve/scripts/sieveshell.pl
+--- cyrus-imapd-2.3-2.3.8/perl/sieve/scripts/sieveshell.pl 2007-02-27 03:54:56.000000000 +0100
++++ /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/perl/sieve/scripts/sieveshell.pl 2007-02-27 03:54:57.951483503 +0100
@@ -1,6 +1,4 @@
-#! /bin/sh
-exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
@@ -103,9 +103,9 @@
#
# Copyright (c) 2000 Carnegie Mellon University. All rights reserved.
#
-diff -urNad cyrus-imapd-2.3.7~/snmp/snmpgen cyrus-imapd-2.3.7/snmp/snmpgen
---- cyrus-imapd-2.3.7~/snmp/snmpgen 2005-04-11 08:09:27.000000000 +0200
-+++ cyrus-imapd-2.3.7/snmp/snmpgen 2006-08-11 12:08:28.000000000 +0200
+diff -urNad cyrus-imapd-2.3-2.3.8/snmp/snmpgen /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/snmp/snmpgen
+--- cyrus-imapd-2.3-2.3.8/snmp/snmpgen 2007-02-27 03:54:56.000000000 +0100
++++ /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/snmp/snmpgen 2007-02-27 03:57:28.886495687 +0100
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/perl -w
@@ -118,7 +118,7 @@
#
-exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
-#!perl -w
- # $Id: snmpgen,v 1.15.4.3 2005/04/11 06:09:27 shadow Exp $
+ # $Id: snmpgen,v 1.19 2006/11/30 17:11:25 murch Exp $
-if ($] !~ /^5\..*/) {
- # uh-oh. this isn't perl 5.
@@ -138,22 +138,62 @@
require 5;
#Tim Martin
-diff -urNad cyrus-imapd-2.3.7~/tools/arbitronsort.pl cyrus-imapd-2.3.7/tools/arbitronsort.pl
---- cyrus-imapd-2.3.7~/tools/arbitronsort.pl 2003-08-04 19:13:24.000000000 +0200
-+++ cyrus-imapd-2.3.7/tools/arbitronsort.pl 2006-08-11 12:08:28.000000000 +0200
+diff -urNad cyrus-imapd-2.3-2.3.8/snmp/snmpgen.rej /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/snmp/snmpgen.rej
+--- cyrus-imapd-2.3-2.3.8/snmp/snmpgen.rej 2007-02-27 03:54:56.000000000 +0100
++++ /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/snmp/snmpgen.rej 1970-01-01 01:00:00.000000000 +0100
+@@ -1,36 +0,0 @@
+-***************
+-*** 38,45 ****
+- # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+- # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+- #
+- # $Id: snmpgen,v 1.15.4.3 2005/04/11 06:09:27 shadow Exp $
+-
+- require 5;
+-
+- #Tim Martin
+---- 38,62 ----
+- # 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.15.4.3 2005/04/11 06:09:27 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.3-2.3.8/tools/arbitronsort.pl /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/tools/arbitronsort.pl
+--- cyrus-imapd-2.3-2.3.8/tools/arbitronsort.pl 2007-02-27 03:54:56.000000000 +0100
++++ /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/tools/arbitronsort.pl 2007-02-27 03:54:57.952483403 +0100
@@ -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.3.7~/tools/config2header cyrus-imapd-2.3.7/tools/config2header
---- cyrus-imapd-2.3.7~/tools/config2header 2005-04-13 17:43:33.000000000 +0200
-+++ cyrus-imapd-2.3.7/tools/config2header 2006-08-11 12:09:17.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/usr/bin/perl -w
- # $Id: config2header,v 1.2.2.12 2005/04/13 15:43:33 shadow Exp $
+diff -urNad cyrus-imapd-2.3-2.3.8/tools/config2header /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/tools/config2header
+--- cyrus-imapd-2.3-2.3.8/tools/config2header 2007-02-27 03:54:56.000000000 +0100
++++ /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/tools/config2header 2007-02-27 03:59:28.766571652 +0100
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/usr/bin/perl -w
+ # $Id: config2header,v 1.13 2006/11/30 17:11:25 murch Exp $
#
# Copyright (c) 2001 Carnegie Mellon University. All rights reserved.
@@ -39,24 +39,6 @@
@@ -181,13 +221,28 @@
require 5;
use strict;
-diff -urNad cyrus-imapd-2.3.7~/tools/config2man cyrus-imapd-2.3.7/tools/config2man
---- cyrus-imapd-2.3.7~/tools/config2man 2003-12-19 19:33:58.000000000 +0100
-+++ cyrus-imapd-2.3.7/tools/config2man 2006-08-11 12:09:33.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/usr/bin/perl -w
- # $Id: config2man,v 1.2.2.1 2003/12/19 18:33:58 ken3 Exp $
+diff -urNad cyrus-imapd-2.3-2.3.8/tools/config2header.rej /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/tools/config2header.rej
+--- cyrus-imapd-2.3-2.3.8/tools/config2header.rej 2007-02-27 03:54:56.000000000 +0100
++++ /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/tools/config2header.rej 1970-01-01 01:00:00.000000000 +0100
+@@ -1,11 +0,0 @@
+-***************
+-*** 1,4 ****
+-- #!/usr/bin/perl -w
+- # $Id: config2header,v 1.2.2.12 2005/04/13 15:43:33 shadow Exp $
+- #
+- # Copyright (c) 2001 Carnegie Mellon University. All rights reserved.
+---- 1,4 ----
+-+ #!/bin/sh
+- # $Id: config2header,v 1.2.2.12 2005/04/13 15:43:33 shadow Exp $
+- #
+- # Copyright (c) 2001 Carnegie Mellon University. All rights reserved.
+diff -urNad cyrus-imapd-2.3-2.3.8/tools/config2man /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/tools/config2man
+--- cyrus-imapd-2.3-2.3.8/tools/config2man 2007-02-27 03:54:56.000000000 +0100
++++ /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/tools/config2man 2007-02-27 03:58:59.045529126 +0100
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/usr/bin/perl -w
+ # $Id: config2man,v 1.4 2006/11/30 17:11:25 murch Exp $
#
# Copyright (c) 2001 Carnegie Mellon University. All rights reserved.
@@ -39,24 +39,6 @@
@@ -215,24 +270,39 @@
require 5;
use strict;
-diff -urNad cyrus-imapd-2.3.7~/tools/dohash cyrus-imapd-2.3.7/tools/dohash
---- cyrus-imapd-2.3.7~/tools/dohash 2005-12-01 23:30:21.000000000 +0100
-+++ cyrus-imapd-2.3.7/tools/dohash 2006-08-11 12:09:59.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/usr/bin/perl -w
- #
- # Copyright (c) 2000 Carnegie Mellon University. All rights reserved.
- #
-@@ -38,27 +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
--# 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.18.1 2005/12/01 22:30:21 murch Exp $
+diff -urNad cyrus-imapd-2.3-2.3.8/tools/config2man.rej /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/tools/config2man.rej
+--- cyrus-imapd-2.3-2.3.8/tools/config2man.rej 2007-02-27 03:54:56.000000000 +0100
++++ /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/tools/config2man.rej 1970-01-01 01:00:00.000000000 +0100
+@@ -1,11 +0,0 @@
+-***************
+-*** 1,4 ****
+-- #!/usr/bin/perl -w
+- # $Id: config2man,v 1.2.2.1 2003/12/19 18:33:58 ken3 Exp $
+- #
+- # Copyright (c) 2001 Carnegie Mellon University. All rights reserved.
+---- 1,4 ----
+-+ #!/bin/sh
+- # $Id: config2man,v 1.2.2.1 2003/12/19 18:33:58 ken3 Exp $
+- #
+- # Copyright (c) 2001 Carnegie Mellon University. All rights reserved.
+diff -urNad cyrus-imapd-2.3-2.3.8/tools/dohash /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/tools/dohash
+--- cyrus-imapd-2.3-2.3.8/tools/dohash 2007-02-27 03:54:56.000000000 +0100
++++ /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/tools/dohash 2007-02-27 03:58:39.706453594 +0100
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/usr/bin/perl -w
+ #
+ # Copyright (c) 2000 Carnegie Mellon University. All rights reserved.
+ #
+@@ -38,27 +38,10 @@
+ # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ #
+-exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
+-#!perl -w
+ # script to upgrade from versions of imapd previous to 1.6.2
+ # make sure you run it as the cyrus user
+ # $Id: dohash,v 1.12 2006/11/30 17:11:25 murch Exp $
-if ($] !~ /^5\..*/) {
- # uh-oh. this isn't perl 5.
@@ -252,9 +322,51 @@
require 5;
$| = 1;
-diff -urNad cyrus-imapd-2.3.7~/tools/masssievec cyrus-imapd-2.3.7/tools/masssievec
---- cyrus-imapd-2.3.7~/tools/masssievec 2005-12-01 23:30:21.000000000 +0100
-+++ cyrus-imapd-2.3.7/tools/masssievec 2006-08-11 12:10:34.000000000 +0200
+diff -urNad cyrus-imapd-2.3-2.3.8/tools/dohash.rej /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/tools/dohash.rej
+--- cyrus-imapd-2.3-2.3.8/tools/dohash.rej 2007-02-27 03:54:56.000000000 +0100
++++ /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/tools/dohash.rej 1970-01-01 01:00:00.000000000 +0100
+@@ -1,38 +0,0 @@
+-***************
+-*** 38,45 ****
+- # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+- # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+- #
+- # $Id: dohash,v 1.10.18.1 2005/12/01 22:30:21 murch Exp $
+-
+- require 5;
+-
+- $| = 1;
+---- 38,64 ----
+- # 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.18.1 2005/12/01 22:30:21 murch Exp $
+-
+-+ if ($] !~ /^5\..*/) {
+-+ # uh-oh. this isn't perl 5.
+-+ foreach (split(/:/, $ENV{PATH})) { # try to find "perl5".
+-+ exec("$_/perl5", "-x", "-S", $0, @ARGV) if (-x "$_/perl5");
+-+ }
+-+ # we failed. bail.
+-+ die "Your perl is too old; I need perl 5.\n";
+-+ }
+-+
+-+ # load the real script. this is isolated in an 'eval' so perl4 won't
+-+ # choke on the perl5-isms.
+-+ eval join("\n", <DATA>);
+-+ if ($@) { die "$@"; }
+-+
+-+ __END__
+- require 5;
+-
+- $| = 1;
+diff -urNad cyrus-imapd-2.3-2.3.8/tools/masssievec /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/tools/masssievec
+--- cyrus-imapd-2.3-2.3.8/tools/masssievec 2007-02-27 03:54:56.000000000 +0100
++++ /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/tools/masssievec 2007-02-27 03:58:22.326183189 +0100
@@ -1,4 +1,6 @@
-#!/bin/sh
+#!/usr/bin/perl -w
@@ -272,7 +384,7 @@
#
# Script for mass compilation of sieve scripts.
#
- # $Id: masssievec,v 1.2.2.3 2005/12/01 22:30:21 murch Exp $
+ # $Id: masssievec,v 1.6 2006/11/30 17:11:25 murch Exp $
-if ($] !~ /^5\..*/) {
- # uh-oh. this isn't perl 5.
@@ -292,9 +404,55 @@
require 5;
$| = 1;
-diff -urNad cyrus-imapd-2.3.7~/tools/mkimap cyrus-imapd-2.3.7/tools/mkimap
---- cyrus-imapd-2.3.7~/tools/mkimap 2005-12-01 23:30:22.000000000 +0100
-+++ cyrus-imapd-2.3.7/tools/mkimap 2006-08-11 12:10:49.000000000 +0200
+diff -urNad cyrus-imapd-2.3-2.3.8/tools/masssievec.rej /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/tools/masssievec.rej
+--- cyrus-imapd-2.3-2.3.8/tools/masssievec.rej 2007-02-27 03:54:56.000000000 +0100
++++ /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/tools/masssievec.rej 1970-01-01 01:00:00.000000000 +0100
+@@ -1,42 +0,0 @@
+-***************
+-*** 40,50 ****
+- # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+- # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+- #
+- #
+- # Script for mass compilation of sieve scripts.
+- #
+- # $Id: masssievec,v 1.2.2.3 2005/12/01 22:30:21 murch Exp $
+-
+- require 5;
+-
+- $| = 1;
+---- 38,65 ----
+- # 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.2.2.3 2005/12/01 22:30:21 murch Exp $
+-
+-+ if ($] !~ /^5\..*/) {
+-+ # uh-oh. this isn't perl 5.
+-+ foreach (split(/:/, $ENV{PATH})) { # try to find "perl5".
+-+ exec("$_/perl5", "-x", "-S", $0, @ARGV) if (-x "$_/perl5");
+-+ }
+-+ # we failed. bail.
+-+ die "Your perl is too old; I need perl 5.\n";
+-+ }
+-+
+-+ # load the real script. this is isolated in an 'eval' so perl4 won't
+-+ # choke on the perl5-isms.
+-+ eval join("\n", <DATA>);
+-+ if ($@) { die "$@"; }
+-+
+-+ __END__
+- require 5;
+-
+- $| = 1;
+diff -urNad cyrus-imapd-2.3-2.3.8/tools/mkimap /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/tools/mkimap
+--- cyrus-imapd-2.3-2.3.8/tools/mkimap 2007-02-27 03:54:56.000000000 +0100
++++ /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/tools/mkimap 2007-02-27 03:57:49.725426588 +0100
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/perl
@@ -307,7 +465,7 @@
#
-exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
-#!perl -w
- # $Id: mkimap,v 1.15.2.4 2005/12/01 22:30:22 murch Exp $
+ # $Id: mkimap,v 1.18 2006/11/30 17:11:25 murch Exp $
-if ($] !~ /^5\..*/) {
- # uh-oh. this isn't perl 5.
@@ -327,9 +485,49 @@
require 5;
sub read_conf {
-diff -urNad cyrus-imapd-2.3.7~/tools/mknewsgroups cyrus-imapd-2.3.7/tools/mknewsgroups
---- cyrus-imapd-2.3.7~/tools/mknewsgroups 2003-10-22 20:03:47.000000000 +0200
-+++ cyrus-imapd-2.3.7/tools/mknewsgroups 2006-08-11 12:08:28.000000000 +0200
+diff -urNad cyrus-imapd-2.3-2.3.8/tools/mkimap.rej /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/tools/mkimap.rej
+--- cyrus-imapd-2.3-2.3.8/tools/mkimap.rej 2007-02-27 03:54:56.000000000 +0100
++++ /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/tools/mkimap.rej 1970-01-01 01:00:00.000000000 +0100
+@@ -1,36 +0,0 @@
+-***************
+-*** 38,45 ****
+- # AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+- # OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+- #
+- # $Id: mkimap,v 1.15.2.4 2005/12/01 22:30:22 murch Exp $
+-
+- require 5;
+-
+- sub read_conf {
+---- 38,62 ----
+- # 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.15.2.4 2005/12/01 22:30:22 murch Exp $
+-
+-+ if ($] !~ /^5\..*/) {
+-+ # uh-oh. this isn't perl 5.
+-+ foreach (split(/:/, $ENV{PATH})) { # try to find "perl5".
+-+ exec("$_/perl5", "-x", "-S", $0, @ARGV) if (-x "$_/perl5");
+-+ }
+-+ # we failed. bail.
+-+ die "Your perl is too old; I need perl 5.\n";
+-+ }
+-+
+-+ # load the real script. this is isolated in an 'eval' so perl4 won't
+-+ # choke on the perl5-isms.
+-+ eval join("\n", <DATA>);
+-+ if ($@) { die "$@"; }
+-+
+-+ __END__
+- require 5;
+-
+- sub read_conf {
+diff -urNad cyrus-imapd-2.3-2.3.8/tools/mknewsgroups /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/tools/mknewsgroups
+--- cyrus-imapd-2.3-2.3.8/tools/mknewsgroups 2007-02-27 03:54:56.000000000 +0100
++++ /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/tools/mknewsgroups 2007-02-27 03:54:57.955483105 +0100
@@ -1,5 +1,8 @@
-#!/bin/sh
+#!/usr/bin/perl -w
@@ -370,9 +568,9 @@
require 5;
use Getopt::Long;
-diff -urNad cyrus-imapd-2.3.7~/tools/rehash cyrus-imapd-2.3.7/tools/rehash
---- cyrus-imapd-2.3.7~/tools/rehash 2005-12-01 23:30:22.000000000 +0100
-+++ cyrus-imapd-2.3.7/tools/rehash 2006-08-11 12:08:28.000000000 +0200
+diff -urNad cyrus-imapd-2.3-2.3.8/tools/rehash /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/tools/rehash
+--- cyrus-imapd-2.3-2.3.8/tools/rehash 2007-02-27 03:54:56.000000000 +0100
++++ /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/tools/rehash 2007-02-27 03:54:57.956483006 +0100
@@ -1,4 +1,8 @@
-#!/bin/sh
+#!/usr/bin/perl
@@ -394,7 +592,7 @@
#
@@ -47,21 +49,6 @@
#
- # $Id: rehash,v 1.7.2.1 2005/12/01 22:30:22 murch Exp $
+ # $Id: rehash,v 1.9 2006/11/30 17:11:25 murch Exp $
-if ($] !~ /^5\..*/) {
- # uh-oh. this isn't perl 5.
@@ -414,9 +612,9 @@
require 5;
$| = 1;
-diff -urNad cyrus-imapd-2.3.7~/tools/translatesieve cyrus-imapd-2.3.7/tools/translatesieve
---- cyrus-imapd-2.3.7~/tools/translatesieve 2005-12-01 23:30:22.000000000 +0100
-+++ cyrus-imapd-2.3.7/tools/translatesieve 2006-08-11 12:08:28.000000000 +0200
+diff -urNad cyrus-imapd-2.3-2.3.8/tools/translatesieve /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/tools/translatesieve
+--- cyrus-imapd-2.3-2.3.8/tools/translatesieve 2007-02-27 03:54:56.000000000 +0100
++++ /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/tools/translatesieve 2007-02-27 03:54:57.956483006 +0100
@@ -1,6 +1,4 @@
-#!/bin/sh
-exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
@@ -447,18 +645,18 @@
require 5;
$| = 1;
-diff -urNad cyrus-imapd-2.3.7~/tools/undohash cyrus-imapd-2.3.7/tools/undohash
---- cyrus-imapd-2.3.7~/tools/undohash 2005-12-01 23:30:23.000000000 +0100
-+++ cyrus-imapd-2.3.7/tools/undohash 2006-08-11 12:08:28.000000000 +0200
+diff -urNad cyrus-imapd-2.3-2.3.8/tools/undohash /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/tools/undohash
+--- cyrus-imapd-2.3-2.3.8/tools/undohash 2007-02-27 03:54:56.000000000 +0100
++++ /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/tools/undohash 2007-02-27 03:54:57.956483006 +0100
@@ -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.8.1 2005/12/01 22:30:23 murch Exp $
-diff -urNad cyrus-imapd-2.3.7~/tools/upgradesieve cyrus-imapd-2.3.7/tools/upgradesieve
---- cyrus-imapd-2.3.7~/tools/upgradesieve 2005-12-01 23:30:23.000000000 +0100
-+++ cyrus-imapd-2.3.7/tools/upgradesieve 2006-08-11 12:08:28.000000000 +0200
+ # $Id: undohash,v 1.9 2006/11/30 17:11:25 murch Exp $
+diff -urNad cyrus-imapd-2.3-2.3.8/tools/upgradesieve /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/tools/upgradesieve
+--- cyrus-imapd-2.3-2.3.8/tools/upgradesieve 2007-02-27 03:54:56.000000000 +0100
++++ /tmp/dpep.uetA0X/cyrus-imapd-2.3-2.3.8/tools/upgradesieve 2007-02-27 03:54:57.957482907 +0100
@@ -1,6 +1,4 @@
-#!/bin/sh
-exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/patches/70-allow-larger-buffers.dpatch
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/patches/70-allow-larger-buffers.dpatch?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/patches/70-allow-larger-buffers.dpatch (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/patches/70-allow-larger-buffers.dpatch Tue Feb 27 04:17:11 2007
@@ -7,17 +7,19 @@
## DP: http://cyrus.brong.fastmail.fm/patches/cyrus-longwords-2.3.3.diff
@DPATCH@
-diff -urNad cyrus-imapd-2.2.13/imap/imapparse.c /tmp/dpep.n4kRMv/cyrus-imapd-2.2.13/imap/imapparse.c
---- cyrus-imapd-2.2.13/imap/imapparse.c 2006-03-31 20:18:13.000000000 +0200
-+++ /tmp/dpep.n4kRMv/cyrus-imapd-2.2.13/imap/imapparse.c 2006-05-24 14:33:42.733793569 +0200
-@@ -52,8 +52,8 @@
+diff -urNad cyrus-imapd-2.2.13/imap/imapparse.c /tmp/dpep.G4uvjC/cyrus-imapd-2.2.13/imap/imapparse.c
+--- cyrus-imapd-2.2.13/imap/imapparse.c 2007-02-25 21:39:04.000000000 +0100
++++ /tmp/dpep.G4uvjC/cyrus-imapd-2.2.13/imap/imapparse.c 2007-02-25 21:40:19.830078835 +0100
+@@ -52,9 +52,9 @@
#include "exitcodes.h"
enum {
- MAXQUOTED = 32768,
- MAXWORD = 32768,
-+ MAXQUOTED = 131072,
-+ MAXWORD = 131072,
- MAXLITERAL = INT_MAX / 20
+- MAXLITERAL = INT_MAX / 20
++ MAXQUOTED = 524288,
++ MAXWORD = 524288,
++ MAXLITERAL = INT_MAX / 10
};
+ void freebuf(struct buf *buf)
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/patches/72-faster-isdigit.dpatch
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/patches/72-faster-isdigit.dpatch?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/patches/72-faster-isdigit.dpatch (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/patches/72-faster-isdigit.dpatch Tue Feb 27 04:17:11 2007
@@ -7,10 +7,10 @@
## DP: http://cyrus.brong.fastmail.fm/patches/cyrus-isdigit-2.3.3.diff
@DPATCH@
-diff -urNad cyrus-imapd-2.3-2.3.7~/imap/index.c cyrus-imapd-2.3-2.3.7/imap/index.c
---- cyrus-imapd-2.3-2.3.7~/imap/index.c 2006-08-14 16:23:07.000000000 +0200
-+++ cyrus-imapd-2.3-2.3.7/imap/index.c 2006-08-14 16:23:07.000000000 +0200
-@@ -516,8 +516,8 @@
+diff -urNad cyrus-imapd-2.3-2.3.8/imap/index.c /tmp/dpep.mjLm85/cyrus-imapd-2.3-2.3.8/imap/index.c
+--- cyrus-imapd-2.3-2.3.8/imap/index.c 2007-02-27 04:00:28.000000000 +0100
++++ /tmp/dpep.mjLm85/cyrus-imapd-2.3-2.3.8/imap/index.c 2007-02-27 04:00:29.789499834 +0100
+@@ -518,8 +518,8 @@
*/
old = seenuids;
new = newseenuids;
@@ -21,7 +21,7 @@
for (msgno = 1; msgno <= imapd_exists; msgno++) {
uid = UID(msgno);
-@@ -531,7 +531,7 @@
+@@ -533,7 +533,7 @@
oldnext = 0;
if (!*old) oldnext = mailbox->last_uid+1;
else old++;
@@ -30,7 +30,7 @@
oldnext = oldnext * 10 + *old++ - '0';
}
oldnext += oldseen;
-@@ -550,7 +550,7 @@
+@@ -552,7 +552,7 @@
neweof++;
}
else new++;
@@ -39,7 +39,7 @@
newnext = newnext * 10 + *new++ - '0';
}
newnext += newseen;
-@@ -682,7 +682,7 @@
+@@ -684,7 +684,7 @@
neweof++;
}
else new++;
@@ -48,7 +48,7 @@
newnext += newseen;
}
}
-@@ -700,7 +700,7 @@
+@@ -702,7 +702,7 @@
/* There's a ":M" after the ",N". Parse/include that too. */
new++;
newnext = 0;
@@ -57,7 +57,7 @@
}
uid = newnext;
newseen++; /* Forget we parsed ",N" */
-@@ -1683,7 +1683,7 @@
+@@ -1691,7 +1691,7 @@
}
for (;;) {
@@ -66,7 +66,7 @@
start = start*10 + *sequence - '0';
}
else if (*sequence == '*') {
-@@ -1692,7 +1692,7 @@
+@@ -1700,7 +1700,7 @@
else if (*sequence == ':') {
end = 0;
sequence++;
@@ -75,7 +75,7 @@
end = end*10 + *sequence++ - '0';
}
if (*sequence == '*') {
-@@ -1750,7 +1750,7 @@
+@@ -1758,7 +1758,7 @@
unsigned i, start = 0, end;
for (;;) {
@@ -84,7 +84,7 @@
start = start*10 + *sequence - '0';
}
else if (*sequence == '*') {
-@@ -1760,7 +1760,7 @@
+@@ -1768,7 +1768,7 @@
else if (*sequence == ':') {
end = 0;
sequence++;
@@ -93,7 +93,7 @@
end = end*10 + *sequence++ - '0';
}
if (*sequence == '*') {
-@@ -1885,7 +1885,7 @@
+@@ -1899,7 +1899,7 @@
while (*p != ']' && *p != 'M') {
/* Generate the actual part number */
skip = 0;
@@ -102,7 +102,7 @@
skip = skip * 10 + *p++ - '0';
/* xxx overflow */
}
-@@ -2014,7 +2014,7 @@
+@@ -2028,7 +2028,7 @@
while (*p != 'H') {
skip = 0;
@@ -111,7 +111,7 @@
skip = skip * 10 + *p++ - '0';
/* xxx overflow */
}
-@@ -3751,7 +3751,7 @@
+@@ -3766,7 +3766,7 @@
case '{': /* literal */
c++; /* skip open brace */
len = 0; /* determine length of literal */
@@ -120,7 +120,7 @@
len = len*10 + *c - '0';
c++;
}
-@@ -3905,7 +3905,7 @@
+@@ -3920,7 +3920,7 @@
break;
/* if we have a digit, and we're still
counting, keep building the count */
@@ -129,12 +129,12 @@
count = count * 10 + *x - '0';
if (count < 0) { /* overflow */
count = -1; /* abort counting */
-diff -urNad cyrus-imapd-2.3-2.3.7~/lib/util.h cyrus-imapd-2.3-2.3.7/lib/util.h
---- cyrus-imapd-2.3-2.3.7~/lib/util.h 2004-09-10 15:51:12.000000000 +0200
-+++ cyrus-imapd-2.3-2.3.7/lib/util.h 2006-08-14 16:23:07.000000000 +0200
-@@ -107,4 +107,10 @@
- */
- extern int cyrus_mkdir(const char *path, mode_t mode);
+diff -urNad cyrus-imapd-2.3-2.3.8/lib/util.h /tmp/dpep.mjLm85/cyrus-imapd-2.3-2.3.8/lib/util.h
+--- cyrus-imapd-2.3-2.3.8/lib/util.h 2007-02-27 04:00:26.000000000 +0100
++++ /tmp/dpep.mjLm85/cyrus-imapd-2.3-2.3.8/lib/util.h 2007-02-27 04:00:29.790499734 +0100
+@@ -113,4 +113,10 @@
+
+ #define cyrus_isdigit(x) ((x) >= '0' && (x) <= '9')
+/* Some systems have very inefficient implementations of isdigit,
+ * and we use it in a lot of inner loops
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/patches/99-update-autoconf.dpatch
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/patches/99-update-autoconf.dpatch?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/patches/99-update-autoconf.dpatch (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/patches/99-update-autoconf.dpatch Tue Feb 27 04:17:11 2007
@@ -5,42 +5,39 @@
## DP: Update configure and config.h.in according to changes in other patches
@DPATCH@
-diff -urNad cyrus-imapd-2.3-2.3.7~/autom4te.cache/output.0 cyrus-imapd-2.3-2.3.7/autom4te.cache/output.0
-diff -urNad cyrus-imapd-2.3-2.3.7~/config.guess cyrus-imapd-2.3-2.3.7/config.guess
---- cyrus-imapd-2.3-2.3.7~/config.guess 2006-10-10 16:40:09.000000000 +0000
-+++ cyrus-imapd-2.3-2.3.7/config.guess 2006-10-10 16:55:58.000000000 +0000
-@@ -1,8 +1,11 @@
+diff -urNad cyrus-imapd-2.3-2.3.8/aclocal.m4 /tmp/dpep.H9T4fx/cyrus-imapd-2.3-2.3.8/aclocal.m4
+--- cyrus-imapd-2.3-2.3.8/aclocal.m4 2007-02-07 19:47:24.000000000 +0100
++++ /tmp/dpep.H9T4fx/cyrus-imapd-2.3-2.3.8/aclocal.m4 2007-02-27 04:02:39.296615781 +0100
+@@ -1,4 +1,4 @@
+-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
++# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
+
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ # 2005 Free Software Foundation, Inc.
+diff -urNad cyrus-imapd-2.3-2.3.8/config.guess /tmp/dpep.H9T4fx/cyrus-imapd-2.3-2.3.8/config.guess
+--- cyrus-imapd-2.3-2.3.8/config.guess 2007-02-27 04:01:39.000000000 +0100
++++ /tmp/dpep.H9T4fx/cyrus-imapd-2.3-2.3.8/config.guess 2007-02-27 04:02:49.342616461 +0100
+@@ -1,8 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999
-# Free Software Foundation, Inc.
-#
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-+# Inc.
-+
-+timestamp='2006-07-02'
++# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
++
++timestamp='2005-04-22'
+
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
-@@ -15,159 +18,293 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-+# 02110-1301, USA.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
+@@ -22,100 +24,279 @@
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
-# Written by Per Bothner <bothner at cygnus.com>.
-# The master version of this file is at the FSF in /home/gd/gnu/lib.
-# Please send patches to <autoconf-patches at gnu.org>.
-+
+# Originally written by Per Bothner <per at bothner.com>.
+# Please send patches to <config-patches at gnu.org>. Submit a context
+# diff and a properly formatted ChangeLog entry.
@@ -99,11 +96,11 @@
+while test $# -gt 0 ; do
+ case $1 in
+ --time-stamp | --time* | -t )
-+ echo "$timestamp" ; exit ;;
++ echo "$timestamp" ; exit 0 ;;
+ --version | -v )
-+ echo "$version" ; exit ;;
++ echo "$version" ; exit 0 ;;
+ --help | --h* | -h )
-+ echo "$usage"; exit ;;
++ echo "$usage"; exit 0 ;;
+ -- ) # Stop option processing
+ shift; break ;;
+ - ) # Use stdin as input.
@@ -137,7 +134,7 @@
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
-+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
++ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
@@ -156,7 +153,7 @@
+ ;;
+ ,,*) CC_FOR_BUILD=$CC ;;
+ ,*,*) CC_FOR_BUILD=$HOST_CC ;;
-+esac ; set_cc_for_build= ;'
++esac ;'
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi at noc.rutgers.edu 8/24/94.)
@@ -234,23 +231,55 @@
+ # contains redundant information, the shorter form:
+ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+ echo "${machine}-${os}${release}"
-+ exit ;;
++ exit 0 ;;
++ amd64:OpenBSD:*:*)
++ echo x86_64-unknown-openbsd${UNAME_RELEASE}
++ exit 0 ;;
++ amiga:OpenBSD:*:*)
++ echo m68k-unknown-openbsd${UNAME_RELEASE}
++ exit 0 ;;
++ cats:OpenBSD:*:*)
++ echo arm-unknown-openbsd${UNAME_RELEASE}
++ exit 0 ;;
++ hp300:OpenBSD:*:*)
++ echo m68k-unknown-openbsd${UNAME_RELEASE}
++ exit 0 ;;
++ luna88k:OpenBSD:*:*)
++ echo m88k-unknown-openbsd${UNAME_RELEASE}
++ exit 0 ;;
++ mac68k:OpenBSD:*:*)
++ echo m68k-unknown-openbsd${UNAME_RELEASE}
++ exit 0 ;;
++ macppc:OpenBSD:*:*)
++ echo powerpc-unknown-openbsd${UNAME_RELEASE}
++ exit 0 ;;
++ mvme68k:OpenBSD:*:*)
++ echo m68k-unknown-openbsd${UNAME_RELEASE}
++ exit 0 ;;
++ mvme88k:OpenBSD:*:*)
++ echo m88k-unknown-openbsd${UNAME_RELEASE}
++ exit 0 ;;
++ mvmeppc:OpenBSD:*:*)
++ echo powerpc-unknown-openbsd${UNAME_RELEASE}
++ exit 0 ;;
++ sgi:OpenBSD:*:*)
++ echo mips64-unknown-openbsd${UNAME_RELEASE}
++ exit 0 ;;
++ sun3:OpenBSD:*:*)
++ echo m68k-unknown-openbsd${UNAME_RELEASE}
++ exit 0 ;;
+ *:OpenBSD:*:*)
-+ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-+ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-+ exit ;;
++ echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
++ exit 0 ;;
+ *:ekkoBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-+ exit ;;
-+ *:SolidBSD:*:*)
-+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-+ exit ;;
++ exit 0 ;;
+ macppc:MirBSD:*:*)
-+ echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-+ exit ;;
++ echo powerppc-unknown-mirbsd${UNAME_RELEASE}
++ exit 0 ;;
+ *:MirBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-+ exit ;;
++ exit 0 ;;
alpha:OSF1:*:*)
- if test $UNAME_RELEASE = "V4.0"; then
+ case $UNAME_RELEASE in
@@ -344,34 +373,26 @@
- fi
- rm -f $dummy.s $dummy
- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-- exit 0 ;;
+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-+ exit ;;
+ exit 0 ;;
Alpha\ *:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
- # Should we change UNAME_MACHINE based on the output of uname instead
- # of the specific Alpha model?
- echo alpha-pc-interix
-- exit 0 ;;
-+ exit ;;
- 21064:Windows_NT:50:3)
+@@ -127,45 +308,27 @@
echo alpha-dec-winnt3.5
-- exit 0 ;;
-+ exit ;;
+ exit 0 ;;
Amiga*:UNIX_System_V:4.0:*)
- echo m68k-cbm-sysv4
-- exit 0;;
++ echo m68k-unknown-sysv4
+ exit 0;;
- amiga:NetBSD:*:*)
- echo m68k-cbm-netbsd${UNAME_RELEASE}
- exit 0 ;;
- amiga:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
-+ echo m68k-unknown-sysv4
-+ exit ;;
*:[Aa]miga[Oo][Ss]:*:*)
echo ${UNAME_MACHINE}-unknown-amigaos
-- exit 0 ;;
+ exit 0 ;;
- arc64:OpenBSD:*:*)
- echo mips64el-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
@@ -389,110 +410,62 @@
- exit 0 ;;
- wgrisc:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
+ *:[Mm]orph[Oo][Ss]:*:*)
+ echo ${UNAME_MACHINE}-unknown-morphos
-+ exit ;;
+ exit 0 ;;
*:OS/390:*:*)
echo i370-ibm-openedition
-- exit 0 ;;
-+ exit ;;
+ exit 0 ;;
+ *:z/VM:*:*)
+ echo s390-ibm-zvmoe
-+ exit ;;
++ exit 0 ;;
+ *:OS400:*:*)
+ echo powerpc-ibm-os400
-+ exit ;;
++ exit 0 ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
-- exit 0;;
+ exit 0;;
- arm32:NetBSD:*:*)
- echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
- exit 0 ;;
- SR2?01:HI-UX/MPP:*:*)
-+ exit ;;
-+ arm:riscos:*:*|arm:RISCOS:*:*)
-+ echo arm-unknown-riscos
-+ exit ;;
+ SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
echo hppa1.1-hitachi-hiuxmpp
-- exit 0;;
-+ exit ;;
+ exit 0;;
Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
- # akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
- if test "`(/bin/universe) 2>/dev/null`" = att ; then
-@@ -175,25 +312,32 @@
- else
- echo pyramid-pyramid-bsd
- fi
-- exit 0 ;;
-+ exit ;;
+@@ -179,6 +342,13 @@
NILE*:*:*:dcosx)
echo pyramid-pyramid-svr4
-- exit 0 ;;
-+ exit ;;
+ exit 0 ;;
+ DRS?6000:unix:4.0:6*)
+ echo sparc-icl-nx6
-+ exit ;;
++ exit 0 ;;
+ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+ case `/usr/bin/uname -p` in
-+ sparc) echo sparc-icl-nx7; exit ;;
++ sparc) echo sparc-icl-nx7 && exit 0 ;;
+ esac ;;
sun4H:SunOS:5.*:*)
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-- exit 0 ;;
-+ exit ;;
- sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-- exit 0 ;;
-+ exit ;;
- i86pc:SunOS:5.*:*)
- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-- exit 0 ;;
-+ exit ;;
- sun4*:SunOS:6*:*)
- # According to config.sub, this is the proper way to canonicalize
- # SunOS6. Hard to guess exactly what SunOS6 will be like, but
- # it's likely to be more like Solaris than SunOS4.
- echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-- exit 0 ;;
-+ exit ;;
- sun4*:SunOS:*:*)
- case "`/usr/bin/arch -k`" in
- Series*|S4*)
-@@ -202,12 +346,12 @@
- esac
- # Japanese Language versions have a version number like `4.1.3-JL'.
- echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-- exit 0 ;;
-+ exit ;;
- sun3*:SunOS:*:*)
+ exit 0 ;;
+@@ -207,7 +377,7 @@
echo m68k-sun-sunos${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
+ exit 0 ;;
sun*:*:4.2BSD:*)
- UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+ UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
case "`/bin/arch`" in
sun3)
-@@ -217,19 +361,13 @@
- echo sparc-sun-sunos${UNAME_RELEASE}
- ;;
- esac
-- exit 0 ;;
-+ exit ;;
+@@ -221,15 +391,9 @@
aushp:SunOS:*:*)
echo sparc-auspex-sunos${UNAME_RELEASE}
-- exit 0 ;;
+ exit 0 ;;
- atari*:NetBSD:*:*)
- echo m68k-atari-netbsd${UNAME_RELEASE}
- exit 0 ;;
- atari*:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
-+ exit ;;
# The situation for MiNT is a little confusing. The machine name
# can be virtually everything (everything which is not
- # "atarist" or "atariste" at least should have a processor
@@ -500,31 +473,10 @@
# > m68000). The system name ranges from "MiNT" over "FreeMiNT"
# to the lowercase version "mint" (or "freemint"). Finally
# the system name "TOS" denotes a system which is actually not
-@@ -237,61 +375,45 @@
- # be no problem.
- atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
- atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
- *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
- echo m68k-atari-mint${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
- milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
- echo m68k-milan-mint${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
- hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
- echo m68k-hades-mint${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
+@@ -253,30 +417,12 @@
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
echo m68k-unknown-mint${UNAME_RELEASE}
-- exit 0 ;;
+ exit 0 ;;
- sun3*:NetBSD:*:*)
- echo m68k-sun-netbsd${UNAME_RELEASE}
- exit 0 ;;
@@ -542,34 +494,21 @@
- exit 0 ;;
- mvme88k:OpenBSD:*:*)
- echo m88k-unknown-openbsd${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
+ m68k:machten:*:*)
+ echo m68k-apple-machten${UNAME_RELEASE}
-+ exit ;;
+ exit 0 ;;
powerpc:machten:*:*)
echo powerpc-apple-machten${UNAME_RELEASE}
-- exit 0 ;;
+ exit 0 ;;
- macppc:NetBSD:*:*)
- echo powerpc-apple-netbsd${UNAME_RELEASE}
- exit 0 ;;
-+ exit ;;
RISC*:Mach:*:*)
echo mips-dec-mach_bsd4.3
-- exit 0 ;;
-+ exit ;;
- RISC*:ULTRIX:*:*)
- echo mips-dec-ultrix${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
- VAX*:ULTRIX*:*:*)
- echo vax-dec-ultrix${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
- 2020:CLIX:*:* | 2430:CLIX:*:*)
+ exit 0 ;;
+@@ -290,8 +436,10 @@
echo clipper-intergraph-clix${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
+ exit 0 ;;
mips:*:*:UMIPS | mips:*:*:RISCos)
+ eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
@@ -578,7 +517,7 @@
int main (int argc, char *argv[]) {
#else
int main (argc, argv) int argc; char *argv[]; {
-@@ -310,28 +432,37 @@
+@@ -310,12 +458,20 @@
exit (-1);
}
EOF
@@ -586,38 +525,24 @@
- && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
- && rm $dummy.c $dummy && exit 0
- rm -f $dummy.c $dummy
-+ $CC_FOR_BUILD -o $dummy $dummy.c &&
-+ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-+ SYSTEM_NAME=`$dummy $dummyarg` &&
-+ { echo "$SYSTEM_NAME"; exit; }
++ $CC_FOR_BUILD -o $dummy $dummy.c \
++ && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
++ && exit 0
echo mips-mips-riscos${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
+ exit 0 ;;
+ Motorola:PowerMAX_OS:*:*)
+ echo powerpc-motorola-powermax
-+ exit ;;
++ exit 0 ;;
+ Motorola:*:4.3:PL8-*)
+ echo powerpc-harris-powermax
-+ exit ;;
++ exit 0 ;;
+ Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+ echo powerpc-harris-powermax
-+ exit ;;
++ exit 0 ;;
Night_Hawk:Power_UNIX:*:*)
echo powerpc-harris-powerunix
-- exit 0 ;;
-+ exit ;;
- m88k:CX/UX:7*:*)
- echo m88k-harris-cxux7
-- exit 0 ;;
-+ exit ;;
- m88k:*:4*:R4*)
- echo m88k-motorola-sysv4
-- exit 0 ;;
-+ exit ;;
- m88k:*:3*:R3*)
- echo m88k-motorola-sysv3
-- exit 0 ;;
-+ exit ;;
+ exit 0 ;;
+@@ -331,7 +487,7 @@
AViiON:dgux:*:*)
# DG/UX returns AViiON for all architectures
UNAME_PROCESSOR=`/usr/bin/uname -p`
@@ -626,43 +551,14 @@
then
if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
[ ${TARGET_BINARY_INTERFACE}x = x ]
-@@ -343,31 +474,40 @@
- else
- echo i586-dg-dgux${UNAME_RELEASE}
- fi
-- exit 0 ;;
-+ exit ;;
- M88*:DolphinOS:*:*) # DolphinOS (SVR3)
- echo m88k-dolphin-sysv3
-- exit 0 ;;
-+ exit ;;
- M88*:*:R3*:*)
- # Delta 88k system running SVR3
- echo m88k-motorola-sysv3
-- exit 0 ;;
-+ exit ;;
- XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
- echo m88k-tektronix-sysv3
-- exit 0 ;;
-+ exit ;;
- Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
- echo m68k-tektronix-bsd
-- exit 0 ;;
-+ exit ;;
- *:IRIX*:*:*)
- echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-- exit 0 ;;
-+ exit ;;
+@@ -363,11 +519,20 @@
????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
-- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
+ exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
- i?86:AIX:*:*)
-+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
-+ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX '
+ i*86:AIX:*:*)
echo i386-ibm-aix
-- exit 0 ;;
-+ exit ;;
+ exit 0 ;;
+ ia64:AIX:*:*)
+ if [ -x /usr/bin/oslevel ] ; then
+ IBM_REV=`/usr/bin/oslevel`
@@ -670,43 +566,37 @@
+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ fi
+ echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-+ exit ;;
++ exit 0 ;;
*:AIX:2:3)
if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+ eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#include <sys/systemcfg.h>
-@@ -379,18 +519,21 @@
+@@ -379,8 +544,7 @@
exit(0);
}
EOF
- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
- rm -f $dummy.c $dummy
-- echo rs6000-ibm-aix3.2.5
-+ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-+ then
-+ echo "$SYSTEM_NAME"
-+ else
-+ echo rs6000-ibm-aix3.2.5
-+ fi
++ $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+ echo rs6000-ibm-aix3.2.5
elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
echo rs6000-ibm-aix3.2.4
- else
+@@ -388,9 +552,9 @@
echo rs6000-ibm-aix3.2
fi
-- exit 0 ;;
+ exit 0 ;;
- *:AIX:*:4)
- IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
- if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then
-+ exit ;;
+ *:AIX:*:[45])
+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+ if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
else
IBM_ARCH=powerpc
-@@ -398,37 +541,56 @@
+@@ -398,7 +562,7 @@
if [ -x /usr/bin/oslevel ] ; then
IBM_REV=`/usr/bin/oslevel`
else
@@ -714,37 +604,19 @@
+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-- exit 0 ;;
-+ exit ;;
- *:AIX:*:*)
- echo rs6000-ibm-aix
-- exit 0 ;;
-+ exit ;;
+ exit 0 ;;
+@@ -408,7 +572,7 @@
ibmrt:4.4BSD:*|romp-ibm:BSD:*)
echo romp-ibm-bsd4.4
-- exit 0 ;;
+ exit 0 ;;
- ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC NetBSD and
-+ exit ;;
+ ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
-- exit 0 ;; # report: romp-ibm BSD 4.3
-+ exit ;; # report: romp-ibm BSD 4.3
+ exit 0 ;; # report: romp-ibm BSD 4.3
*:BOSX:*:*)
- echo rs6000-bull-bosx
-- exit 0 ;;
-+ exit ;;
- DPX/2?00:B.O.S.:*:*)
- echo m68k-bull-sysv3
-- exit 0 ;;
-+ exit ;;
- 9000/[34]??:4.3bsd:1.*:*)
- echo m68k-hp-bsd
-- exit 0 ;;
-+ exit ;;
- hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+@@ -424,11 +588,30 @@
echo m68k-hp-bsd4.4
-- exit 0 ;;
-+ exit ;;
+ exit 0 ;;
9000/[34678]??:HP-UX:*:*)
+ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
case "${UNAME_MACHINE}" in
@@ -774,7 +646,7 @@
#include <stdlib.h>
#include <unistd.h>
-@@ -459,13 +621,39 @@
+@@ -459,13 +642,29 @@
exit (0);
}
EOF
@@ -787,19 +659,9 @@
- HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ if [ ${HP_ARCH} = "hppa2.0w" ]
+ then
-+ eval $set_cc_for_build
-+
-+ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-+ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
-+ # generating 64-bit code. GNU and HP use different nomenclature:
-+ #
-+ # $ CC_FOR_BUILD=cc ./config.guess
-+ # => hppa2.0w-hp-hpux11.23
-+ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-+ # => hppa64-hp-hpux11.23
-+
-+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-+ grep __LP64__ >/dev/null
++ # avoid double evaluation of $set_cc_for_build
++ test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
++ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+ then
+ HP_ARCH="hppa2.0w"
+ else
@@ -807,130 +669,97 @@
+ fi
+ fi
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-- exit 0 ;;
-+ exit ;;
+ exit 0 ;;
+ ia64:HP-UX:*:*)
+ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ echo ia64-hp-hpux${HPUX_REV}
-+ exit ;;
++ exit 0 ;;
3050*:HI-UX:*:*)
+ eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
#include <unistd.h>
int
-@@ -491,434 +679,475 @@
+@@ -491,8 +690,7 @@
exit (0);
}
EOF
- $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
- rm -f $dummy.c $dummy
-+ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-+ { echo "$SYSTEM_NAME"; exit; }
++ $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
echo unknown-hitachi-hiuxwe2
-- exit 0 ;;
-+ exit ;;
+ exit 0 ;;
9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
- echo hppa1.1-hp-bsd
-- exit 0 ;;
-+ exit ;;
+@@ -501,7 +699,7 @@
9000/8??:4.3bsd:*:*)
echo hppa1.0-hp-bsd
-- exit 0 ;;
+ exit 0 ;;
- *9??*:MPE/iX:*:*)
-+ exit ;;
+ *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
echo hppa1.0-hp-mpeix
-- exit 0 ;;
-+ exit ;;
+ exit 0 ;;
hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
- echo hppa1.1-hp-osf
-- exit 0 ;;
-+ exit ;;
+@@ -510,7 +708,7 @@
hp8??:OSF1:*:*)
echo hppa1.0-hp-osf
-- exit 0 ;;
+ exit 0 ;;
- i?86:OSF1:*:*)
-+ exit ;;
+ i*86:OSF1:*:*)
if [ -x /usr/sbin/sysversion ] ; then
echo ${UNAME_MACHINE}-unknown-osf1mk
else
- echo ${UNAME_MACHINE}-unknown-osf1
- fi
-- exit 0 ;;
-+ exit ;;
+@@ -520,9 +718,6 @@
parisc*:Lites*:*:*)
echo hppa1.1-hp-lites
-- exit 0 ;;
+ exit 0 ;;
- hppa*:OpenBSD:*:*)
- echo hppa-unknown-openbsd
- exit 0 ;;
-+ exit ;;
C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
echo c1-convex-bsd
-- exit 0 ;;
-+ exit ;;
- C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
- if getsysinfo -f scalar_acc
- then echo c32-convex-bsd
- else echo c2-convex-bsd
- fi
-- exit 0 ;;
-+ exit ;;
- C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
- echo c34-convex-bsd
-- exit 0 ;;
-+ exit ;;
- C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
- echo c38-convex-bsd
-- exit 0 ;;
-+ exit ;;
+ exit 0 ;;
+@@ -541,41 +736,39 @@
C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
echo c4-convex-bsd
-- exit 0 ;;
+ exit 0 ;;
- CRAY*X-MP:*:*:*)
- echo xmp-cray-unicos
- exit 0 ;;
-+ exit ;;
CRAY*Y-MP:*:*:*)
- echo ymp-cray-unicos${UNAME_RELEASE}
-- exit 0 ;;
+ echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+ exit ;;
+ exit 0 ;;
CRAY*[A-Z]90:*:*:*)
echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
- -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
-- exit 0 ;;
+ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+ -e 's/\.[^.]*$/.X/'
-+ exit ;;
+ exit 0 ;;
CRAY*TS:*:*:*)
- echo t90-cray-unicos${UNAME_RELEASE}
-- exit 0 ;;
+ echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+ exit ;;
+ exit 0 ;;
CRAY*T3E:*:*:*)
- echo alpha-cray-unicosmk${UNAME_RELEASE}
-- exit 0 ;;
++ echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit 0 ;;
- CRAY-2:*:*:*)
- echo cray2-cray-unicos
- exit 0 ;;
- F300:UNIX_System_V:*:*)
-+ echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+ exit ;;
+ CRAY*SV1:*:*:*)
+ echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+ exit ;;
++ exit 0 ;;
+ *:UNICOS/mp:*:*)
+ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+ exit ;;
++ exit 0 ;;
+ F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+ FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
- echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-- exit 0 ;;
++ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ exit 0 ;;
- F301:UNIX_System_V:*:*)
- echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
- exit 0 ;;
@@ -939,27 +768,19 @@
- exit 0 ;;
- hp300:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
-- exit 0 ;;
-- i?86:BSD/386:*:* | i?86:BSD/OS:*:*)
-+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+ exit ;;
+ 5000:UNIX_System_V:4.*:*)
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+ exit ;;
+ exit 0 ;;
+- i?86:BSD/386:*:* | i?86:BSD/OS:*:*)
+ i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
+ exit 0 ;;
sparc*:BSD/OS:*:*)
- echo sparc-unknown-bsdi${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
- *:BSD/OS:*:*)
+@@ -585,35 +778,35 @@
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
+ exit 0 ;;
*:FreeBSD:*:*)
- if test -x /usr/bin/objformat; then
- if test "elf" = "`/usr/bin/objformat`"; then
@@ -967,108 +788,82 @@
- exit 0
- fi
- fi
-- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-- exit 0 ;;
+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ exit 0 ;;
- *:NetBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*//'`
- exit 0 ;;
- *:OpenBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
- exit 0 ;;
-+ case ${UNAME_MACHINE} in
-+ pc98)
-+ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+ amd64)
-+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+ *)
-+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+ esac
-+ exit ;;
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
-- exit 0 ;;
-+ exit ;;
+ exit 0 ;;
i*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
-- exit 0 ;;
-+ exit ;;
-+ i*:windows32*:*)
-+ # uname -m includes "-pc" on this system.
-+ echo ${UNAME_MACHINE}-mingw32
-+ exit ;;
+ exit 0 ;;
+ i*:PW*:*)
+ echo ${UNAME_MACHINE}-pc-pw32
-+ exit ;;
-+ x86:Interix*:[3456]*)
-+ echo i586-pc-interix${UNAME_RELEASE}
-+ exit ;;
-+ EM64T:Interix*:[3456]*)
-+ echo x86_64-unknown-interix${UNAME_RELEASE}
-+ exit ;;
++ exit 0 ;;
++ x86:Interix*:[34]*)
++ echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
++ exit 0 ;;
+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+ echo i${UNAME_MACHINE}-pc-mks
-+ exit ;;
++ exit 0 ;;
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
# UNAME_MACHINE based on the output of uname instead of i386?
- echo i386-pc-interix
-- exit 0 ;;
+ echo i586-pc-interix
-+ exit ;;
+ exit 0 ;;
i*:UWIN*:*)
echo ${UNAME_MACHINE}-pc-uwin
-- exit 0 ;;
-+ exit ;;
-+ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+ exit 0 ;;
++ amd64:CYGWIN*:*:*)
+ echo x86_64-unknown-cygwin
-+ exit ;;
++ exit 0 ;;
p*:CYGWIN*:*)
echo powerpcle-unknown-cygwin
-- exit 0 ;;
-+ exit ;;
- prep*:SunOS:5.*:*)
+ exit 0 ;;
+@@ -621,203 +814,184 @@
echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-- exit 0 ;;
-+ exit ;;
+ exit 0 ;;
*:GNU:*:*)
+ # the GNU system
echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-- exit 0 ;;
+ exit 0 ;;
- *:Linux:*:*)
-
-+ exit ;;
+ *:GNU/*:*:*)
+ # other systems with GNU libc and userland
+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-+ exit ;;
++ exit 0 ;;
+ i*86:Minix:*:*)
+ echo ${UNAME_MACHINE}-pc-minix
-+ exit ;;
++ exit 0 ;;
+ arm*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit ;;
-+ avr32*:Linux:*:*)
-+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit ;;
++ exit 0 ;;
+ cris:Linux:*:*)
+ echo cris-axis-linux-gnu
-+ exit ;;
++ exit 0 ;;
+ crisv32:Linux:*:*)
+ echo crisv32-axis-linux-gnu
-+ exit ;;
++ exit 0 ;;
+ frv:Linux:*:*)
+ echo frv-unknown-linux-gnu
-+ exit ;;
++ exit 0 ;;
+ ia64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit ;;
++ exit 0 ;;
+ m32r*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit ;;
++ exit 0 ;;
+ m68*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit ;;
++ exit 0 ;;
+ mips:Linux:*:*)
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
@@ -1085,12 +880,8 @@
+ #endif
+ #endif
+EOF
-+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-+ /^CPU/{
-+ s: ::g
-+ p
-+ }'`"
-+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
++ test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+ ;;
+ mips64:Linux:*:*)
+ eval $set_cc_for_build
@@ -1108,22 +899,15 @@
+ #endif
+ #endif
+EOF
-+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-+ /^CPU/{
-+ s: ::g
-+ p
-+ }'`"
-+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
++ test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+ ;;
-+ or32:Linux:*:*)
-+ echo or32-unknown-linux-gnu
-+ exit ;;
+ ppc:Linux:*:*)
+ echo powerpc-unknown-linux-gnu
-+ exit ;;
++ exit 0 ;;
+ ppc64:Linux:*:*)
+ echo powerpc64-unknown-linux-gnu
-+ exit ;;
++ exit 0 ;;
+ alpha:Linux:*:*)
+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+ EV5) UNAME_MACHINE=alphaev5 ;;
@@ -1137,7 +921,7 @@
+ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-+ exit ;;
++ exit 0 ;;
+ parisc:Linux:*:* | hppa:Linux:*:*)
+ # Look for CPU level
+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -1145,28 +929,25 @@
+ PA8*) echo hppa2.0-unknown-linux-gnu ;;
+ *) echo hppa-unknown-linux-gnu ;;
+ esac
-+ exit ;;
++ exit 0 ;;
+ parisc64:Linux:*:* | hppa64:Linux:*:*)
+ echo hppa64-unknown-linux-gnu
-+ exit ;;
++ exit 0 ;;
+ s390:Linux:*:* | s390x:Linux:*:*)
+ echo ${UNAME_MACHINE}-ibm-linux
-+ exit ;;
++ exit 0 ;;
+ sh64*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit ;;
++ exit 0 ;;
+ sh*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit ;;
++ exit 0 ;;
+ sparc:Linux:*:* | sparc64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
-+ exit ;;
-+ vax:Linux:*:*)
-+ echo ${UNAME_MACHINE}-dec-linux-gnu
-+ exit ;;
++ exit 0 ;;
+ x86_64:Linux:*:*)
+ echo x86_64-unknown-linux-gnu
-+ exit ;;
++ exit 0 ;;
+ i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
# first see if it will tell us. cd to the root directory to prevent
@@ -1196,7 +977,7 @@
- exit 0
- ;;
- i?86coff)
-+ exit ;;
++ exit 0 ;;
+ coff-i386)
echo "${UNAME_MACHINE}-pc-linux-gnucoff"
- exit 0
@@ -1253,12 +1034,12 @@
- echo powerpc-unknown-linux-gnu${LIBC}
- exit 0
- ;;
-+ exit ;;
++ exit 0 ;;
+ "")
+ # Either a pre-BFD a.out linker (linux-gnuoldld) or
+ # one that does not give us useful --help.
+ echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-+ exit ;;
++ exit 0 ;;
esac
-
- if test "${UNAME_MACHINE}" = "alpha" ; then
@@ -1382,7 +1163,7 @@
+ LIBC=gnulibc1
+ # endif
+ #else
-+ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
++ #ifdef __INTEL_COMPILER
+ LIBC=gnu
+ #else
+ LIBC=gnuaout
@@ -1398,63 +1179,54 @@
-# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions
-# are messed up and put the nodename in both sysname and nodename.
- i?86:DYNIX/ptx:4*:*)
-+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-+ /^LIBC/{
-+ s: ::g
-+ p
-+ }'`"
-+ test x"${LIBC}" != x && {
-+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-+ exit
-+ }
-+ test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
++ test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
++ test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+ ;;
+ i*86:DYNIX/ptx:4*:*)
+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+ # earlier versions are messed up and put the nodename in both
+ # sysname and nodename.
echo i386-sequent-sysv4
-- exit 0 ;;
+ exit 0 ;;
- i?86:UNIX_SV:4.2MP:2.*)
-+ exit ;;
+ i*86:UNIX_SV:4.2MP:2.*)
# Unixware is an offshoot of SVR4, but it has its own version
# number series starting with 2...
# I am not positive that other SVR4 systems won't match this,
- # I just have to hope. -- rms.
+@@ -825,7 +999,27 @@
# Use sysv4.2uw... so that sysv4* matches it.
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-- exit 0 ;;
+ exit 0 ;;
- i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
-+ exit ;;
+ i*86:OS/2:*:*)
+ # If we were able to find `uname', then EMX Unix compatibility
+ # is probably installed.
+ echo ${UNAME_MACHINE}-pc-os2-emx
-+ exit ;;
++ exit 0 ;;
+ i*86:XTS-300:*:STOP)
+ echo ${UNAME_MACHINE}-unknown-stop
-+ exit ;;
++ exit 0 ;;
+ i*86:atheos:*:*)
+ echo ${UNAME_MACHINE}-unknown-atheos
-+ exit ;;
-+ i*86:syllable:*:*)
++ exit 0 ;;
++ i*86:syllable:*:*)
+ echo ${UNAME_MACHINE}-pc-syllable
-+ exit ;;
++ exit 0 ;;
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+ echo i386-unknown-lynxos${UNAME_RELEASE}
-+ exit ;;
++ exit 0 ;;
+ i*86:*DOS:*:*)
+ echo ${UNAME_MACHINE}-pc-msdosdjgpp
-+ exit ;;
++ exit 0 ;;
+ i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
- else
+@@ -833,27 +1027,26 @@
echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
fi
-- exit 0 ;;
+ exit 0 ;;
- i?86:*:5:7*)
- # Fixed at (any) Pentium or better
- UNAME_MACHINE=i586
@@ -1463,18 +1235,15 @@
- else
- echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
- fi
-- exit 0 ;;
-- i?86:*:3.2:*)
-+ exit ;;
-+ i*86:*:5:[678]*)
-+ # UnixWare 7.x, OpenUNIX and OpenServer 6.
++ i*86:*:5:[78]*)
+ case `/bin/uname -X | grep "^Machine"` in
+ *486*) UNAME_MACHINE=i486 ;;
+ *Pentium) UNAME_MACHINE=i586 ;;
+ *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+ esac
+ echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-+ exit ;;
+ exit 0 ;;
+- i?86:*:3.2:*)
+ i*86:*:3.2:*)
if test -f /usr/options/cb.name; then
UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
@@ -1495,189 +1264,111 @@
&& UNAME_MACHINE=i686
echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
else
- echo ${UNAME_MACHINE}-pc-sysv32
+@@ -861,6 +1054,7 @@
fi
-- exit 0 ;;
-+ exit ;;
+ exit 0 ;;
pc:*:*:*)
+ # Left here for compatibility:
# uname -m prints for DJGPP always 'pc', but it prints nothing about
# the processor, so we play safe by assuming i386.
echo i386-pc-msdosdjgpp
-- exit 0 ;;
-+ exit ;;
- Intel:Mach:3*:*)
- echo i386-pc-mach3
-- exit 0 ;;
-+ exit ;;
- paragon:*:*:*)
- echo i860-intel-osf1
-- exit 0 ;;
-+ exit ;;
- i860:*:4.*:*) # i860-SVR4
- if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
- echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
- else # Add other i860-SVR4 vendors below as they are discovered.
- echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
- fi
-- exit 0 ;;
-+ exit ;;
- mini*:CTIX:SYS*5:*)
+@@ -882,9 +1076,15 @@
# "miniframe"
echo m68010-convergent-sysv
-- exit 0 ;;
+ exit 0 ;;
- M68*:*:R3V[567]*:*)
-- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-- 3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
-+ exit ;;
+ mc68k:UNIX:SYSTEM5:3.51m)
+ echo m68k-convergent-sysv
-+ exit ;;
++ exit 0 ;;
+ M680?0:D-NIX:5.3:*)
+ echo m68k-diab-dnix
-+ exit ;;
++ exit 0 ;;
+ M68*:*:R3V[5678]*:*)
-+ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+ test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+- 3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
+ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
OS_REL=''
test -r /etc/.relid \
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-- && echo i486-ncr-sysv4.3${OS_REL} && exit 0
-+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
- /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-- && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
-+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+@@ -895,21 +1095,21 @@
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-- && echo i486-ncr-sysv4 && exit 0 ;;
+ && echo i486-ncr-sysv4 && exit 0 ;;
- m68*:LynxOS:2.*:*)
-+ && { echo i486-ncr-sysv4; exit; } ;;
+ m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
echo m68k-unknown-lynxos${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
+ exit 0 ;;
mc68030:UNIX_System_V:4.*:*)
echo m68k-atari-sysv4
-- exit 0 ;;
+ exit 0 ;;
- i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*)
- echo i386-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
-+ exit ;;
TSUNAMI:LynxOS:2.*:*)
echo sparc-unknown-lynxos${UNAME_RELEASE}
-- exit 0 ;;
+ exit 0 ;;
- rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
-+ exit ;;
+ rs6000:LynxOS:2.*:*)
echo rs6000-unknown-lynxos${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
+ exit 0 ;;
+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+ echo powerpc-unknown-lynxos${UNAME_RELEASE}
-+ exit ;;
++ exit 0 ;;
SM[BE]S:UNIX_SV:*:*)
echo mips-dde-sysv${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
- RM*:ReliantUNIX-*:*:*)
- echo mips-sni-sysv4
-- exit 0 ;;
-+ exit ;;
- RM*:SINIX-*:*:*)
- echo mips-sni-sysv4
-- exit 0 ;;
-+ exit ;;
- *:SINIX-*:*:*)
- if uname -p 2>/dev/null >/dev/null ; then
- UNAME_MACHINE=`(uname -p) 2>/dev/null`
-@@ -926,62 +1155,155 @@
- else
+ exit 0 ;;
+@@ -927,8 +1127,8 @@
echo ns32k-sni-sysv
fi
-- exit 0 ;;
+ exit 0 ;;
- PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
- # says <Richard.M.Bartel at ccMail.Census.GOV>
-+ exit ;;
+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+ # says <Richard.M.Bartel at ccMail.Census.GOV>
echo i586-unisys-sysv4
-- exit 0 ;;
-+ exit ;;
+ exit 0 ;;
*:UNIX_System_V:4*:FTX*)
- # From Gerald Hewes <hewes at openmarket.com>.
- # How about differentiating between stratus architectures? -djm
- echo hppa1.1-stratus-sysv4
-- exit 0 ;;
-+ exit ;;
- *:*:*:FTX*)
+@@ -940,10 +1140,18 @@
# From seanf at swdc.stratus.com.
echo i860-stratus-sysv4
-- exit 0 ;;
-+ exit ;;
+ exit 0 ;;
+ i*86:VOS:*:*)
+ # From Paul.Green at stratus.com.
+ echo ${UNAME_MACHINE}-stratus-vos
-+ exit ;;
++ exit 0 ;;
+ *:VOS:*:*)
+ # From Paul.Green at stratus.com.
+ echo hppa1.1-stratus-vos
-+ exit ;;
++ exit 0 ;;
mc68*:A/UX:*:*)
echo m68k-apple-aux${UNAME_RELEASE}
-- exit 0 ;;
+ exit 0 ;;
- news*:NEWS-OS:*:6*)
-+ exit ;;
+ news*:NEWS-OS:6*:*)
echo mips-sony-newsos6
-- exit 0 ;;
-+ exit ;;
+ exit 0 ;;
R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
- if [ -d /usr/nec ]; then
- echo mips-nec-sysv${UNAME_RELEASE}
- else
- echo mips-unknown-sysv${UNAME_RELEASE}
- fi
-- exit 0 ;;
-+ exit ;;
- BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
- echo powerpc-be-beos
-- exit 0 ;;
-+ exit ;;
- BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
- echo powerpc-apple-beos
-- exit 0 ;;
-+ exit ;;
- BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
- echo i586-pc-beos
-- exit 0 ;;
-+ exit ;;
- SX-4:SUPER-UX:*:*)
- echo sx4-nec-superux${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
+@@ -968,20 +1176,100 @@
SX-5:SUPER-UX:*:*)
echo sx5-nec-superux${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
+ exit 0 ;;
+ SX-6:SUPER-UX:*:*)
+ echo sx6-nec-superux${UNAME_RELEASE}
-+ exit ;;
++ exit 0 ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
+ exit 0 ;;
*:Rhapsody:*:*)
echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-- exit 0 ;;
-+ exit ;;
+ exit 0 ;;
+ *:Darwin:*:*)
+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+ case $UNAME_PROCESSOR in
++ *86) UNAME_PROCESSOR=i686 ;;
+ unknown) UNAME_PROCESSOR=powerpc ;;
+ esac
+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-+ exit ;;
++ exit 0 ;;
+ *:procnto*:*:* | *:QNX:[0123456789]*:*)
+ UNAME_PROCESSOR=`uname -p`
+ if test "$UNAME_PROCESSOR" = "x86"; then
@@ -1685,27 +1376,26 @@
+ UNAME_MACHINE=pc
+ fi
+ echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-+ exit ;;
++ exit 0 ;;
*:QNX:*:4*)
- echo i386-qnx-qnx${UNAME_VERSION}
-- exit 0 ;;
+ echo i386-pc-qnx
-+ exit ;;
++ exit 0 ;;
+ NSE-?:NONSTOP_KERNEL:*:*)
+ echo nse-tandem-nsk${UNAME_RELEASE}
-+ exit ;;
++ exit 0 ;;
+ NSR-?:NONSTOP_KERNEL:*:*)
+ echo nsr-tandem-nsk${UNAME_RELEASE}
-+ exit ;;
++ exit 0 ;;
+ *:NonStop-UX:*:*)
+ echo mips-compaq-nonstopux
-+ exit ;;
++ exit 0 ;;
+ BS2000:POSIX*:*:*)
+ echo bs2000-siemens-sysv
-+ exit ;;
++ exit 0 ;;
+ DS/*:UNIX_System_V:*:*)
+ echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-+ exit ;;
++ exit 0 ;;
+ *:Plan9:*:*)
+ # "uname -m" is not consistent, so use $cputype instead. 386
+ # is converted to i386 for consistency with other x86
@@ -1716,47 +1406,41 @@
+ UNAME_MACHINE="$cputype"
+ fi
+ echo ${UNAME_MACHINE}-unknown-plan9
-+ exit ;;
++ exit 0 ;;
+ *:TOPS-10:*:*)
+ echo pdp10-unknown-tops10
-+ exit ;;
++ exit 0 ;;
+ *:TENEX:*:*)
+ echo pdp10-unknown-tenex
-+ exit ;;
++ exit 0 ;;
+ KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+ echo pdp10-dec-tops20
-+ exit ;;
++ exit 0 ;;
+ XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+ echo pdp10-xkl-tops20
-+ exit ;;
++ exit 0 ;;
+ *:TOPS-20:*:*)
+ echo pdp10-unknown-tops20
-+ exit ;;
++ exit 0 ;;
+ *:ITS:*:*)
+ echo pdp10-unknown-its
-+ exit ;;
++ exit 0 ;;
+ SEI:*:*:SEIUX)
+ echo mips-sei-seiux${UNAME_RELEASE}
-+ exit ;;
++ exit 0 ;;
+ *:DragonFly:*:*)
+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-+ exit ;;
++ exit 0 ;;
+ *:*VMS:*:*)
+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ case "${UNAME_MACHINE}" in
-+ A*) echo alpha-dec-vms ; exit ;;
-+ I*) echo ia64-dec-vms ; exit ;;
-+ V*) echo vax-dec-vms ; exit ;;
++ A*) echo alpha-dec-vms && exit 0 ;;
++ I*) echo ia64-dec-vms && exit 0 ;;
++ V*) echo vax-dec-vms && exit 0 ;;
+ esac ;;
+ *:XENIX:*:SysV)
+ echo i386-pc-xenix
-+ exit ;;
-+ i*86:skyos:*:*)
-+ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-+ exit ;;
-+ i*86:rdos:*:*)
-+ echo ${UNAME_MACHINE}-pc-rdos
-+ exit ;;
+ exit 0 ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1766,16 +1450,7 @@
cat >$dummy.c <<EOF
#ifdef _SEQUENT_
# include <sys/types.h>
-@@ -1007,7 +1329,7 @@
- #endif
-
- #if defined (__arm) && defined (__acorn) && defined (__unix)
-- printf ("arm-acorn-riscix"); exit (0);
-+ printf ("arm-acorn-riscix\n"); exit (0);
- #endif
-
- #if defined (hp300) && !defined (hpux)
-@@ -1068,11 +1390,24 @@
+@@ -1068,11 +1356,24 @@
#endif
#if defined (vax)
@@ -1805,47 +1480,17 @@
#endif
#if defined (alliant) && defined (i860)
-@@ -1083,12 +1418,12 @@
+@@ -1083,8 +1384,7 @@
}
EOF
-$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0
-rm -f $dummy.c $dummy
-+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-+ { echo "$SYSTEM_NAME"; exit; }
++$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
# Apollos put the system type in the environment.
--test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
-+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
- # Convex versions that predate uname can use getsysinfo(1)
-
-@@ -1097,25 +1432,69 @@
- case `getsysinfo -f cpu_type` in
- c1*)
- echo c1-convex-bsd
-- exit 0 ;;
-+ exit ;;
- c2*)
- if getsysinfo -f scalar_acc
- then echo c32-convex-bsd
- else echo c2-convex-bsd
- fi
-- exit 0 ;;
-+ exit ;;
- c34*)
- echo c34-convex-bsd
-- exit 0 ;;
-+ exit ;;
- c38*)
- echo c38-convex-bsd
-- exit 0 ;;
-+ exit ;;
- c4*)
- echo c4-convex-bsd
-- exit 0 ;;
-+ exit ;;
+@@ -1116,6 +1416,50 @@
esac
fi
@@ -1897,21 +1542,10 @@
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
-diff -urNad cyrus-imapd-2.3-2.3.7~/config.h.in cyrus-imapd-2.3-2.3.7/config.h.in
---- cyrus-imapd-2.3-2.3.7~/config.h.in 2006-08-26 00:00:13.000000000 +0000
-+++ cyrus-imapd-2.3-2.3.7/config.h.in 2006-10-10 16:55:35.000000000 +0000
-@@ -85,6 +85,10 @@
- /* Define to 1 if you have the `daemon' function. */
- #undef HAVE_DAEMON
-
-+/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't.
-+ */
-+#undef HAVE_DECL_TZNAME
-+
- /* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
- */
- #undef HAVE_DIRENT_H
-@@ -153,9 +157,6 @@
+diff -urNad cyrus-imapd-2.3-2.3.8/config.h.in /tmp/dpep.H9T4fx/cyrus-imapd-2.3-2.3.8/config.h.in
+--- cyrus-imapd-2.3-2.3.8/config.h.in 2007-02-27 04:01:39.000000000 +0100
++++ /tmp/dpep.H9T4fx/cyrus-imapd-2.3-2.3.8/config.h.in 2007-02-27 04:02:39.367608719 +0100
+@@ -153,9 +153,6 @@
/* Do we have TCP wrappers? */
#undef HAVE_LIBWRAP
@@ -1921,24 +1555,7 @@
/* Does the compiler support long long int? */
#undef HAVE_LONG_LONG_INT
-@@ -316,13 +317,13 @@
- /* Directiory to use for service binaries */
- #undef SERVICE_PATH
-
--/* The size of a `long', as computed by sizeof. */
-+/* The size of `long', as computed by sizeof. */
- #undef SIZEOF_LONG
-
--/* The size of a `long long int', as computed by sizeof. */
-+/* The size of `long long int', as computed by sizeof. */
- #undef SIZEOF_LONG_LONG_INT
-
--/* The size of a `unsigned long long int', as computed by sizeof. */
-+/* The size of `unsigned long long int', as computed by sizeof. */
- #undef SIZEOF_UNSIGNED_LONG_LONG_INT
-
- /* Do we already have setproctitle? */
-@@ -512,7 +513,11 @@
+@@ -512,7 +509,11 @@
SQUAT_ENGINE = 1,
/* should we have long LMTP error messages? */
@@ -1951,46 +1568,561 @@
};
#endif /* _CYRUS_IMAPD_CONFIG_H_ */
-diff -urNad cyrus-imapd-2.3-2.3.7~/config.sub cyrus-imapd-2.3-2.3.7/config.sub
---- cyrus-imapd-2.3-2.3.7~/config.sub 2006-10-10 16:40:10.000000000 +0000
-+++ cyrus-imapd-2.3-2.3.7/config.sub 2006-10-10 16:55:58.000000000 +0000
-@@ -1,6 +1,11 @@
+diff -urNad cyrus-imapd-2.3-2.3.8/config.h.in~ /tmp/dpep.H9T4fx/cyrus-imapd-2.3-2.3.8/config.h.in~
+--- cyrus-imapd-2.3-2.3.8/config.h.in~ 1970-01-01 01:00:00.000000000 +0100
++++ /tmp/dpep.H9T4fx/cyrus-imapd-2.3-2.3.8/config.h.in~ 2007-02-27 04:02:39.367608719 +0100
+@@ -0,0 +1,524 @@
++/* config.h.in. Generated from configure.in by autoheader. */
++
++
++/* $Id: configure.in,v 1.297 2006/11/30 17:11:16 murch Exp $ */
++/*
++ * Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
++ *
++ * Redistribution and use in source and binary forms, with or without
++ * modification, are permitted provided that the following conditions
++ * are met:
++ *
++ * 1. Redistributions of source code must retain the above copyright
++ * notice, this list of conditions and the following disclaimer.
++ *
++ * 2. Redistributions in binary form must reproduce the above copyright
++ * notice, this list of conditions and the following disclaimer in
++ * the documentation and/or other materials provided with the
++ * distribution.
++ *
++ * 3. The name "Carnegie Mellon University" must not be used to
++ * endorse or promote products derived from this software without
++ * prior written permission. For permission or any other legal
++ * details, please contact
++ * Office of Technology Transfer
++ * Carnegie Mellon University
++ * 5000 Forbes Avenue
++ * Pittsburgh, PA 15213-3890
++ * (412) 268-4387, fax: (412) 268-7395
++ * tech-transfer 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.
++ */
++
++#ifndef _CYRUS_IMAPD_CONFIG_H_
++#define _CYRUS_IMAPD_CONFIG_H_
++
++
++/* Should the AFS PTS plugin use krb5? */
++#undef AFSPTS_USE_KRB5
++
++/* Where will we be installed? */
++#undef CYRUS_PATH
++
++/* What user will we run as? */
++#undef CYRUS_USER
++
++/* Alternative to /dev/urandom? */
++#undef EGD_SOCKET
++
++/* Enable the LISTEXT extension? */
++#undef ENABLE_LISTEXT
++
++/* Do we have a decent regex library? */
++#undef ENABLE_REGEX
++
++/* Enable Netscape Menu Option Hack? */
++#undef ENABLE_X_NETSCAPE_HACK
++
++/* Extra version information for imap/version.h */
++#undef EXTRA_IDENT
++
++/* Do we have strerror()? */
++#undef HAS_STRERROR
++
++/* Should we build afskrb pts module? */
++#undef HAVE_AFSKRB
++
++/* Does SASL support APOP? */
++#undef HAVE_APOP
++
++/* Build in Berkeley DB support? */
++#undef HAVE_BDB
++
++/* Define to 1 if you have the `daemon' function. */
++#undef HAVE_DAEMON
++
++/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't.
++ */
++#undef HAVE_DECL_TZNAME
++
++/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
++ */
++#undef HAVE_DIRENT_H
++
++/* Define to 1 if you have the `dns_lookup' function. */
++#undef HAVE_DNS_LOOKUP
++
++/* Define to 1 if you have the `dn_expand' function. */
++#undef HAVE_DN_EXPAND
++
++/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
++#undef HAVE_DOPRNT
++
++/* We need et/com_err.h */
++#undef HAVE_ET_COM_ERR_H
++
++/* Do we have fdatasync()? */
++#undef HAVE_FDATASYNC
++
++/* Define to 1 if you have the `ftruncate' function. */
++#undef HAVE_FTRUNCATE
++
++/* Do we have a getaddrinfo? */
++#undef HAVE_GETADDRINFO
++
++/* Define to 1 if you have the `getdtablesize' function. */
++#undef HAVE_GETDTABLESIZE
++
++/* Do we have a getnameinfo? */
++#undef HAVE_GETNAMEINFO
++
++/* Define to 1 if you have the `getrlimit' function. */
++#undef HAVE_GETRLIMIT
++
++/* Define if you have the gssapi.h header file */
++#undef HAVE_GSSAPI_H
++
++/* Define to 1 if you have the `gsskrb5_register_acceptor_identity' function.
++ */
++#undef HAVE_GSSKRB5_REGISTER_ACCEPTOR_IDENTITY
++
++/* Define if your GSSAPI implimentation defines GSS_C_NT_HOSTBASED_SERVICE */
++#undef HAVE_GSS_C_NT_HOSTBASED_SERVICE
++
++/* Define if your GSSAPI implimentation defines GSS_C_NT_USER_NAME */
++#undef HAVE_GSS_C_NT_USER_NAME
++
++/* Define to 1 if you have the <inttypes.h> header file. */
++#undef HAVE_INTTYPES_H
++
++/* Support for Kerberos? */
++#undef HAVE_KRB
++
++/* Should we build ldap pts module? */
++#undef HAVE_LDAP
++
++/* Define to 1 if you have the `dl' library (-ldl). */
++#undef HAVE_LIBDL
++
++/* Define to 1 if you have the `fl' library (-lfl). */
++#undef HAVE_LIBFL
++
++/* Define to 1 if you have the `resolv' library (-lresolv). */
++#undef HAVE_LIBRESOLV
++
++/* Do we have TCP wrappers? */
++#undef HAVE_LIBWRAP
++
++/* Does the compiler support long long int? */
++#undef HAVE_LONG_LONG_INT
++
++/* Define to 1 if you have the `memmove' function. */
++#undef HAVE_MEMMOVE
++
++/* Define to 1 if you have the <memory.h> header file. */
++#undef HAVE_MEMORY_H
++
++/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
++#undef HAVE_NDIR_H
++
++/* Do we have Net-SNMP support? */
++#undef HAVE_NETSNMP
++
++/* Do we have an rlim_t? */
++#undef HAVE_RLIM_T
++
++/* Do we have rxposix.h? */
++#undef HAVE_RX
++
++/* Define to 1 if you have the `setrlimit' function. */
++#undef HAVE_SETRLIMIT
++
++/* Define to 1 if you have the `setsid' function. */
++#undef HAVE_SETSID
++
++/* Define to 1 if you have the `shutdown' function. */
++#undef HAVE_SHUTDOWN
++
++/* Does sockaddr have an sa_len? */
++#undef HAVE_SOCKADDR_SA_LEN
++
++/* Do we have a socklen_t? */
++#undef HAVE_SOCKLEN_T
++
++/* Build with SSL support? */
++#undef HAVE_SSL
++
++/* Is there an ss_family in sockaddr_storage? */
++#undef HAVE_SS_FAMILY
++
++/* Define to 1 if you have the <stdarg.h> header file. */
++#undef HAVE_STDARG_H
++
++/* Define to 1 if you have the <stdint.h> header file. */
++#undef HAVE_STDINT_H
++
++/* Define to 1 if you have the <stdlib.h> header file. */
++#undef HAVE_STDLIB_H
++
++/* Define to 1 if you have the `strcasecmp' function. */
++#undef HAVE_STRCASECMP
++
++/* Define to 1 if you have the `strerror' function. */
++#undef HAVE_STRERROR
++
++/* Define to 1 if you have the <strings.h> header file. */
++#undef HAVE_STRINGS_H
++
++/* Define to 1 if you have the <string.h> header file. */
++#undef HAVE_STRING_H
++
++/* Define to 1 if you have the `strlcat' function. */
++#undef HAVE_STRLCAT
++
++/* Define to 1 if you have the `strlcpy' function. */
++#undef HAVE_STRLCPY
++
++/* Do we have a sockaddr_storage? */
++#undef HAVE_STRUCT_SOCKADDR_STORAGE
++
++/* Define to 1 if `tm_zone' is member of `struct tm'. */
++#undef HAVE_STRUCT_TM_TM_ZONE
++
++/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
++ */
++#undef HAVE_SYS_DIR_H
++
++/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
++ */
++#undef HAVE_SYS_NDIR_H
++
++/* Define to 1 if you have the <sys/param.h> header file. */
++#undef HAVE_SYS_PARAM_H
++
++/* Define to 1 if you have the <sys/resource.h> header file. */
++#undef HAVE_SYS_RESOURCE_H
++
++/* Define to 1 if you have the <sys/select.h> header file. */
++#undef HAVE_SYS_SELECT_H
++
++/* Define to 1 if you have the <sys/sockio.h> header file. */
++#undef HAVE_SYS_SOCKIO_H
++
++/* Define to 1 if you have the <sys/stat.h> header file. */
++#undef HAVE_SYS_STAT_H
++
++/* Define to 1 if you have the <sys/time.h> header file. */
++#undef HAVE_SYS_TIME_H
++
++/* Define to 1 if you have the <sys/types.h> header file. */
++#undef HAVE_SYS_TYPES_H
++
++/* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use
++ `HAVE_STRUCT_TM_TM_ZONE' instead. */
++#undef HAVE_TM_ZONE
++
++/* Define to 1 if you don't have `tm_zone' but do have the external array
++ `tzname'. */
++#undef HAVE_TZNAME
++
++/* Do we have UCD-SNMP support? */
++#undef HAVE_UCDSNMP
++
++/* Define to 1 if you have the <unistd.h> header file. */
++#undef HAVE_UNISTD_H
++
++/* Define to 1 if you have the `vprintf' function. */
++#undef HAVE_VPRINTF
++
++/* Build with Zephyr support? */
++#undef HAVE_ZEPHYR
++
++/* define if your compiler has __attribute__ */
++#undef HAVE___ATTRIBUTE__
++
++/* Name of the pidfile for master */
++#undef MASTER_PIDFILE
++
++/* Do we have a sys_errlist? */
++#undef NEED_SYS_ERRLIST
++
++/* Use "imap" as sieve service name? */
++#undef OLD_SIEVE_SERVICE_NAME
++
++/* Configure OpenSSL to provide krb4-compatible legacy des apis */
++#undef OPENSSL_DES_LIBDES_COMPATIBILITY
++
++/* Configure OpenSSL to provide legacy des apis */
++#undef OPENSSL_ENABLE_OLD_DES_SUPPORT
++
++/* Define to the address where bug reports for this package should be sent. */
++#undef PACKAGE_BUGREPORT
++
++/* Define to the full name of this package. */
++#undef PACKAGE_NAME
++
++/* Define to the full name and version of this package. */
++#undef PACKAGE_STRING
++
++/* Define to the one symbol short name of this package. */
++#undef PACKAGE_TARNAME
++
++/* Define to the version of this package. */
++#undef PACKAGE_VERSION
++
++/* Directiory to use for service binaries */
++#undef SERVICE_PATH
++
++/* The size of `long', as computed by sizeof. */
++#undef SIZEOF_LONG
++
++/* The size of `long long int', as computed by sizeof. */
++#undef SIZEOF_LONG_LONG_INT
++
++/* The size of `unsigned long long int', as computed by sizeof. */
++#undef SIZEOF_UNSIGNED_LONG_LONG_INT
++
++/* Do we already have setproctitle? */
++#undef SPT_TYPE
++
++/* Define to 1 if you have the ANSI C header files. */
++#undef STDC_HEADERS
++
++/* Config File Location */
++#undef SYSCONFDIR
++
++/* Syslog facility to use. */
++#undef SYSLOG_FACILITY
++
++/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
++#undef TIME_WITH_SYS_TIME
++
++/* Define to 1 if your <sys/time.h> declares `struct tm'. */
++#undef TM_IN_SYS_TIME
++
++/* Build in Sieve support? */
++#undef USE_SIEVE
++
++/* 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
++
++/* Define to 1 if on AIX 3.
++ System headers sometimes define this.
++ We just want to avoid a redefinition error message. */
++#ifndef _ALL_SOURCE
++# undef _ALL_SOURCE
++#endif
++
++/* Define to empty if `const' does not conform to ANSI C. */
++#undef const
++
++/* 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 */
++#if TIME_WITH_SYS_TIME
++# include <sys/time.h>
++# include <time.h>
++#else
++# if HAVE_SYS_TIME_H
++# include <sys/time.h>
++# else
++# include <time.h>
++# endif
++#endif
++
++/* com_err.h, as needed */
++#ifndef IN_COM_ERR
++#ifdef HAVE_ET_COM_ERR_H
++#include <et/com_err.h>
++#else
++#include <com_err.h>
++#endif /* HAVE_ET_COM_ERR_H */
++#endif /* IN_COM_ERR */
++
++/* This allows us to work even when we don't have an fdatasync */
++#ifndef HAVE_FDATASYNC
++#define fdatasync(fd) fsync(fd)
++#endif
++
++/* A similar setup for not having O_DSYNC */
++#include <fcntl.h>
++
++#ifndef O_DSYNC
++# ifdef O_SYNC
++# define O_DSYNC O_SYNC /* POSIX */
++# else
++# define O_DSYNC O_FSYNC /* BSD */
++# endif
++#endif
++
++#ifndef HAVE___ATTRIBUTE__
++/* Can't use attributes... */
++#define __attribute__(foo)
++#endif
++
++#ifndef HAVE_SOCKLEN_T
++typedef unsigned int socklen_t;
++#endif
++
++#ifndef HAVE_RLIM_T
++typedef int rlim_t;
++#endif
++
++/* some potentially memory saving tradeoffs,
++ preconfigured in memory-saving mode */
++
++/* save the cmdlines for the ID command */
++#undef ID_SAVE_CMDLINE
++
++/* IPv6 things */
++#include <netdb.h>
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <netinet/in.h>
++
++#ifndef HAVE_STRUCT_SOCKADDR_STORAGE
++#define _SS_MAXSIZE 128 /* Implementation specific max size */
++#define _SS_PADSIZE (_SS_MAXSIZE - sizeof (struct sockaddr))
++
++struct sockaddr_storage {
++ struct sockaddr ss_sa;
++ char __ss_pad2[_SS_PADSIZE];
++};
++# define ss_family ss_sa.sa_family
++# define HAVE_SS_FAMILY
++#endif /* !HAVE_STRUCT_SOCKADDR_STORAGE */
++
++#ifndef HAVE_SS_FAMILY
++#define ss_family __ss_family
++#endif
++
++#ifndef AF_INET6
++/* Define it to something that should never appear */
++#define AF_INET6 AF_MAX
++#endif
++
++#if !defined(HAVE_GETADDRINFO) || !defined(HAVE_GETNAMEINFO)
++#include "gai.h"
++#endif
++
++/* End IPv6 things */
++
++#ifdef OLD_SIEVE_SERVICE_NAME
++#define SIEVE_SERVICE_NAME "imap"
++#else
++#define SIEVE_SERVICE_NAME "sieve"
++#endif
++
++/* filenames */
++#define FNAME_DBDIR "/db"
++#define FNAME_USERDIR "/user/"
++#define FNAME_DOMAINDIR "/domain/"
++#define FNAME_LOGDIR "/log/"
++#define FNAME_PTSDB "/ptclient/ptscache.db"
++#define CONFIG_FILENAME (SYSCONFDIR "/imapd.conf")
++#define DEFAULT_MASTER_CONFIG_FILENAME (SYSCONFDIR "/cyrus.conf")
++
++#ifndef HAVE_SHUTDOWN
++#define shutdown(fd, mode) 0
++#endif
++
++/* compile time options; think carefully before modifying */
++enum {
++ /* should we send an UNAVAILABLE message to master when
++ * a service is exiting (master is already going to be
++ * informed of the exit by the SIGCHLD signal anyway) ? */
++ MESSAGE_MASTER_ON_EXIT = 0,
++
++ /* should a hierarchical rename stop on error? */
++ RENAME_STOP_ON_ERROR = 1,
++
++ /* should we call fsync() to maybe help with softupdates? (it should) */
++ APPEND_ULTRA_PARANOID = 1,
++
++ /* should we log extra information at the DEBUG level for DB stuff?
++ * 0 -> nothing; 1 -> some; higher -> even more */
++ CONFIG_DB_VERBOSE = 1,
++
++ /* log timing information to LOG_DEBUG */
++ CONFIG_TIMING_VERBOSE = 0,
++
++ /* should we be pedantic about namespace or sleezy? */
++ SLEEZY_NAMESPACE = 1,
++
++ /* should we do a fast TLS session shutdown? */
++ TLS_FAST_SHUTDOWN = 1,
++
++ /* should we use the SQUAT engine to accelerate SEARCH? */
++ SQUAT_ENGINE = 1,
++
++ /* should we have long LMTP error messages? */
++ 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.3-2.3.8/config.sub /tmp/dpep.H9T4fx/cyrus-imapd-2.3-2.3.8/config.sub
+--- cyrus-imapd-2.3-2.3.8/config.sub 2007-02-27 04:01:39.000000000 +0100
++++ /tmp/dpep.H9T4fx/cyrus-imapd-2.3-2.3.8/config.sub 2007-02-27 04:02:49.340616660 +0100
+@@ -1,6 +1,10 @@
#! /bin/sh
-# Configuration validation subroutine script, version 1.1.
-# Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
+# Configuration validation subroutine script.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-+# Inc.
-+
-+timestamp='2006-07-02'
++# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
++
++timestamp='2005-04-22'
+
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
# can handle that machine. It does not imply ALL GNU software can.
-@@ -17,14 +22,18 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330,
--# Boston, MA 02111-1307, USA.
--
-+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-+# 02110-1301, USA.
-+#
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
+@@ -25,6 +29,9 @@
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
-+
+# Please send patches to <config-patches at gnu.org>. Submit a context
+# diff and a properly formatted ChangeLog entry.
+#
# Configuration subroutine to validate and canonicalize a configuration type.
# Supply the specified configuration type as an argument.
# If it is invalid, we print an error message on stderr and exit with code 1.
-@@ -45,30 +54,75 @@
+@@ -45,30 +52,74 @@
# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
# It is wrong to echo any other type of specification.
@@ -2041,11 +2173,11 @@
+while test $# -gt 0 ; do
+ case $1 in
+ --time-stamp | --time* | -t )
-+ echo "$timestamp" ; exit ;;
++ echo "$timestamp" ; exit 0 ;;
+ --version | -v )
-+ echo "$version" ; exit ;;
++ echo "$version" ; exit 0 ;;
+ --help | --h* | -h )
-+ echo "$usage"; exit ;;
++ echo "$usage"; exit 0 ;;
+ -- ) # Stop option processing
+ shift; break ;;
+ - ) # Use stdin as input.
@@ -2057,7 +2189,7 @@
+ *local*)
+ # First pass through any local machine types.
+ echo $1
-+ exit ;;
++ exit 0;;
+
+ * )
+ break ;;
@@ -2077,13 +2209,12 @@
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
- linux-gnu*)
-+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-+ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-+ storm-chaos* | os2-emx* | rtmk-nova*)
++ nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
++ kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
-@@ -94,7 +148,7 @@
+@@ -94,7 +145,7 @@
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
@@ -2092,7 +2223,7 @@
os=
basic_machine=$1
;;
-@@ -108,9 +162,21 @@
+@@ -108,6 +159,14 @@
os=-vxworks
basic_machine=$1
;;
@@ -2107,25 +2238,7 @@
-hiux*)
os=-hiuxwe2
;;
-+ -sco6)
-+ os=-sco5v6
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ ;;
- -sco5)
- os=-sco3.2v5
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-@@ -127,6 +193,10 @@
- # Don't forget version if it is 3.2v4 or newer.
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
- ;;
-+ -sco5v6*)
-+ # Don't forget version if it is 3.2v4 or newer.
-+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+ ;;
- -sco*)
- os=-sco3.2v2
- basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-@@ -166,27 +236,73 @@
+@@ -166,27 +225,66 @@
case $basic_machine in
# Recognize the basic CPU types without company name.
# Some are omitted here because they have special meanings below.
@@ -2146,7 +2259,7 @@
+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ | am33_2.0 \
-+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
++ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+ | bfin \
+ | c4x | clipper \
+ | d10v | d30v | dlx | dsp16xx \
@@ -2154,8 +2267,7 @@
+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ | i370 | i860 | i960 | ia64 \
+ | ip2k | iq2000 \
-+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
-+ | maxq | mb | microblaze | mcore \
++ | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
+ | mips | mipsbe | mipseb | mipsel | mipsle \
+ | mips16 \
+ | mips64 | mips64el \
@@ -2164,7 +2276,6 @@
+ | mips64vr4100 | mips64vr4100el \
+ | mips64vr4300 | mips64vr4300el \
+ | mips64vr5000 | mips64vr5000el \
-+ | mips64vr5900 | mips64vr5900el \
+ | mipsisa32 | mipsisa32el \
+ | mipsisa32r2 | mipsisa32r2el \
+ | mipsisa64 | mipsisa64el \
@@ -2173,19 +2284,17 @@
+ | mipsisa64sr71k | mipsisa64sr71kel \
+ | mipstx39 | mipstx39el \
+ | mn10200 | mn10300 \
-+ | mt \
+ | msp430 \
-+ | nios | nios2 \
+ | ns16k | ns32k \
-+ | or32 \
++ | openrisc | or32 \
+ | pdp10 | pdp11 | pj | pjl \
+ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ | pyramid \
-+ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
++ | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+ | sh64 | sh64le \
-+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-+ | spu | strongarm \
++ | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
++ | sparcv8 | sparcv9 | sparcv9b \
++ | strongarm \
+ | tahoe | thumb | tic4x | tic80 | tron \
+ | v850 | v850e \
+ | we32k \
@@ -2200,9 +2309,6 @@
+ os=-none
+ ;;
+ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-+ ;;
-+ ms1)
-+ basic_machine=mt-unknown
;;
# We use `pc' rather than `unknown'
@@ -2213,7 +2319,7 @@
basic_machine=$basic_machine-pc
;;
# Object if more than one company name word.
-@@ -195,24 +311,66 @@
+@@ -195,24 +293,63 @@
exit 1
;;
# Recognize the basic CPU types with company name.
@@ -2241,7 +2347,7 @@
+ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
-+ | avr-* | avr32-* \
++ | avr-* \
+ | bfin-* | bs2000-* \
+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+ | clipper-* | craynv-* | cydra-* \
@@ -2252,7 +2358,7 @@
+ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ | i*86-* | i860-* | i960-* | ia64-* \
+ | ip2k-* | iq2000-* \
-+ | m32c-* | m32r-* | m32rle-* \
++ | m32r-* | m32rle-* \
+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* \
+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
@@ -2263,7 +2369,6 @@
+ | mips64vr4100-* | mips64vr4100el-* \
+ | mips64vr4300-* | mips64vr4300el-* \
+ | mips64vr5000-* | mips64vr5000el-* \
-+ | mips64vr5900-* | mips64vr5900el-* \
+ | mipsisa32-* | mipsisa32el-* \
+ | mipsisa32r2-* | mipsisa32r2el-* \
+ | mipsisa64-* | mipsisa64el-* \
@@ -2272,20 +2377,18 @@
+ | mipsisa64sr71k-* | mipsisa64sr71kel-* \
+ | mipstx39-* | mipstx39el-* \
+ | mmix-* \
-+ | mt-* \
+ | msp430-* \
-+ | nios-* | nios2-* \
+ | none-* | np1-* | ns16k-* | ns32k-* \
+ | orion-* \
+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ | pyramid-* \
+ | romp-* | rs6000-* \
-+ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
++ | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
++ | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+ | sparclite-* \
-+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
++ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+ | tahoe-* | thumb-* \
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+ | tron-* \
@@ -2298,7 +2401,7 @@
;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
-@@ -230,6 +388,9 @@
+@@ -230,6 +367,9 @@
basic_machine=a29k-amd
os=-udi
;;
@@ -2308,7 +2411,7 @@
adobe68k)
basic_machine=m68010-adobe
os=-scout
-@@ -244,19 +405,25 @@
+@@ -244,19 +384,25 @@
basic_machine=a29k-none
os=-bsd
;;
@@ -2337,7 +2440,7 @@
os=-sysv4
;;
apollo68)
-@@ -275,6 +442,10 @@
+@@ -275,6 +421,10 @@
basic_machine=ns32k-sequent
os=-dynix
;;
@@ -2348,7 +2451,7 @@
convex-c1)
basic_machine=c1-convex
os=-bsd
-@@ -295,27 +466,45 @@
+@@ -295,27 +445,45 @@
basic_machine=c38-convex
os=-bsd
;;
@@ -2402,7 +2505,7 @@
delta | 3300 | motorola-3300 | motorola-delta \
| 3300-motorola | delta-motorola)
basic_machine=m68k-motorola
-@@ -324,6 +513,10 @@
+@@ -324,6 +492,10 @@
basic_machine=m88k-motorola
os=-sysv3
;;
@@ -2413,7 +2516,7 @@
dpx20 | dpx20-*)
basic_machine=rs6000-bull
os=-bosx
-@@ -357,6 +550,10 @@
+@@ -357,6 +529,10 @@
basic_machine=tron-gmicro
os=-sysv
;;
@@ -2424,7 +2527,7 @@
h3050r* | hiux*)
basic_machine=hppa1.1-hitachi
os=-hiuxwe2
-@@ -432,19 +629,19 @@
+@@ -432,19 +608,19 @@
basic_machine=i370-ibm
;;
# I'm not sure what "Sysv32" means. Should this be sysv3.2?
@@ -2448,7 +2551,7 @@
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-solaris2
;;
-@@ -456,17 +653,6 @@
+@@ -456,17 +632,6 @@
basic_machine=i386-unknown
os=-vsta
;;
@@ -2466,7 +2569,7 @@
iris | iris4d)
basic_machine=mips-sgi
case $os in
-@@ -492,6 +678,10 @@
+@@ -492,6 +657,10 @@
basic_machine=ns32k-utek
os=-sysv
;;
@@ -2477,7 +2580,7 @@
miniframe)
basic_machine=m68000-convergent
;;
-@@ -499,14 +689,6 @@
+@@ -499,14 +668,6 @@
basic_machine=m68k-atari
os=-mint
;;
@@ -2492,7 +2595,7 @@
mips3*-*)
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
;;
-@@ -517,10 +699,17 @@
+@@ -517,8 +678,12 @@
basic_machine=m68k-rom68k
os=-coff
;;
@@ -2505,13 +2608,8 @@
+ basic_machine=i386-pc
os=-msdos
;;
-+ ms1-*)
-+ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-+ ;;
mvs)
- basic_machine=i370-ibm
- os=-mvs
-@@ -582,13 +771,27 @@
+@@ -582,13 +747,28 @@
basic_machine=i960-intel
os=-mon960
;;
@@ -2529,8 +2627,9 @@
basic_machine=hppa1.1-oki
os=-proelf
;;
-+ openrisc | openrisc-*)
++ or32 | or32-*)
+ basic_machine=or32-unknown
++ os=-coff
+ ;;
+ os400)
+ basic_machine=powerpc-ibm
@@ -2539,7 +2638,7 @@
OSE68000 | ose68000)
basic_machine=m68000-ericsson
os=-ose
-@@ -611,45 +814,75 @@
+@@ -611,45 +791,65 @@
pbb)
basic_machine=m68k-tti
;;
@@ -2548,12 +2647,6 @@
basic_machine=ns32k-pc532
;;
- pentium | p5 | k5 | k6 | nexen)
-+ pc98)
-+ basic_machine=i386-pc
-+ ;;
-+ pc98-*)
-+ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
+ pentium | p5 | k5 | k6 | nexgen | viac3)
basic_machine=i586-pc
;;
@@ -2618,14 +2711,10 @@
+ basic_machine=i586-unknown
+ os=-pw32
+ ;;
-+ rdos)
-+ basic_machine=i386-pc
-+ os=-rdos
-+ ;;
rom68k)
basic_machine=m68k-rom68k
os=-coff
-@@ -660,10 +893,26 @@
+@@ -660,10 +860,26 @@
rtpc | rtpc-*)
basic_machine=romp-ibm
;;
@@ -2652,7 +2741,7 @@
sequent)
basic_machine=i386-sequent
;;
-@@ -671,7 +920,10 @@
+@@ -671,7 +887,10 @@
basic_machine=sh-hitachi
os=-hms
;;
@@ -2664,7 +2753,7 @@
basic_machine=sparclite-wrs
os=-vxworks
;;
-@@ -729,23 +981,51 @@
+@@ -729,23 +948,51 @@
sun386 | sun386i | roadrunner)
basic_machine=i386-sun
;;
@@ -2679,12 +2768,12 @@
t3e)
- basic_machine=t3e-cray
+ basic_machine=alphaev5-cray
- os=-unicos
- ;;
++ os=-unicos
++ ;;
+ t90)
+ basic_machine=t90-cray
-+ os=-unicos
-+ ;;
+ os=-unicos
+ ;;
+ tic54x | c54x*)
+ basic_machine=tic54x-unknown
+ os=-coff
@@ -2717,7 +2806,7 @@
udi29k)
basic_machine=a29k-amd
os=-udi
-@@ -767,8 +1047,8 @@
+@@ -767,8 +1014,8 @@
os=-vms
;;
vpp*|vx|vx-*)
@@ -2728,7 +2817,7 @@
vxworks960)
basic_machine=i960-wrs
os=-vxworks
-@@ -789,13 +1069,17 @@
+@@ -789,13 +1036,17 @@
basic_machine=hppa1.1-winbond
os=-proelf
;;
@@ -2750,7 +2839,7 @@
z8k-*-coff)
basic_machine=z8k-unknown
os=-sim
-@@ -816,32 +1100,35 @@
+@@ -816,32 +1067,38 @@
op60c)
basic_machine=hppa1.1-oki
;;
@@ -2784,10 +2873,13 @@
basic_machine=we32k-att
;;
- sparc | sparcv9)
-+ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
++ sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+ basic_machine=sh-unknown
+ ;;
-+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
++ sh64)
++ basic_machine=sh64-unknown
++ ;;
++ sparc | sparcv8 | sparcv9 | sparcv9b)
basic_machine=sparc-sun
;;
- cydra)
@@ -2795,7 +2887,7 @@
basic_machine=cydra-cydrome
;;
orion)
-@@ -856,9 +1143,8 @@
+@@ -856,9 +1113,8 @@
pmac | pmac-mpw)
basic_machine=powerpc-apple
;;
@@ -2807,14 +2899,13 @@
;;
*)
echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-@@ -912,22 +1198,49 @@
+@@ -912,22 +1168,46 @@
| -aos* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-+ | -openbsd* | -solidbsd* \
++ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
@@ -2823,15 +2914,13 @@
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
- | -interix* | -uwin* | -rhapsody* | -opened* | -openstep* | -oskit*)
-+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-+ | -uxpv* | -beos* | -mpeix* | -udk* \
++ | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-+ | -skyos* | -haiku* | -rdos* | -toppers*)
++ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
+ -qnx*)
@@ -2849,9 +2938,8 @@
+ os=`echo $os | sed -e 's|nto|nto-qnx|'`
+ ;;
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-- | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
- | -macos* | -mpw* | -magic* | -mon960* | -lnews*)
-+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
+ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
;;
-mac*)
@@ -2863,7 +2951,7 @@
-linux*)
os=`echo $os | sed -e 's|linux|linux-gnu|'`
;;
-@@ -940,6 +1253,12 @@
+@@ -940,6 +1220,12 @@
-opened*)
os=-openedition
;;
@@ -2876,7 +2964,7 @@
-osfrose*)
os=-osfrose
;;
-@@ -955,14 +1274,26 @@
+@@ -955,14 +1241,26 @@
-acis*)
os=-aos
;;
@@ -2904,7 +2992,7 @@
;;
# Preserve the version number of sinix5.
-sinix5.*)
-@@ -971,15 +1302,15 @@
+@@ -971,15 +1269,15 @@
-sinix*)
os=-sysv4
;;
@@ -2923,7 +3011,7 @@
-svr4)
os=-sysv4
;;
-@@ -1001,8 +1332,17 @@
+@@ -1001,8 +1299,17 @@
-xenix)
os=-xenix
;;
@@ -2943,24 +3031,14 @@
;;
-none)
;;
-@@ -1026,6 +1366,9 @@
- # system, and we'll never get to this point.
-
- case $basic_machine in
-+ spu-*)
-+ os=-elf
-+ ;;
- *-acorn)
- os=-riscix1.2
- ;;
-@@ -1035,7 +1378,14 @@
+@@ -1035,7 +1342,14 @@
arm*-semi)
os=-aout
;;
- pdp11-*)
-+ c4x-* | tic4x-*)
-+ os=-coff
-+ ;;
++ c4x-* | tic4x-*)
++ os=-coff
++ ;;
+ # This must come before the *-dec entry.
+ pdp10-*)
+ os=-tops20
@@ -2969,7 +3047,7 @@
os=-none
;;
*-dec | vax-*)
-@@ -1062,6 +1412,9 @@
+@@ -1062,6 +1376,9 @@
mips*-*)
os=-elf
;;
@@ -2979,13 +3057,7 @@
*-tti) # must be before sparc entry or we get the wrong os.
os=-sysv3
;;
-@@ -1071,9 +1424,15 @@
- *-be)
- os=-beos
- ;;
-+ *-haiku)
-+ os=-haiku
-+ ;;
+@@ -1074,6 +1391,9 @@
*-ibm)
os=-aix
;;
@@ -2995,7 +3067,7 @@
*-wec)
os=-proelf
;;
-@@ -1125,25 +1484,25 @@
+@@ -1125,25 +1445,25 @@
*-next)
os=-nextstep3
;;
@@ -3026,7 +3098,7 @@
os=-uxpv
;;
*-rom68k)
-@@ -1206,10 +1565,16 @@
+@@ -1206,10 +1526,16 @@
-mvs* | -opened*)
vendor=ibm
;;
@@ -3044,7 +3116,7 @@
vendor=wrs
;;
-aux*)
-@@ -1221,12 +1586,23 @@
+@@ -1221,12 +1547,23 @@
-mpw* | -macos*)
vendor=apple
;;
@@ -3061,7 +3133,7 @@
esac
echo $basic_machine$os
-+exit
++exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
@@ -3069,1267 +3141,19 @@
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
-diff -urNad cyrus-imapd-2.3-2.3.7~/configure cyrus-imapd-2.3-2.3.7/configure
---- cyrus-imapd-2.3-2.3.7~/configure 2006-08-26 00:00:13.000000000 +0000
-+++ cyrus-imapd-2.3-2.3.7/configure 2006-10-10 16:55:58.000000000 +0000
-@@ -1,8 +1,9 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.59.
-+# Generated by GNU Autoconf 2.60a.
- #
--# Copyright (C) 2003 Free Software Foundation, Inc.
-+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
- ## --------------------- ##
-@@ -16,11 +17,35 @@
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
--elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-- set -o posix
-+ setopt NO_GLOB_SUBST
-+else
-+ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
- fi
-+BIN_SH=xpg4; export BIN_SH # for Tru64
- DUALCASE=1; export DUALCASE # for MKS sh
-
-+
-+# PATH needs CR
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+ echo "#! /bin/sh" >conf$$.sh
-+ echo "exit 0" >>conf$$.sh
-+ chmod +x conf$$.sh
-+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+ PATH_SEPARATOR=';'
-+ else
-+ PATH_SEPARATOR=:
-+ fi
-+ rm -f conf$$.sh
-+fi
-+
- # Support unset when possible.
- if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- as_unset=unset
-@@ -29,8 +54,43 @@
- fi
-
-
-+# IFS
-+# We need space, tab and new line, in precisely that order. Quoting is
-+# there to prevent editors from complaining about space-tab.
-+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-+# splitting by setting IFS to empty value.)
-+as_nl='
-+'
-+IFS=" "" $as_nl"
-+
-+# Find who we are. Look in the path if we contain no directory separator.
-+case $0 in
-+ *[\\/]* ) as_myself=$0 ;;
-+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+done
-+IFS=$as_save_IFS
-+
-+ ;;
-+esac
-+# We did not find ourselves, most probably we were run as `sh COMMAND'
-+# in which case we are not to be found in the path.
-+if test "x$as_myself" = x; then
-+ as_myself=$0
-+fi
-+if test ! -f "$as_myself"; then
-+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+ { (exit 1); exit 1; }
-+fi
-+
- # Work around bugs in pre-3.0 UWIN ksh.
--$as_unset ENV MAIL MAILPATH
-+for as_var in ENV MAIL MAILPATH
-+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+done
- PS1='$ '
- PS2='> '
- PS4='+ '
-@@ -44,18 +104,19 @@
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
- eval $as_var=C; export $as_var
- else
-- $as_unset $as_var
-+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- fi
- done
-
- # Required to use basename.
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
- else
- as_expr=false
- fi
-
--if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
- as_basename=basename
- else
- as_basename=false
-@@ -63,157 +124,386 @@
-
-
- # Name of the executable.
--as_me=`$as_basename "$0" ||
-+as_me=`$as_basename -- "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
-- X"$0" : 'X\(/\)$' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- echo X/"$0" |
-- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-- /^X\/\(\/\/\)$/{ s//\1/; q; }
-- /^X\/\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-+ sed '/^.*\/\([^/][^/]*\)\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\/\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\/\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'`
-
-+# CDPATH.
-+$as_unset CDPATH
-
--# PATH needs CR, and LINENO needs CR and PATH.
--# Avoid depending upon Character Ranges.
--as_cr_letters='abcdefghijklmnopqrstuvwxyz'
--as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
--as_cr_Letters=$as_cr_letters$as_cr_LETTERS
--as_cr_digits='0123456789'
--as_cr_alnum=$as_cr_Letters$as_cr_digits
-
--# The user is always right.
--if test "${PATH_SEPARATOR+set}" != set; then
-- echo "#! /bin/sh" >conf$$.sh
-- echo "exit 0" >>conf$$.sh
-- chmod +x conf$$.sh
-- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-- PATH_SEPARATOR=';'
-- else
-- PATH_SEPARATOR=:
-- fi
-- rm -f conf$$.sh
-+if test "x$CONFIG_SHELL" = x; then
-+ if (eval ":") 2>/dev/null; then
-+ as_have_required=yes
-+else
-+ as_have_required=no
- fi
-
-+ if test $as_have_required = yes && (eval ":
-+(as_func_return () {
-+ (exit \$1)
-+}
-+as_func_success () {
-+ as_func_return 0
-+}
-+as_func_failure () {
-+ as_func_return 1
-+}
-+as_func_ret_success () {
-+ return 0
-+}
-+as_func_ret_failure () {
-+ return 1
-+}
-
-- as_lineno_1=$LINENO
-- as_lineno_2=$LINENO
-- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-- test "x$as_lineno_1" != "x$as_lineno_2" &&
-- test "x$as_lineno_3" = "x$as_lineno_2" || {
-- # Find who we are. Look in the path if we contain no path at all
-- # relative or not.
-- case $0 in
-- *[\\/]* ) as_myself=$0 ;;
-- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
--done
-+exitcode=0
-+if as_func_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_success failed.
-+fi
-
-- ;;
-- esac
-- # We did not find ourselves, most probably we were run as `sh COMMAND'
-- # in which case we are not to be found in the path.
-- if test "x$as_myself" = x; then
-- as_myself=$0
-- fi
-- if test ! -f "$as_myself"; then
-- { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-- { (exit 1); exit 1; }; }
-- fi
-- case $CONFIG_SHELL in
-- '')
-+if as_func_failure; then
-+ exitcode=1
-+ echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+ exitcode=1
-+ echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-+ :
-+else
-+ exitcode=1
-+ echo positional parameters were not saved.
-+fi
-+
-+test \$exitcode = 0) || { (exit 1); exit 1; }
-+
-+(
-+ as_lineno_1=\$LINENO
-+ as_lineno_2=\$LINENO
-+ test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
-+ test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-+") 2> /dev/null; then
-+ :
-+else
-+ as_candidate_shells=
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-+for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for as_base in sh bash ksh sh5; do
-- case $as_dir in
-+ case $as_dir in
- /*)
-- if ("$as_dir/$as_base" -c '
-+ for as_base in sh bash ksh sh5; do
-+ as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
-+ done;;
-+ esac
-+done
-+IFS=$as_save_IFS
-+
-+
-+ for as_shell in $as_candidate_shells $SHELL; do
-+ # Try only shells that exist, to save several forks.
-+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-+ { ("$as_shell") 2> /dev/null <<\_ASEOF
-+# Be Bourne compatible
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+ emulate sh
-+ NULLCMD=:
-+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+ # is contrary to our usage. Disable this feature.
-+ alias -g '${1+"$@"}'='"$@"'
-+ setopt NO_GLOB_SUBST
-+else
-+ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-+fi
-+BIN_SH=xpg4; export BIN_SH # for Tru64
-+DUALCASE=1; export DUALCASE # for MKS sh
-+
-+:
-+_ASEOF
-+}; then
-+ CONFIG_SHELL=$as_shell
-+ as_have_required=yes
-+ if { "$as_shell" 2> /dev/null <<\_ASEOF
-+# Be Bourne compatible
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+ emulate sh
-+ NULLCMD=:
-+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-+ # is contrary to our usage. Disable this feature.
-+ alias -g '${1+"$@"}'='"$@"'
-+ setopt NO_GLOB_SUBST
-+else
-+ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-+fi
-+BIN_SH=xpg4; export BIN_SH # for Tru64
-+DUALCASE=1; export DUALCASE # for MKS sh
-+
-+:
-+(as_func_return () {
-+ (exit $1)
-+}
-+as_func_success () {
-+ as_func_return 0
-+}
-+as_func_failure () {
-+ as_func_return 1
-+}
-+as_func_ret_success () {
-+ return 0
-+}
-+as_func_ret_failure () {
-+ return 1
-+}
-+
-+exitcode=0
-+if as_func_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_success failed.
-+fi
-+
-+if as_func_failure; then
-+ exitcode=1
-+ echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+ exitcode=1
-+ echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = "$1" ); then
-+ :
-+else
-+ exitcode=1
-+ echo positional parameters were not saved.
-+fi
-+
-+test $exitcode = 0) || { (exit 1); exit 1; }
-+
-+(
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
-- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
- test "x$as_lineno_1" != "x$as_lineno_2" &&
-- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
-- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-- CONFIG_SHELL=$as_dir/$as_base
-- export CONFIG_SHELL
-- exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-- fi;;
-- esac
-- done
--done
--;;
-- esac
-+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
-+
-+_ASEOF
-+}; then
-+ break
-+fi
-+
-+fi
-+
-+ done
-+
-+ if test "x$CONFIG_SHELL" != x; then
-+ for as_var in BASH_ENV ENV
-+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+ done
-+ export CONFIG_SHELL
-+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-+fi
-+
-+
-+ if test $as_have_required = no; then
-+ echo This script requires a shell more modern than all the
-+ echo shells that I found on your system. Please install a
-+ echo modern shell, or manually run the script under such a
-+ echo shell if you do have one.
-+ { (exit 1); exit 1; }
-+fi
-+
-+
-+fi
-+
-+fi
-+
-+
-+
-+(eval "as_func_return () {
-+ (exit \$1)
-+}
-+as_func_success () {
-+ as_func_return 0
-+}
-+as_func_failure () {
-+ as_func_return 1
-+}
-+as_func_ret_success () {
-+ return 0
-+}
-+as_func_ret_failure () {
-+ return 1
-+}
-+
-+exitcode=0
-+if as_func_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_success failed.
-+fi
-+
-+if as_func_failure; then
-+ exitcode=1
-+ echo as_func_failure succeeded.
-+fi
-+
-+if as_func_ret_success; then
-+ :
-+else
-+ exitcode=1
-+ echo as_func_ret_success failed.
-+fi
-+
-+if as_func_ret_failure; then
-+ exitcode=1
-+ echo as_func_ret_failure succeeded.
-+fi
-+
-+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-+ :
-+else
-+ exitcode=1
-+ echo positional parameters were not saved.
-+fi
-+
-+test \$exitcode = 0") || {
-+ echo No shell found that supports shell functions.
-+ echo Please tell autoconf at gnu.org about your system,
-+ echo including any error possibly output before this
-+ echo message
-+}
-+
-+
-+
-+ as_lineno_1=$LINENO
-+ as_lineno_2=$LINENO
-+ test "x$as_lineno_1" != "x$as_lineno_2" &&
-+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
-- # line-number line before each line; the second 'sed' does the real
-- # work. The second script uses 'N' to pair each line-number line
-- # with the numbered line, and appends trailing '-' during
-- # substitution so that $LINENO is not a special case at line end.
-+ # line-number line after each line using $LINENO; the second 'sed'
-+ # does the real work. The second script uses 'N' to pair each
-+ # line-number line with the line containing $LINENO, and appends
-+ # trailing '-' during substitution so that $LINENO is not a special
-+ # case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
-- sed '=' <$as_myself |
-+ # scripts with optimization help from Paolo Bonzini. Blame Lee
-+ # E. McMahon (1931-1989) for sed's syntax. :-)
-+ sed -n '
-+ p
-+ /[$]LINENO/=
-+ ' <$as_myself |
- sed '
-+ s/[$]LINENO.*/&-/
-+ t lineno
-+ b
-+ :lineno
- N
-- s,$,-,
-- : loop
-- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-+ :loop
-+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
- t loop
-- s,-$,,
-- s,^['$as_cr_digits']*\n,,
-+ s/-\n.*//
- ' >$as_me.lineno &&
-- chmod +x $as_me.lineno ||
-+ chmod +x "$as_me.lineno" ||
- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
- { (exit 1); exit 1; }; }
-
- # Don't try to exec as it changes $[0], causing all sort of problems
- # (the dirname of $[0] is not the place where we might find the
-- # original and so on. Autoconf is especially sensible to this).
-- . ./$as_me.lineno
-+ # original and so on. Autoconf is especially sensitive to this).
-+ . "./$as_me.lineno"
- # Exit status is that of the last command.
- exit
- }
-
-
--case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-- *c*,-n*) ECHO_N= ECHO_C='
--' ECHO_T=' ' ;;
-- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
-+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-+ as_dirname=dirname
-+else
-+ as_dirname=false
-+fi
-+
-+ECHO_C= ECHO_N= ECHO_T=
-+case `echo -n x` in
-+-n*)
-+ case `echo 'x\c'` in
-+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
-+ *) ECHO_C='\c';;
-+ esac;;
-+*)
-+ ECHO_N='-n';;
- esac
-
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
- else
- as_expr=false
- fi
-
- rm -f conf$$ conf$$.exe conf$$.file
-+if test -d conf$$.dir; then
-+ rm -f conf$$.dir/conf$$.file
-+else
-+ rm -f conf$$.dir
-+ mkdir conf$$.dir
-+fi
- echo >conf$$.file
- if ln -s conf$$.file conf$$ 2>/dev/null; then
-- # We could just check for DJGPP; but this test a) works b) is more generic
-- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-- if test -f conf$$.exe; then
-- # Don't use ln at all; we don't have any links
-+ as_ln_s='ln -s'
-+ # ... but there are two gotchas:
-+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-+ # In both cases, we have to default to `cp -p'.
-+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
-- else
-- as_ln_s='ln -s'
-- fi
- elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
- else
- as_ln_s='cp -p'
- fi
--rm -f conf$$ conf$$.exe conf$$.file
-+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-+rmdir conf$$.dir 2>/dev/null
-
- if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
-@@ -222,7 +512,19 @@
- as_mkdir_p=false
- fi
-
--as_executable_p="test -f"
-+# Find out whether ``test -x'' works. Don't use a zero-byte file, as
-+# systems may use methods other than mode bits to determine executability.
-+cat >conf$$.file <<_ASEOF
-+#! /bin/sh
-+exit 0
-+_ASEOF
-+chmod +x conf$$.file
-+if test -x conf$$.file >/dev/null 2>&1; then
-+ as_executable_p="test -x"
-+else
-+ as_executable_p=:
-+fi
-+rm -f conf$$.file
-
- # Sed expression to map a string onto a valid CPP name.
- as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -231,39 +533,27 @@
- as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
--# IFS
--# We need space, tab and new line, in precisely that order.
--as_nl='
--'
--IFS=" $as_nl"
--
--# CDPATH.
--$as_unset CDPATH
-
-+exec 7<&0 </dev/null 6>&1
-
- # Name of the host.
- # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
- # so uname gets run too.
- ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
--exec 6>&1
--
- #
- # Initializations.
- #
- ac_default_prefix=/usr/local
-+ac_clean_files=
- ac_config_libobj_dir=.
-+LIBOBJS=
- cross_compiling=no
- subdirs=
- MFLAGS=
- MAKEFLAGS=
- SHELL=${CONFIG_SHELL-/bin/sh}
-
--# Maximum number of lines to put in a shell here document.
--# This variable seems obsolete. It should probably be removed, and
--# only ac_max_sed_lines should be used.
--: ${ac_max_here_lines=38}
--
- # Identity of this package.
- PACKAGE_NAME=
- PACKAGE_TARNAME=
-@@ -275,42 +565,178 @@
- # Factoring default headers for most tests.
- ac_includes_default="\
- #include <stdio.h>
--#if HAVE_SYS_TYPES_H
-+#ifdef HAVE_SYS_TYPES_H
- # include <sys/types.h>
- #endif
--#if HAVE_SYS_STAT_H
-+#ifdef HAVE_SYS_STAT_H
- # include <sys/stat.h>
- #endif
--#if STDC_HEADERS
-+#ifdef STDC_HEADERS
- # include <stdlib.h>
- # include <stddef.h>
- #else
--# if HAVE_STDLIB_H
-+# ifdef HAVE_STDLIB_H
- # include <stdlib.h>
- # endif
- #endif
--#if HAVE_STRING_H
--# if !STDC_HEADERS && HAVE_MEMORY_H
-+#ifdef HAVE_STRING_H
-+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
- # include <memory.h>
- # endif
- # include <string.h>
- #endif
--#if HAVE_STRINGS_H
-+#ifdef HAVE_STRINGS_H
- # include <strings.h>
- #endif
--#if HAVE_INTTYPES_H
-+#ifdef HAVE_INTTYPES_H
- # include <inttypes.h>
--#else
--# if HAVE_STDINT_H
--# include <stdint.h>
--# endif
- #endif
--#if HAVE_UNISTD_H
-+#ifdef HAVE_STDINT_H
-+# include <stdint.h>
-+#endif
-+#ifdef HAVE_UNISTD_H
+diff -urNad cyrus-imapd-2.3-2.3.8/configure /tmp/dpep.H9T4fx/cyrus-imapd-2.3-2.3.8/configure
+--- cyrus-imapd-2.3-2.3.8/configure 2007-02-27 04:01:39.000000000 +0100
++++ /tmp/dpep.H9T4fx/cyrus-imapd-2.3-2.3.8/configure 2007-02-27 04:02:39.384607028 +0100
+@@ -309,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 BDB_INC BDB_LIB CYRUSDB_OBJS SIEVE_OBJS SIEVE_LIBS SIEVE_CPPFLAGS YACC LEX LEXLIB LEX_OUTPUT_ROOT SIEVE_SUBDIRS WITH_NONBLOCK WITH_GMTOFF WITH_MAP WITH_LOCK cyrus_sigveclib AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS IMAP_PROGS COMPILE_ET COM_ERR_LIBS COM_ERR_LDFLAGS COM_ERR_CPPFLAGS LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_DYN_SASL DYNSASLFLAGS LIB_SASL SASLFLAGS PERL PERL_CCCDLFLAGS MD5OBJ SNMP_SUBDIRS CMU_LIB_SUBDIR LIB_WRAP SNMP_CONFIG LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS'
-+ac_subst_vars='SHELL
-+PATH_SEPARATOR
-+PACKAGE_NAME
-+PACKAGE_TARNAME
-+PACKAGE_VERSION
-+PACKAGE_STRING
-+PACKAGE_BUGREPORT
-+exec_prefix
-+prefix
-+program_transform_name
-+bindir
-+sbindir
-+libexecdir
-+datarootdir
-+datadir
-+sysconfdir
-+sharedstatedir
-+localstatedir
-+includedir
-+oldincludedir
-+docdir
-+infodir
-+htmldir
-+dvidir
-+pdfdir
-+psdir
-+libdir
-+localedir
-+mandir
-+DEFS
-+ECHO_C
-+ECHO_N
-+ECHO_T
-+LIBS
-+build_alias
-+host_alias
-+target_alias
-+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
-+SET_MAKE
-+INSTALL_PROGRAM
-+INSTALL_SCRIPT
-+INSTALL_DATA
-+CPP
-+GREP
-+EGREP
-+AWK
-+LIBOBJS
-+LIB_SOCKET
-+IPV6_OBJS
-+PRE_SUBDIRS
-+EXTRA_SUBDIRS
-+DEPLIBS
-+LOCALDEFS
-+BDB_INC
-+BDB_LIB
-+CYRUSDB_OBJS
-+SIEVE_OBJS
-+SIEVE_LIBS
-+SIEVE_CPPFLAGS
-+YACC
-+YFLAGS
-+LEX
-+LEX_OUTPUT_ROOT
-+LEXLIB
-+SIEVE_SUBDIRS
-+WITH_NONBLOCK
-+WITH_GMTOFF
-+WITH_MAP
-+WITH_LOCK
-+cyrus_sigveclib
-+AFS_LIBS
-+AFS_LDFLAGS
-+LDAP_CPPFLAGS
-+LDAP_LDFLAGS
-+LDAP_LIBS
-+SERVER_SUBDIRS
-+OPENSSL_INC
-+OPENSSL_LIB
-+ZEPHYR_LIBS
-+ZEPHYR_CPPFLAGS
-+IMAP_PROGS
-+COMPILE_ET
-+COM_ERR_LIBS
-+COM_ERR_LDFLAGS
-+COM_ERR_CPPFLAGS
-+LIB_CRYPT
-+GSSAPI_LIBS
-+GSSAPIBASE_LIBS
-+LIB_DYN_SASL
-+DYNSASLFLAGS
-+LIB_SASL
-+SASLFLAGS
-+PERL
-+PERL_CCCDLFLAGS
-+MD5OBJ
-+SNMP_SUBDIRS
-+CMU_LIB_SUBDIR
-+LIB_WRAP
-+SNMP_CONFIG
-+LIB_UCDSNMP
-+LIB_RT
-+IMAP_COM_ERR_LIBS
-+IMAP_LIBS
-+PERL_SUBDIRS
-+PERL_DEPSUBDIRS
-+LTLIBOBJS'
++ac_subst_vars='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 BDB_INC BDB_LIB CYRUSDB_OBJS SIEVE_OBJS SIEVE_LIBS SIEVE_CPPFLAGS YACC LEX LEXLIB LEX_OUTPUT_ROOT SIEVE_SUBDIRS WITH_NONBLOCK WITH_GMTOFF WITH_MAP WITH_LOCK cyrus_sigveclib AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS IMAP_PROGS COMPILE_ET COM_ERR_LIBS COM_ERR_LDFLAGS COM_ERR_CPPFLAGS LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_DYN_SASL DYNSASLFLAGS LIB_SASL SASLFLAGS PERL PERL_CCCDLFLAGS MD5OBJ SNMP_SUBDIRS CMU_LIB_SUBDIR LIB_WRAP SNMP_CONFIG LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS'
ac_subst_files=''
-+ ac_precious_vars='build_alias
-+host_alias
-+target_alias
-+CC
-+CFLAGS
-+LDFLAGS
-+CPPFLAGS
-+CPP
-+YACC
-+YFLAGS'
-+
# Initialize some variables set by options.
- ac_init_help=
-@@ -337,34 +763,48 @@
- # and all the variables that are supposed to be based on exec_prefix
- # by default will actually change.
- # Use braces instead of parens because sh, perl, etc. also accept them.
-+# (The list follows the same order as the GNU Coding Standards.)
- bindir='${exec_prefix}/bin'
- sbindir='${exec_prefix}/sbin'
- libexecdir='${exec_prefix}/libexec'
--datadir='${prefix}/share'
-+datarootdir='${prefix}/share'
-+datadir='${datarootdir}'
- sysconfdir='${prefix}/etc'
- sharedstatedir='${prefix}/com'
- localstatedir='${prefix}/var'
--libdir='${exec_prefix}/lib'
- includedir='${prefix}/include'
- oldincludedir='/usr/include'
--infodir='${prefix}/info'
--mandir='${prefix}/man'
-+docdir='${datarootdir}/doc/${PACKAGE}'
-+infodir='${datarootdir}/info'
-+htmldir='${docdir}'
-+dvidir='${docdir}'
-+pdfdir='${docdir}'
-+psdir='${docdir}'
-+libdir='${exec_prefix}/lib'
-+localedir='${datarootdir}/locale'
-+mandir='${datarootdir}/man'
-
- ac_prev=
-+ac_dashdash=
- for ac_option
- do
- # If the previous option needs an argument, assign it.
- if test -n "$ac_prev"; then
-- eval "$ac_prev=\$ac_option"
-+ eval $ac_prev=\$ac_option
- ac_prev=
- continue
- fi
-
-- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-+ case $ac_option in
-+ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-+ *) ac_optarg=yes ;;
-+ esac
-
- # Accept the important Cygnus configure options, so we can diagnose typos.
-
-- case $ac_option in
-+ case $ac_dashdash$ac_option in
-+ --)
-+ ac_dashdash=yes ;;
-
- -bindir | --bindir | --bindi | --bind | --bin | --bi)
- ac_prev=bindir ;;
-@@ -386,12 +826,18 @@
- --config-cache | -C)
- cache_file=config.cache ;;
-
-- -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-+ -datadir | --datadir | --datadi | --datad)
- ac_prev=datadir ;;
-- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-- | --da=*)
-+ -datadir=* | --datadir=* | --datadi=* | --datad=*)
- datadir=$ac_optarg ;;
-
-+ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-+ | --dataroo | --dataro | --datar)
-+ ac_prev=datarootdir ;;
-+ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-+ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-+ datarootdir=$ac_optarg ;;
-+
- -disable-* | --disable-*)
- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
- # Reject names that are not valid shell variable names.
-@@ -399,7 +845,17 @@
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
- { (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-- eval "enable_$ac_feature=no" ;;
-+ eval enable_$ac_feature=no ;;
-+
-+ -docdir | --docdir | --docdi | --doc | --do)
-+ ac_prev=docdir ;;
-+ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-+ docdir=$ac_optarg ;;
-+
-+ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-+ ac_prev=dvidir ;;
-+ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-+ dvidir=$ac_optarg ;;
-
- -enable-* | --enable-*)
- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-@@ -408,11 +864,7 @@
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
- { (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-- case $ac_option in
-- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-- *) ac_optarg=yes ;;
-- esac
-- eval "enable_$ac_feature='$ac_optarg'" ;;
-+ eval enable_$ac_feature=\$ac_optarg ;;
-
- -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
- | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -439,6 +891,12 @@
- -host=* | --host=* | --hos=* | --ho=*)
- host_alias=$ac_optarg ;;
-
-+ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-+ ac_prev=htmldir ;;
-+ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-+ | --ht=*)
-+ htmldir=$ac_optarg ;;
-+
- -includedir | --includedir | --includedi | --included | --include \
- | --includ | --inclu | --incl | --inc)
- ac_prev=includedir ;;
-@@ -463,13 +921,16 @@
- | --libexe=* | --libex=* | --libe=*)
- libexecdir=$ac_optarg ;;
-
-+ -localedir | --localedir | --localedi | --localed | --locale)
-+ ac_prev=localedir ;;
-+ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-+ localedir=$ac_optarg ;;
-+
- -localstatedir | --localstatedir | --localstatedi | --localstated \
-- | --localstate | --localstat | --localsta | --localst \
-- | --locals | --local | --loca | --loc | --lo)
-+ | --localstate | --localstat | --localsta | --localst | --locals)
- ac_prev=localstatedir ;;
- -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-- | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-+ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
- localstatedir=$ac_optarg ;;
-
- -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-@@ -534,6 +995,16 @@
- | --progr-tra=* | --program-tr=* | --program-t=*)
- program_transform_name=$ac_optarg ;;
-
-+ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-+ ac_prev=pdfdir ;;
-+ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-+ pdfdir=$ac_optarg ;;
-+
-+ -psdir | --psdir | --psdi | --psd | --ps)
-+ ac_prev=psdir ;;
-+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-+ psdir=$ac_optarg ;;
-+
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil)
- silent=yes ;;
-@@ -590,11 +1061,7 @@
- { echo "$as_me: error: invalid package name: $ac_package" >&2
- { (exit 1); exit 1; }; }
- ac_package=`echo $ac_package| sed 's/-/_/g'`
-- case $ac_option in
-- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-- *) ac_optarg=yes ;;
-- esac
-- eval "with_$ac_package='$ac_optarg'" ;;
-+ eval with_$ac_package=\$ac_optarg ;;
-
- -without-* | --without-*)
- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-@@ -603,7 +1070,7 @@
- { echo "$as_me: error: invalid package name: $ac_package" >&2
- { (exit 1); exit 1; }; }
- ac_package=`echo $ac_package | sed 's/-/_/g'`
-- eval "with_$ac_package=no" ;;
-+ eval with_$ac_package=no ;;
-
- --x)
- # Obsolete; use --with-x.
-@@ -634,8 +1101,7 @@
- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
- { (exit 1); exit 1; }; }
-- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-- eval "$ac_envvar='$ac_optarg'"
-+ eval $ac_envvar=\$ac_optarg
- export $ac_envvar ;;
-
- *)
-@@ -655,27 +1121,19 @@
- { (exit 1); exit 1; }; }
- fi
-
--# Be sure to have absolute paths.
--for ac_var in exec_prefix prefix
--do
-- eval ac_val=$`echo $ac_var`
-- case $ac_val in
-- [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-- { (exit 1); exit 1; }; };;
-- esac
--done
--
--# Be sure to have absolute paths.
--for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-- localstatedir libdir includedir oldincludedir infodir mandir
-+# Be sure to have absolute directory names.
-+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
-+ datadir sysconfdir sharedstatedir localstatedir includedir \
-+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-+ libdir localedir mandir
- do
-- eval ac_val=$`echo $ac_var`
-+ eval ac_val=\$$ac_var
- case $ac_val in
-- [\\/$]* | ?:[\\/]* ) ;;
-- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-- { (exit 1); exit 1; }; };;
-+ [\\/$]* | ?:[\\/]* ) continue;;
-+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
- esac
-+ { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-+ { (exit 1); exit 1; }; }
- done
-
- # There might be people who depend on the old broken behavior: `$host'
-@@ -702,74 +1160,76 @@
- test "$silent" = yes && exec 6>/dev/null
-
-
-+ac_pwd=`pwd` && test -n "$ac_pwd" &&
-+ac_ls_di=`ls -di .` &&
-+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-+ { echo "$as_me: error: Working directory cannot be determined" >&2
-+ { (exit 1); exit 1; }; }
-+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-+ { echo "$as_me: error: pwd does not report name of working directory" >&2
-+ { (exit 1); exit 1; }; }
-+
-+
- # Find the source files, if location was not specified.
- if test -z "$srcdir"; then
- ac_srcdir_defaulted=yes
-- # Try the directory containing this script, then its parent.
-- ac_confdir=`(dirname "$0") 2>/dev/null ||
-+ # Try the directory containing this script, then the parent directory.
-+ ac_confdir=`$as_dirname -- "$0" ||
- $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$0" : 'X\(//\)[^/]' \| \
- X"$0" : 'X\(//\)$' \| \
-- X"$0" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$0" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)[^/].*/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'`
- srcdir=$ac_confdir
-- if test ! -r $srcdir/$ac_unique_file; then
-+ if test ! -r "$srcdir/$ac_unique_file"; then
- srcdir=..
- fi
- else
- ac_srcdir_defaulted=no
- fi
--if test ! -r $srcdir/$ac_unique_file; then
-- if test "$ac_srcdir_defaulted" = yes; then
-- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-- { (exit 1); exit 1; }; }
-- else
-- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-+if test ! -r "$srcdir/$ac_unique_file"; then
-+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
- { (exit 1); exit 1; }; }
-- fi
- fi
--(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-+ac_abs_confdir=`(
-+ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
- { (exit 1); exit 1; }; }
--srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
--ac_env_build_alias_set=${build_alias+set}
--ac_env_build_alias_value=$build_alias
--ac_cv_env_build_alias_set=${build_alias+set}
--ac_cv_env_build_alias_value=$build_alias
--ac_env_host_alias_set=${host_alias+set}
--ac_env_host_alias_value=$host_alias
--ac_cv_env_host_alias_set=${host_alias+set}
--ac_cv_env_host_alias_value=$host_alias
--ac_env_target_alias_set=${target_alias+set}
--ac_env_target_alias_value=$target_alias
--ac_cv_env_target_alias_set=${target_alias+set}
--ac_cv_env_target_alias_value=$target_alias
--ac_env_CC_set=${CC+set}
--ac_env_CC_value=$CC
--ac_cv_env_CC_set=${CC+set}
--ac_cv_env_CC_value=$CC
--ac_env_CFLAGS_set=${CFLAGS+set}
--ac_env_CFLAGS_value=$CFLAGS
--ac_cv_env_CFLAGS_set=${CFLAGS+set}
--ac_cv_env_CFLAGS_value=$CFLAGS
--ac_env_LDFLAGS_set=${LDFLAGS+set}
--ac_env_LDFLAGS_value=$LDFLAGS
--ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
--ac_cv_env_LDFLAGS_value=$LDFLAGS
--ac_env_CPPFLAGS_set=${CPPFLAGS+set}
--ac_env_CPPFLAGS_value=$CPPFLAGS
--ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
--ac_cv_env_CPPFLAGS_value=$CPPFLAGS
--ac_env_CPP_set=${CPP+set}
--ac_env_CPP_value=$CPP
--ac_cv_env_CPP_set=${CPP+set}
--ac_cv_env_CPP_value=$CPP
-+ pwd)`
-+# When building in place, set srcdir=.
-+if test "$ac_abs_confdir" = "$ac_pwd"; then
-+ srcdir=.
-+fi
-+# Remove unnecessary trailing slashes from srcdir.
-+# Double slashes in file names in object file debugging info
-+# mess up M-x gdb in Emacs.
-+case $srcdir in
-+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-+esac
-+for ac_var in $ac_precious_vars; do
-+ eval ac_env_${ac_var}_set=\${${ac_var}+set}
-+ eval ac_env_${ac_var}_value=\$${ac_var}
-+ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-+ eval ac_cv_env_${ac_var}_value=\$${ac_var}
-+done
-
- #
- # Report the --help message.
-@@ -798,9 +1258,6 @@
- -n, --no-create do not create output files
- --srcdir=DIR find the sources in DIR [configure dir or \`..']
-
--_ACEOF
--
-- cat <<_ACEOF
- Installation directories:
- --prefix=PREFIX install architecture-independent files in PREFIX
- [$ac_default_prefix]
-@@ -818,15 +1275,22 @@
- --bindir=DIR user executables [EPREFIX/bin]
- --sbindir=DIR system admin executables [EPREFIX/sbin]
- --libexecdir=DIR program executables [EPREFIX/libexec]
-- --datadir=DIR read-only architecture-independent data [PREFIX/share]
- --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
- --localstatedir=DIR modifiable single-machine data [PREFIX/var]
- --libdir=DIR object code libraries [EPREFIX/lib]
- --includedir=DIR C header files [PREFIX/include]
- --oldincludedir=DIR C header files for non-gcc [/usr/include]
-- --infodir=DIR info documentation [PREFIX/info]
-- --mandir=DIR man documentation [PREFIX/man]
-+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
-+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
-+ --infodir=DIR info documentation [DATAROOTDIR/info]
-+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
-+ --mandir=DIR man documentation [DATAROOTDIR/man]
-+ --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE]
-+ --htmldir=DIR html documentation [DOCDIR]
-+ --dvidir=DIR dvi documentation [DOCDIR]
-+ --pdfdir=DIR pdf documentation [DOCDIR]
-+ --psdir=DIR ps documentation [DOCDIR]
- _ACEOF
-
- cat <<\_ACEOF
-@@ -844,6 +1308,7 @@
+@@ -844,6 +844,7 @@
Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
@@ -4337,2791 +3161,121 @@
--disable-sieve disable Sieve support
--enable-krb5afspts compile afskrb PTS module with krb5 support
--disable-server disable compiling servers
-@@ -899,126 +1364,99 @@
- CFLAGS C compiler flags
- LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
- nonstandard directory <lib dir>
-- CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have
-- headers in a nonstandard directory <include dir>
-+ CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-+ you have headers in a nonstandard directory <include dir>
- CPP C preprocessor
-+ YACC The `Yet Another C Compiler' implementation to use. Defaults to
-+ the first program found out of: `bison -y', `byacc', `yacc'.
-+ YFLAGS The list of arguments that will be passed by default to $YACC.
-+ This script will default YFLAGS to the empty string to avoid a
-+ default value of `-d' given by some make applications.
-
- Use these variables to override the choices made by `configure' or to help
- it to find libraries and programs with nonstandard names/locations.
-
- _ACEOF
-+ac_status=$?
- fi
-
- if test "$ac_init_help" = "recursive"; then
- # If there are subdirs, report their specific --help.
-- ac_popdir=`pwd`
- for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-- test -d $ac_dir || continue
-+ test -d "$ac_dir" || continue
- ac_builddir=.
-
--if test "$ac_dir" != .; then
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-- # A "../" for each directory in $ac_dir_suffix.
-- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
--else
-- ac_dir_suffix= ac_top_builddir=
--fi
-+ # A ".." for each directory in $ac_dir_suffix.
-+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-+ case $ac_top_builddir_sub in
-+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-+ esac ;;
-+esac
-+ac_abs_top_builddir=$ac_pwd
-+ac_abs_builddir=$ac_pwd$ac_dir_suffix
-+# for backward compatibility:
-+ac_top_builddir=$ac_top_build_prefix
-
- case $srcdir in
-- .) # No --srcdir option. We are building in place.
-+ .) # We are building in place.
- ac_srcdir=.
-- if test -z "$ac_top_builddir"; then
-- ac_top_srcdir=.
-- else
-- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-- fi ;;
-- [\\/]* | ?:[\\/]* ) # Absolute path.
-+ ac_top_srcdir=$ac_top_builddir_sub
-+ ac_abs_top_srcdir=$ac_pwd ;;
-+ [\\/]* | ?:[\\/]* ) # Absolute name.
- ac_srcdir=$srcdir$ac_dir_suffix;
-- ac_top_srcdir=$srcdir ;;
-- *) # Relative path.
-- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-- ac_top_srcdir=$ac_top_builddir$srcdir ;;
--esac
--
--# Do not use `cd foo && pwd` to compute absolute paths, because
--# the directories may not exist.
--case `pwd` in
--.) ac_abs_builddir="$ac_dir";;
--*)
-- case "$ac_dir" in
-- .) ac_abs_builddir=`pwd`;;
-- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-- *) ac_abs_builddir=`pwd`/"$ac_dir";;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_builddir=${ac_top_builddir}.;;
--*)
-- case ${ac_top_builddir}. in
-- .) ac_abs_top_builddir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_srcdir=$ac_srcdir;;
--*)
-- case $ac_srcdir in
-- .) ac_abs_srcdir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_srcdir=$ac_top_srcdir;;
--*)
-- case $ac_top_srcdir in
-- .) ac_abs_top_srcdir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-- esac;;
-+ ac_top_srcdir=$srcdir
-+ ac_abs_top_srcdir=$srcdir ;;
-+ *) # Relative name.
-+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-+ ac_top_srcdir=$ac_top_build_prefix$srcdir
-+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
- esac
-+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-- cd $ac_dir
-- # Check for guested configure; otherwise get Cygnus style configure.
-- if test -f $ac_srcdir/configure.gnu; then
-- echo
-- $SHELL $ac_srcdir/configure.gnu --help=recursive
-- elif test -f $ac_srcdir/configure; then
-- echo
-- $SHELL $ac_srcdir/configure --help=recursive
-- elif test -f $ac_srcdir/configure.ac ||
-- test -f $ac_srcdir/configure.in; then
-- echo
-- $ac_configure --help
-+ cd "$ac_dir" || { ac_status=$?; continue; }
-+ # Check for guested configure.
-+ if test -f "$ac_srcdir/configure.gnu"; then
-+ echo &&
-+ $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-+ elif test -f "$ac_srcdir/configure"; then
-+ echo &&
-+ $SHELL "$ac_srcdir/configure" --help=recursive
+@@ -994,7 +995,7 @@
else
echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-- fi
+ fi
- cd $ac_popdir
-+ fi || ac_status=$?
-+ cd "$ac_pwd" || { ac_status=$?; break; }
++ cd "$ac_popdir"
done
fi
--test -n "$ac_init_help" && exit 0
-+test -n "$ac_init_help" && exit $ac_status
- if $ac_init_version; then
- cat <<\_ACEOF
-+configure
-+generated by GNU Autoconf 2.60a
-
--Copyright (C) 2003 Free Software Foundation, Inc.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- This configure script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it.
- _ACEOF
-- exit 0
-+ exit
- fi
--exec 5>config.log
--cat >&5 <<_ACEOF
-+cat >config.log <<_ACEOF
- This file contains any messages produced by compilers while
- running configure, to aid debugging if configure makes a mistake.
-
- It was created by $as_me, which was
--generated by GNU Autoconf 2.59. Invocation command line was
-+generated by GNU Autoconf 2.60a. Invocation command line was
-
- $ $0 $@
-
- _ACEOF
-+exec 5>>config.log
- {
- cat <<_ASUNAME
- ## --------- ##
-@@ -1037,7 +1475,7 @@
- /bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
- /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
- /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
--hostinfo = `(hostinfo) 2>/dev/null || echo unknown`
-+/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown`
- /bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
- /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
- /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
-@@ -1051,6 +1489,7 @@
- test -z "$as_dir" && as_dir=.
- echo "PATH: $as_dir"
- done
-+IFS=$as_save_IFS
-
- } >&5
-
-@@ -1072,7 +1511,6 @@
- ac_configure_args=
- ac_configure_args0=
- ac_configure_args1=
--ac_sep=
- ac_must_keep_next=false
- for ac_pass in 1 2
- do
-@@ -1083,7 +1521,7 @@
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil)
- continue ;;
-- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-+ *\'*)
- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
- esac
- case $ac_pass in
-@@ -1105,9 +1543,7 @@
- -* ) ac_must_keep_next=true ;;
- esac
- fi
-- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-- # Get rid of the leading space.
-- ac_sep=" "
-+ ac_configure_args="$ac_configure_args '$ac_arg'"
- ;;
- esac
- done
-@@ -1118,8 +1554,8 @@
- # When interrupted or exit'd, cleanup temporary files, and complete
- # config.log. We remove comments because anyway the quotes in there
- # would cause problems or look ugly.
--# WARNING: Be sure not to use single quotes in there, as some shells,
--# such as our DU 5.0 friend, will then `close' the trap.
-+# WARNING: Use '\'' to represent an apostrophe within the trap.
-+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
- trap 'exit_status=$?
- # Save into config.log some information that might help in debugging.
- {
-@@ -1132,20 +1568,34 @@
- _ASBOX
- echo
- # The following way of writing the cache mishandles newlines in values,
--{
-+(
-+ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-+ eval ac_val=\$$ac_var
-+ case $ac_val in #(
-+ *${as_nl}*)
-+ case $ac_var in #(
-+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-+ esac
-+ case $ac_var in #(
-+ _ | IFS | as_nl) ;; #(
-+ *) $as_unset $ac_var ;;
-+ esac ;;
-+ esac
-+ done
- (set) 2>&1 |
-- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-- *ac_space=\ *)
-+ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-+ *${as_nl}ac_space=\ *)
- sed -n \
-- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-- ;;
-+ "s/'\''/'\''\\\\'\'''\''/g;
-+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-+ ;; #(
- *)
-- sed -n \
-- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
- ;;
-- esac;
--}
-+ esac |
-+ sort
-+)
- echo
-
- cat <<\_ASBOX
-@@ -1156,22 +1606,28 @@
- echo
- for ac_var in $ac_subst_vars
- do
-- eval ac_val=$`echo $ac_var`
-- echo "$ac_var='"'"'$ac_val'"'"'"
-+ eval ac_val=\$$ac_var
-+ case $ac_val in
-+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+ esac
-+ echo "$ac_var='\''$ac_val'\''"
- done | sort
- echo
-
- if test -n "$ac_subst_files"; then
- cat <<\_ASBOX
--## ------------- ##
--## Output files. ##
--## ------------- ##
-+## ------------------- ##
-+## File substitutions. ##
-+## ------------------- ##
- _ASBOX
- echo
- for ac_var in $ac_subst_files
- do
-- eval ac_val=$`echo $ac_var`
-- echo "$ac_var='"'"'$ac_val'"'"'"
-+ eval ac_val=\$$ac_var
-+ case $ac_val in
-+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+ esac
-+ echo "$ac_var='\''$ac_val'\''"
- done | sort
- echo
- fi
-@@ -1183,26 +1639,24 @@
- ## ----------- ##
- _ASBOX
- echo
-- sed "/^$/d" confdefs.h | sort
-+ cat confdefs.h
- echo
- fi
- test "$ac_signal" != 0 &&
- echo "$as_me: caught signal $ac_signal"
- echo "$as_me: exit $exit_status"
- } >&5
-- rm -f core *.core &&
-- rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
-+ rm -f core *.core core.conftest.* &&
-+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
- exit $exit_status
-- ' 0
-+' 0
- for ac_signal in 1 2 13 15; do
- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
- done
- ac_signal=0
-
- # confdefs.h avoids OS command line length limits that DEFS can exceed.
--rm -rf conftest* confdefs.h
--# AIX cpp loses on an empty file, so make sure it contains at least a newline.
--echo >confdefs.h
-+rm -f -r conftest* confdefs.h
-
- # Predefined preprocessor variables.
-
-@@ -1233,14 +1687,17 @@
-
- # Let the site file select an alternate cache file if it wants to.
- # Prefer explicitly selected file to automatically selected ones.
--if test -z "$CONFIG_SITE"; then
-- if test "x$prefix" != xNONE; then
-- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-- else
-- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-- fi
-+if test -n "$CONFIG_SITE"; then
-+ set x "$CONFIG_SITE"
-+elif test "x$prefix" != xNONE; then
-+ set x "$prefix/share/config.site" "$prefix/etc/config.site"
-+else
-+ set x "$ac_default_prefix/share/config.site" \
-+ "$ac_default_prefix/etc/config.site"
- fi
--for ac_site_file in $CONFIG_SITE; do
-+shift
-+for ac_site_file
-+do
- if test -r "$ac_site_file"; then
- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
- echo "$as_me: loading site script $ac_site_file" >&6;}
-@@ -1256,8 +1713,8 @@
- { echo "$as_me:$LINENO: loading cache $cache_file" >&5
- echo "$as_me: loading cache $cache_file" >&6;}
- case $cache_file in
-- [\\/]* | ?:[\\/]* ) . $cache_file;;
-- *) . ./$cache_file;;
-+ [\\/]* | ?:[\\/]* ) . "$cache_file";;
-+ *) . "./$cache_file";;
- esac
- fi
- else
-@@ -1269,12 +1726,11 @@
- # Check that the precious variables saved in the cache have kept the same
- # value.
- ac_cache_corrupted=false
--for ac_var in `(set) 2>&1 |
-- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-+for ac_var in $ac_precious_vars; do
- eval ac_old_set=\$ac_cv_env_${ac_var}_set
- eval ac_new_set=\$ac_env_${ac_var}_set
-- eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-- eval ac_new_val="\$ac_env_${ac_var}_value"
-+ eval ac_old_val=\$ac_cv_env_${ac_var}_value
-+ eval ac_new_val=\$ac_env_${ac_var}_value
- case $ac_old_set,$ac_new_set in
- set,)
- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-@@ -1299,8 +1755,7 @@
- # Pass precious variables to config.status.
- if test "$ac_new_set" = set; then
- case $ac_new_val in
-- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-+ *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
- *) ac_arg=$ac_var=$ac_new_val ;;
- esac
- case " $ac_configure_args " in
-@@ -1317,12 +1772,6 @@
- { (exit 1); exit 1; }; }
- fi
-
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
-
-
-
-@@ -1339,106 +1788,154 @@
-
-
-
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-- ac_config_headers="$ac_config_headers config.h"
-+ac_config_headers="$ac_config_headers config.h"
-
- ac_aux_dir=
--for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-- if test -f $ac_dir/install-sh; then
-+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
-+ if test -f "$ac_dir/install-sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
- break
-- elif test -f $ac_dir/install.sh; then
-+ elif test -f "$ac_dir/install.sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
-- elif test -f $ac_dir/shtool; then
-+ elif test -f "$ac_dir/shtool"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/shtool install -c"
- break
- fi
- done
- if test -z "$ac_aux_dir"; then
-- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
--echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
-+ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-+echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
- { (exit 1); exit 1; }; }
- fi
--ac_config_guess="$SHELL $ac_aux_dir/config.guess"
--ac_config_sub="$SHELL $ac_aux_dir/config.sub"
--ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-+
-+# These three variables are undocumented and unsupported,
-+# and are intended to be withdrawn in a future Autoconf release.
-+# They can cause serious problems if a builder's source tree is in a directory
-+# whose full name contains unusual characters.
-+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
-+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
-+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
-+
-
- # Make sure we can run config.sub.
--$ac_config_sub sun4 >/dev/null 2>&1 ||
-- { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
--echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-+ { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
- { (exit 1); exit 1; }; }
-
--echo "$as_me:$LINENO: checking build system type" >&5
--echo $ECHO_N "checking build system type... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking build system type" >&5
-+echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
- if test "${ac_cv_build+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_cv_build_alias=$build_alias
--test -z "$ac_cv_build_alias" &&
-- ac_cv_build_alias=`$ac_config_guess`
--test -z "$ac_cv_build_alias" &&
-+ ac_build_alias=$build_alias
-+test "x$ac_build_alias" = x &&
-+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
-+test "x$ac_build_alias" = x &&
- { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
- echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
- { (exit 1); exit 1; }; }
--ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
--echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
-+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
-+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
- { (exit 1); exit 1; }; }
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv_build" >&5
--echo "${ECHO_T}$ac_cv_build" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-+echo "${ECHO_T}$ac_cv_build" >&6; }
-+case $ac_cv_build in
-+*-*-*) ;;
-+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-+echo "$as_me: error: invalid value of canonical build" >&2;}
-+ { (exit 1); exit 1; }; };;
-+esac
- build=$ac_cv_build
--build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
--build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
--build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-+ac_save_IFS=$IFS; IFS='-'
-+set x $ac_cv_build
-+shift
-+build_cpu=$1
-+build_vendor=$2
-+shift; shift
-+# Remember, the first character of IFS is used to create $*,
-+# except with old shells:
-+build_os=$*
-+IFS=$ac_save_IFS
-+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-
-
--echo "$as_me:$LINENO: checking host system type" >&5
--echo $ECHO_N "checking host system type... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking host system type" >&5
-+echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
- if test "${ac_cv_host+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_cv_host_alias=$host_alias
--test -z "$ac_cv_host_alias" &&
-- ac_cv_host_alias=$ac_cv_build_alias
--ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
--echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-+ if test "x$host_alias" = x; then
-+ ac_cv_host=$ac_cv_build
-+else
-+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
- { (exit 1); exit 1; }; }
-+fi
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv_host" >&5
--echo "${ECHO_T}$ac_cv_host" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-+echo "${ECHO_T}$ac_cv_host" >&6; }
-+case $ac_cv_host in
-+*-*-*) ;;
-+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-+echo "$as_me: error: invalid value of canonical host" >&2;}
-+ { (exit 1); exit 1; }; };;
-+esac
- host=$ac_cv_host
--host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
--host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
--host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-+ac_save_IFS=$IFS; IFS='-'
-+set x $ac_cv_host
-+shift
-+host_cpu=$1
-+host_vendor=$2
-+shift; shift
-+# Remember, the first character of IFS is used to create $*,
-+# except with old shells:
-+host_os=$*
-+IFS=$ac_save_IFS
-+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+@@ -1424,6 +1425,14 @@
+WARNERROR=-W
-+# Check whether --enable-warnings-are-errors was given.
++# 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
++ enableval="$enable_warnings_are_errors"
++ if test "$enableval" != "no" ; then WARNERROR=-Werror ; fi
++fi;
++
+
--# Check whether --with-extraident or --without-extraident was given.
--if test "${with_extraident+set}" = set; then
-- withval="$with_extraident"
-
-+
-+# Check whether --with-extraident was given.
-+if test "${with_extraident+set}" = set; then
-+ withval=$with_extraident;
- cat >>confdefs.h <<_ACEOF
- #define EXTRA_IDENT "$withval"
- _ACEOF
-
--fi;
-+fi
-+
-
- # Extract the first word of "makedepend", so it can be a program name with args.
- set dummy makedepend; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_MAKEDEPEND+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -1451,50 +1948,52 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_MAKEDEPEND="makedepend"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- test -z "$ac_cv_prog_MAKEDEPEND" && ac_cv_prog_MAKEDEPEND="`cd ${srcdir};pwd`/tools/not-mkdep"
- fi
- fi
- MAKEDEPEND=$ac_cv_prog_MAKEDEPEND
- if test -n "$MAKEDEPEND"; then
-- echo "$as_me:$LINENO: result: $MAKEDEPEND" >&5
--echo "${ECHO_T}$MAKEDEPEND" >&6
-+ { echo "$as_me:$LINENO: result: $MAKEDEPEND" >&5
-+echo "${ECHO_T}$MAKEDEPEND" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- if test "$MAKEDEPEND" != "makedepend"; then
- { echo "$as_me:$LINENO: WARNING: Makedepend is not installed on this system. You should compile and install the version from the makedepend subdirectory." >&5
- echo "$as_me: WARNING: Makedepend is not installed on this system. You should compile and install the version from the makedepend subdirectory." >&2;}
- fi
-
-
--# Check whether --with-login or --without-login was given.
-+# Check whether --with-login was given.
- if test "${with_login+set}" = set; then
-- withval="$with_login"
-- { { echo "$as_me:$LINENO: error: --with-login is no longer supported.
-+ withval=$with_login; { { echo "$as_me:$LINENO: error: --with-login is no longer supported.
- Configure SASL appropriately instead." >&5
- echo "$as_me: error: --with-login is no longer supported.
- Configure SASL appropriately instead." >&2;}
- { (exit 1); exit 1; }; }
--fi;
-+fi
-
-
--# Check whether --with-cyrus-prefix or --without-cyrus-prefix was given.
-+
-+# Check whether --with-cyrus-prefix was given.
- if test "${with_cyrus_prefix+set}" = set; then
-- withval="$with_cyrus_prefix"
-- cyrus_prefix="$withval"
-+ withval=$with_cyrus_prefix; cyrus_prefix="$withval"
- else
- cyrus_prefix="/usr/cyrus"
--fi;
-+fi
-+
-
-
- cat >>confdefs.h <<_ACEOF
-@@ -1502,13 +2001,13 @@
- _ACEOF
-
-
--# Check whether --with-service-path or --without-service-path was given.
-+# Check whether --with-service-path was given.
- if test "${with_service_path+set}" = set; then
-- withval="$with_service_path"
-- service_path="$withval"
-+ withval=$with_service_path; service_path="$withval"
- else
- service_path="$cyrus_prefix/bin"
--fi;
-+fi
-+
-
-
- cat >>confdefs.h <<_ACEOF
-@@ -1516,13 +2015,13 @@
- _ACEOF
-
-
--# Check whether --with-cyrus-user or --without-cyrus-user was given.
-+# Check whether --with-cyrus-user was given.
- if test "${with_cyrus_user+set}" = set; then
-- withval="$with_cyrus_user"
-- cyrus_user="$withval"
-+ withval=$with_cyrus_user; cyrus_user="$withval"
- else
- cyrus_user="cyrus"
--fi;
-+fi
-+
-
-
- cat >>confdefs.h <<_ACEOF
-@@ -1530,13 +2029,13 @@
- _ACEOF
-
-
--# Check whether --with-cyrus-group or --without-cyrus-group was given.
-+# Check whether --with-cyrus-group was given.
- if test "${with_cyrus_group+set}" = set; then
-- withval="$with_cyrus_group"
-- cyrus_group="$withval"
-+ withval=$with_cyrus_group; cyrus_group="$withval"
- else
- cyrus_group="mail"
--fi;
-+fi
-+
-
-
- if test $sysconfdir = '${prefix}/etc'; then
-@@ -1556,8 +2055,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}gcc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -1570,32 +2069,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}gcc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- fi
- if test -z "$ac_cv_prog_CC"; then
- ac_ct_CC=$CC
- # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -1608,36 +2109,51 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="gcc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
-- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- CC=$ac_ct_CC
-+ if test "x$ac_ct_CC" = x; then
-+ CC=""
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ CC=$ac_ct_CC
-+ fi
- else
- CC="$ac_cv_prog_CC"
- fi
-
- if test -z "$CC"; then
-- if test -n "$ac_tool_prefix"; then
-- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-+ if test -n "$ac_tool_prefix"; then
-+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}cc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -1650,74 +2166,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
--else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
--
--fi
--if test -z "$ac_cv_prog_CC"; then
-- ac_ct_CC=$CC
-- # Extract the first word of "cc", so it can be a program name with args.
--set dummy cc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- if test -n "$ac_ct_CC"; then
-- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-- ac_cv_prog_ac_ct_CC="cc"
-- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
--done
--
--fi
--fi
--ac_ct_CC=$ac_cv_prog_ac_ct_CC
--if test -n "$ac_ct_CC"; then
-- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- CC=$ac_ct_CC
--else
-- CC="$ac_cv_prog_CC"
--fi
-
-+ fi
- fi
- if test -z "$CC"; then
- # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -1731,7 +2207,7 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
- ac_prog_rejected=yes
- continue
-@@ -1742,6 +2218,7 @@
- fi
- done
- done
-+IFS=$as_save_IFS
-
- if test $ac_prog_rejected = yes; then
- # We found a bogon in the path, so make sure we never use it.
-@@ -1759,22 +2236,23 @@
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- fi
- if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
-- for ac_prog in cl
-+ for ac_prog in cl.exe
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
- set dummy $ac_tool_prefix$ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -1787,36 +2265,38 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
-- echo "$as_me:$LINENO: result: $CC" >&5
--echo "${ECHO_T}$CC" >&6
-+ { echo "$as_me:$LINENO: result: $CC" >&5
-+echo "${ECHO_T}$CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- test -n "$CC" && break
- done
- fi
- if test -z "$CC"; then
- ac_ct_CC=$CC
-- for ac_prog in cl
-+ for ac_prog in cl.exe
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -1829,29 +2309,45 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
-- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
--echo "${ECHO_T}$ac_ct_CC" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+echo "${ECHO_T}$ac_ct_CC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- test -n "$ac_ct_CC" && break
- done
-
-- CC=$ac_ct_CC
-+ if test "x$ac_ct_CC" = x; then
-+ CC=""
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ CC=$ac_ct_CC
-+ fi
- fi
-
- fi
-@@ -1864,21 +2360,35 @@
- { (exit 1); exit 1; }; }
-
- # Provide some information about the compiler.
--echo "$as_me:$LINENO:" \
-- "checking for C compiler version" >&5
-+echo "$as_me:$LINENO: checking for C compiler version" >&5
- ac_compiler=`set X $ac_compile; echo $2`
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-- (eval $ac_compiler --version </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler --version >&5"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compiler --version >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-- (eval $ac_compiler -v </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler -v >&5"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compiler -v >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-- (eval $ac_compiler -V </dev/null >&5) 2>&5
-+{ (ac_try="$ac_compiler -V >&5"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compiler -V >&5") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-@@ -1903,47 +2413,77 @@
- # Try to create an executable without -o first, disregard a.out.
- # It will help us diagnose broken compilers, and finding out an intuition
- # of exeext.
--echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
--echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
-+{ 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
-+#
-+# List of possible output files, starting from the most likely.
-+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-+# only as a last resort. b.out is created by i960 compilers.
-+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-+#
-+# The IRIX 6 linker writes into existing files which may not be
-+# executable, retaining their permissions. Remove them first so a
-+# subsequent execution test works.
-+ac_rmfiles=
-+for ac_file in $ac_files
-+do
-+ case $ac_file in
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
-+ * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-+ esac
-+done
-+rm -f $ac_rmfiles
-+
-+if { (ac_try="$ac_link_default"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link_default") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- # Find the output, starting from the most likely. This scheme is
--# not robust to junk in `.', hence go to wildcards (a.*) only as a last
--# resort.
--
--# Be careful to initialize this variable, since it used to be cached.
--# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
--ac_cv_exeext=
--# b.out is created by i960 compilers.
--for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
-+ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-+# in a Makefile. We should not override ac_cv_exeext if it was cached,
-+# so that the user can short-circuit this test for compilers unknown to
-+# Autoconf.
-+for ac_file in $ac_files ''
- do
- test -f "$ac_file" || continue
- case $ac_file in
-- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
-- ;;
-- conftest.$ac_ext )
-- # This is the source file.
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
- ;;
- [ab].out )
- # We found the default executable, but exeext='' is most
- # certainly right.
- break;;
- *.* )
-- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-- # FIXME: I believe we export ac_cv_exeext for Libtool,
-- # but it would be cool to find out if it's true. Does anybody
-- # maintain Libtool? --akim.
-- export ac_cv_exeext
-+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-+ then :; else
-+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-+ fi
-+ # We set ac_cv_exeext here because the later test for it is not
-+ # safe: cross compilers may not add the suffix if given an `-o'
-+ # argument, so we may need to know it at that point already.
-+ # Even if this section looks crufty: it has the advantage of
-+ # actually working.
- break;;
- * )
- break;;
- esac
- done
-+test "$ac_cv_exeext" = no && ac_cv_exeext=
-+
- else
-+ ac_file=''
-+fi
-+
-+{ echo "$as_me:$LINENO: result: $ac_file" >&5
-+echo "${ECHO_T}$ac_file" >&6; }
-+if test -z "$ac_file"; then
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-@@ -1955,19 +2495,21 @@
- fi
-
- ac_exeext=$ac_cv_exeext
--echo "$as_me:$LINENO: result: $ac_file" >&5
--echo "${ECHO_T}$ac_file" >&6
-
--# Check the compiler produces executables we can run. If not, either
-+# Check that the compiler produces executables we can run. If not, either
- # the compiler is broken, or we cross compile.
--echo "$as_me:$LINENO: checking whether the C compiler works" >&5
--echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
- # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
- # If not cross compiling, check that we can run a simple program.
- if test "$cross_compiling" != yes; then
- if { ac_try='./$ac_file'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -1986,22 +2528,27 @@
- fi
- fi
- fi
--echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+{ echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-
- rm -f a.out a.exe conftest$ac_cv_exeext b.out
- ac_clean_files=$ac_clean_files_save
--# Check the compiler produces executables we can run. If not, either
-+# Check that the compiler produces executables we can run. If not, either
- # the compiler is broken, or we cross compile.
--echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
--echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
--echo "$as_me:$LINENO: result: $cross_compiling" >&5
--echo "${ECHO_T}$cross_compiling" >&6
-+{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-+echo "${ECHO_T}$cross_compiling" >&6; }
-
--echo "$as_me:$LINENO: checking for suffix of executables" >&5
--echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-@@ -2012,9 +2559,8 @@
- for ac_file in conftest.exe conftest conftest.*; do
- test -f "$ac_file" || continue
- case $ac_file in
-- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
- *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-- export ac_cv_exeext
- break;;
- * ) break;;
- esac
-@@ -2028,14 +2574,14 @@
- fi
-
- rm -f conftest$ac_cv_exeext
--echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
--echo "${ECHO_T}$ac_cv_exeext" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-+echo "${ECHO_T}$ac_cv_exeext" >&6; }
-
- rm -f conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
--echo "$as_me:$LINENO: checking for suffix of object files" >&5
--echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
- if test "${ac_cv_objext+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2055,14 +2601,20 @@
- }
- _ACEOF
- rm -f conftest.o conftest.obj
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>&5
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
-+ for ac_file in conftest.o conftest.obj conftest.*; do
-+ test -f "$ac_file" || continue;
- case $ac_file in
-- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
-+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
- *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
- break;;
- esac
-@@ -2080,12 +2632,12 @@
-
- rm -f conftest.$ac_cv_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
--echo "${ECHO_T}$ac_cv_objext" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-+echo "${ECHO_T}$ac_cv_objext" >&6; }
- OBJEXT=$ac_cv_objext
- ac_objext=$OBJEXT
--echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
--echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
- if test "${ac_cv_c_compiler_gnu+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2108,24 +2660,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -2134,24 +2698,28 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_compiler_gnu=no
-+ ac_compiler_gnu=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
--echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
- GCC=`test $ac_compiler_gnu = yes && echo yes`
- ac_test_CFLAGS=${CFLAGS+set}
- ac_save_CFLAGS=$CFLAGS
--CFLAGS="-g"
--echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
--echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
- if test "${ac_cv_prog_cc_g+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- cat >conftest.$ac_ext <<_ACEOF
-+ ac_save_c_werror_flag=$ac_c_werror_flag
-+ ac_c_werror_flag=yes
-+ ac_cv_prog_cc_g=no
-+ CFLAGS="-g"
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -2167,24 +2735,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -2193,12 +2773,131 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_prog_cc_g=no
-+ CFLAGS=""
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ :
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_c_werror_flag=$ac_save_c_werror_flag
-+ CFLAGS="-g"
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+int
-+main ()
-+{
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_prog_cc_g=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ ac_c_werror_flag=$ac_save_c_werror_flag
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
- if test "$ac_test_CFLAGS" = set; then
- CFLAGS=$ac_save_CFLAGS
- elif test $ac_cv_prog_cc_g = yes; then
-@@ -2214,12 +2913,12 @@
- CFLAGS=
- fi
- fi
--echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
--echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
--if test "${ac_cv_prog_cc_stdc+set}" = set; then
-+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_cc_c89+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_cv_prog_cc_stdc=no
-+ ac_cv_prog_cc_c89=no
- ac_save_CC=$CC
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -2253,12 +2952,17 @@
- /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
- function prototypes and stuff, but not '\xHH' hex character constants.
- These don't provoke an error unfortunately, instead are silently treated
-- as 'x'. The following induces an error, until -std1 is added to get
-+ as 'x'. The following induces an error, until -std is added to get
- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
- array size at least. It's necessary to write '\x00'==0 to get something
-- that's true only with -std1. */
-+ that's true only with -std. */
- int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-+ inside strings and character constants. */
-+#define FOO(x) 'x'
-+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-+
- int test (int i, double x);
- struct s1 {int (*f) (int a);};
- struct s2 {int (*f) (double a);};
-@@ -2273,205 +2977,74 @@
- return 0;
- }
- _ACEOF
--# Don't try gcc -ansi; that turns off useful extensions and
--# breaks some systems' header files.
--# AIX -qlanglvl=ansi
--# Ultrix and OSF/1 -std1
--# HP-UX 10.20 and later -Ae
--# HP-UX older versions -Aa -D_HPUX_SOURCE
--# SVR4 -Xc -D__EXTENSIONS__
--for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
- do
- CC="$ac_save_CC $ac_arg"
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- ac_cv_prog_cc_stdc=$ac_arg
--break
-+ ac_cv_prog_cc_c89=$ac_arg
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext
-+
-+rm -f core conftest.err conftest.$ac_objext
-+ test "x$ac_cv_prog_cc_c89" != "xno" && break
- done
--rm -f conftest.$ac_ext conftest.$ac_objext
-+rm -f conftest.$ac_ext
- CC=$ac_save_CC
-
- fi
--
--case "x$ac_cv_prog_cc_stdc" in
-- x|xno)
-- echo "$as_me:$LINENO: result: none needed" >&5
--echo "${ECHO_T}none needed" >&6 ;;
-+# AC_CACHE_VAL
-+case "x$ac_cv_prog_cc_c89" in
-+ x)
-+ { echo "$as_me:$LINENO: result: none needed" >&5
-+echo "${ECHO_T}none needed" >&6; } ;;
-+ xno)
-+ { echo "$as_me:$LINENO: result: unsupported" >&5
-+echo "${ECHO_T}unsupported" >&6; } ;;
- *)
-- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
--echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-- CC="$CC $ac_cv_prog_cc_stdc" ;;
-+ CC="$CC $ac_cv_prog_cc_c89"
-+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
- esac
-
--# Some people use a C++ compiler to compile C. Since we use `exit',
--# in C++ we need to declare it. In case someone uses the same compiler
--# for both compiling C and C++ we need to have the C++ compiler decide
--# the declaration of exit, since it's the most demanding environment.
--cat >conftest.$ac_ext <<_ACEOF
--#ifndef __cplusplus
-- choke me
--#endif
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- for ac_declaration in \
-- '' \
-- 'extern "C" void std::exit (int) throw (); using std::exit;' \
-- 'extern "C" void std::exit (int); using std::exit;' \
-- 'extern "C" void exit (int) throw ();' \
-- 'extern "C" void exit (int);' \
-- 'void exit (int);'
--do
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_declaration
--#include <stdlib.h>
--int
--main ()
--{
--exit (42);
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- :
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--continue
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_declaration
--int
--main ()
--{
--exit (42);
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- break
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--done
--rm -f conftest*
--if test -n "$ac_declaration"; then
-- echo '#ifdef __cplusplus' >>confdefs.h
-- echo $ac_declaration >>confdefs.h
-- echo '#endif' >>confdefs.h
--fi
--
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -2481,8 +3054,8 @@
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ranlib; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2495,32 +3068,34 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- RANLIB=$ac_cv_prog_RANLIB
- if test -n "$RANLIB"; then
-- echo "$as_me:$LINENO: result: $RANLIB" >&5
--echo "${ECHO_T}$RANLIB" >&6
-+ { echo "$as_me:$LINENO: result: $RANLIB" >&5
-+echo "${ECHO_T}$RANLIB" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- fi
- if test -z "$ac_cv_prog_RANLIB"; then
- ac_ct_RANLIB=$RANLIB
- # Extract the first word of "ranlib", so it can be a program name with args.
- set dummy ranlib; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2533,57 +3108,72 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_RANLIB="ranlib"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
-- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
- fi
- fi
- ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
- if test -n "$ac_ct_RANLIB"; then
-- echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
--echo "${ECHO_T}$ac_ct_RANLIB" >&6
-+ { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-+echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-- RANLIB=$ac_ct_RANLIB
-+ if test "x$ac_ct_RANLIB" = x; then
-+ RANLIB=":"
-+ else
-+ case $cross_compiling:$ac_tool_warned in
-+yes:)
-+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&5
-+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-+whose name does not start with the host triplet. If you think this
-+configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-+ac_tool_warned=yes ;;
-+esac
-+ RANLIB=$ac_ct_RANLIB
-+ fi
- else
- RANLIB="$ac_cv_prog_RANLIB"
- fi
-
--echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
--echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
--set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
--if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.make <<\_ACEOF
-+SHELL = /bin/sh
- all:
-- @echo 'ac_maketemp="$(MAKE)"'
-+ @echo '@@@%%%=$(MAKE)=@@@%%%'
- _ACEOF
- # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
--eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
--if test -n "$ac_maketemp"; then
-- eval ac_cv_prog_make_${ac_make}_set=yes
--else
-- eval ac_cv_prog_make_${ac_make}_set=no
--fi
-+case `${MAKE-make} -f conftest.make 2>/dev/null` in
-+ *@@@%%%=?*=@@@%%%*)
-+ eval ac_cv_prog_make_${ac_make}_set=yes;;
-+ *)
-+ eval ac_cv_prog_make_${ac_make}_set=no;;
-+esac
- rm -f conftest.make
- fi
--if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- SET_MAKE=
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- SET_MAKE="MAKE=${MAKE-make}"
- fi
-
-@@ -2600,8 +3190,8 @@
- # 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
-+{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
- if test -z "$INSTALL"; then
- if test "${ac_cv_path_install+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2623,7 +3213,7 @@
- # by default.
- for ac_prog in ginstall scoinst install; do
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_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.
-@@ -2642,21 +3232,22 @@
- ;;
- esac
- done
-+IFS=$as_save_IFS
-
-
- fi
- if test "${ac_cv_path_install+set}" = set; then
- INSTALL=$ac_cv_path_install
- else
-- # As a last resort, use the slow shell script. We don't cache a
-- # path for INSTALL within a source directory, because that will
-+ # As a last resort, use the slow shell script. Don't cache a
-+ # value for INSTALL within a source directory, because that will
- # break other packages using the cache if that directory is
-- # removed, or if the path is relative.
-+ # removed, or if the value is a relative name.
- INSTALL=$ac_install_sh
- fi
- fi
--echo "$as_me:$LINENO: result: $INSTALL" >&5
--echo "${ECHO_T}$INSTALL" >&6
-+{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-+echo "${ECHO_T}$INSTALL" >&6; }
-
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
- # It thinks the first close brace ends the variable substitution.
-@@ -2672,8 +3263,8 @@
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
--echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
--echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
- CPP=
-@@ -2707,8 +3298,13 @@
- #endif
- Syntax error
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
-@@ -2733,9 +3329,10 @@
- # Broken: fails on valid input.
- continue
- fi
-+
- rm -f conftest.err conftest.$ac_ext
-
-- # OK, works on sane cases. Now check whether non-existent headers
-+ # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -2745,8 +3342,13 @@
- /* end confdefs.h. */
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
-@@ -2773,6 +3375,7 @@
- ac_preproc_ok=:
- break
- fi
-+
- rm -f conftest.err conftest.$ac_ext
-
- done
-@@ -2790,8 +3393,8 @@
- else
- ac_cv_prog_CPP=$CPP
- fi
--echo "$as_me:$LINENO: result: $CPP" >&5
--echo "${ECHO_T}$CPP" >&6
-+{ echo "$as_me:$LINENO: result: $CPP" >&5
-+echo "${ECHO_T}$CPP" >&6; }
- ac_preproc_ok=false
- for ac_c_preproc_warn_flag in '' yes
- do
-@@ -2814,8 +3417,13 @@
- #endif
- Syntax error
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
-@@ -2840,9 +3448,10 @@
- # Broken: fails on valid input.
- continue
- fi
-+
- rm -f conftest.err conftest.$ac_ext
-
-- # OK, works on sane cases. Now check whether non-existent headers
-+ # OK, works on sane cases. Now check whether nonexistent headers
- # can be detected and how.
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -2852,8 +3461,13 @@
- /* end confdefs.h. */
- #include <ac_nonexistent.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
-@@ -2880,6 +3494,7 @@
- ac_preproc_ok=:
- break
- fi
-+
- rm -f conftest.err conftest.$ac_ext
-
- done
-@@ -2902,24 +3517,171 @@
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
--echo "$as_me:$LINENO: checking for egrep" >&5
--echo $ECHO_N "checking for egrep... $ECHO_C" >&6
--if test "${ac_cv_prog_egrep+set}" = set; then
-+{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-+echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-+if test "${ac_cv_path_GREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-- then ac_cv_prog_egrep='grep -E'
-- else ac_cv_prog_egrep='egrep'
-+ # Extract the first word of "grep ggrep" to use in msg output
-+if test -z "$GREP"; then
-+set dummy grep ggrep; ac_prog_name=$2
-+if test "${ac_cv_path_GREP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_path_GREP_found=false
-+# Loop through the user's path and test for each of PROGNAME-LIST
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_prog in grep ggrep; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-+ { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue
-+ # Check for GNU ac_path_GREP and select it if it is found.
-+ # Check for GNU $ac_path_GREP
-+case `"$ac_path_GREP" --version 2>&1` in
-+*GNU*)
-+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-+*)
-+ ac_count=0
-+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-+ while :
-+ do
-+ cat "conftest.in" "conftest.in" >"conftest.tmp"
-+ mv "conftest.tmp" "conftest.in"
-+ cp "conftest.in" "conftest.nl"
-+ echo 'GREP' >> "conftest.nl"
-+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-+ ac_count=`expr $ac_count + 1`
-+ if test $ac_count -gt ${ac_path_GREP_max-0}; then
-+ # Best one so far, save it but keep looking for a better one
-+ ac_cv_path_GREP="$ac_path_GREP"
-+ ac_path_GREP_max=$ac_count
- fi
-+ # 10*(2^10) chars as input seems more than enough
-+ test $ac_count -gt 10 && break
-+ done
-+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-+esac
-+
-+
-+ $ac_path_GREP_found && break 3
-+ done
-+done
-+
-+done
-+IFS=$as_save_IFS
-+
-+
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
--echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-- EGREP=$ac_cv_prog_egrep
-
-+GREP="$ac_cv_path_GREP"
-+if test -z "$GREP"; then
-+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-
-+else
-+ ac_cv_path_GREP=$GREP
-+fi
-
--echo "$as_me:$LINENO: checking for AIX" >&5
--echo $ECHO_N "checking for AIX... $ECHO_C" >&6
-+
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
-+ GREP="$ac_cv_path_GREP"
-+
-+
-+{ echo "$as_me:$LINENO: checking for egrep" >&5
-+echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
-+if test "${ac_cv_path_EGREP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-+ then ac_cv_path_EGREP="$GREP -E"
-+ else
-+ # Extract the first word of "egrep" to use in msg output
-+if test -z "$EGREP"; then
-+set dummy egrep; ac_prog_name=$2
-+if test "${ac_cv_path_EGREP+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_path_EGREP_found=false
-+# Loop through the user's path and test for each of PROGNAME-LIST
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_prog in egrep; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-+ { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue
-+ # Check for GNU ac_path_EGREP and select it if it is found.
-+ # Check for GNU $ac_path_EGREP
-+case `"$ac_path_EGREP" --version 2>&1` in
-+*GNU*)
-+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-+*)
-+ ac_count=0
-+ echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
-+ while :
-+ do
-+ cat "conftest.in" "conftest.in" >"conftest.tmp"
-+ mv "conftest.tmp" "conftest.in"
-+ cp "conftest.in" "conftest.nl"
-+ echo 'EGREP' >> "conftest.nl"
-+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
-+ ac_count=`expr $ac_count + 1`
-+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-+ # Best one so far, save it but keep looking for a better one
-+ ac_cv_path_EGREP="$ac_path_EGREP"
-+ ac_path_EGREP_max=$ac_count
-+ fi
-+ # 10*(2^10) chars as input seems more than enough
-+ test $ac_count -gt 10 && break
-+ done
-+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-+esac
-+
-+
-+ $ac_path_EGREP_found && break 3
-+ done
-+done
-+
-+done
-+IFS=$as_save_IFS
-+
-+
-+fi
-+
-+EGREP="$ac_cv_path_EGREP"
-+if test -z "$EGREP"; then
-+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
-+ { (exit 1); exit 1; }; }
-+fi
-+
-+else
-+ ac_cv_path_EGREP=$EGREP
-+fi
-+
-+
-+ fi
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-+echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
-+ EGREP="$ac_cv_path_EGREP"
-+
-+
-+
-+{ echo "$as_me:$LINENO: checking for AIX" >&5
-+echo $ECHO_N "checking for AIX... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -2933,26 +3695,25 @@
- _ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "yes" >/dev/null 2>&1; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- cat >>confdefs.h <<\_ACEOF
- #define _ALL_SOURCE 1
- _ACEOF
-
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- rm -f conftest*
-
-
--echo "$as_me:$LINENO: checking for library containing strerror" >&5
--echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6
-+{ 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_func_search_save_LIBS=$LIBS
--ac_cv_search_strerror=no
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -2960,115 +3721,89 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char strerror ();
- int
- main ()
- {
--strerror ();
-+return 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
-+for ac_lib in '' cposix; do
-+ if test -z "$ac_lib"; then
-+ ac_res="none required"
-+ else
-+ ac_res=-l$ac_lib
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ fi
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- ac_cv_search_strerror="none required"
-+ ac_cv_search_strerror=$ac_res
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--if test "$ac_cv_search_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
-
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext
-+ if test "${ac_cv_search_strerror+set}" = set; then
-+ break
- fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
-- done
-+done
-+if test "${ac_cv_search_strerror+set}" = set; then
-+ :
-+else
-+ ac_cv_search_strerror=no
- fi
-+rm conftest.$ac_ext
- LIBS=$ac_func_search_save_LIBS
- fi
--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"
-+{ echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5
-+echo "${ECHO_T}$ac_cv_search_strerror" >&6; }
-+ac_res=$ac_cv_search_strerror
-+if test "$ac_res" != no; then
-+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
- fi
-
-@@ -3076,8 +3811,8 @@
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_AWK+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3090,30 +3825,32 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_AWK="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- AWK=$ac_cv_prog_AWK
- if test -n "$AWK"; then
-- echo "$as_me:$LINENO: result: $AWK" >&5
--echo "${ECHO_T}$AWK" >&6
-+ { echo "$as_me:$LINENO: result: $AWK" >&5
-+echo "${ECHO_T}$AWK" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- test -n "$AWK" && break
- done
-
--echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
--echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-+echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
- if test "${ac_cv_c_const+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3131,10 +3868,10 @@
- #ifndef __cplusplus
- /* Ultrix mips cc rejects this. */
- typedef int charset[2];
-- const charset x;
-+ const charset cs;
- /* SunOS 4.1.1 cc rejects this. */
-- char const *const *ccp;
-- char **p;
-+ char const *const *pcpcc;
-+ char **ppc;
- /* NEC SVR4.0.2 mips cc rejects this. */
- struct point {int x, y;};
- static struct point const zero = {0,0};
-@@ -3143,16 +3880,17 @@
- an arm of an if-expression whose if-part is not a constant
- expression */
- const char *g = "string";
-- ccp = &g + (g ? g-g : 0);
-+ pcpcc = &g + (g ? g-g : 0);
- /* HPUX 7.0 cc rejects these. */
-- ++ccp;
-- p = (char**) ccp;
-- ccp = (char const *const *) p;
-+ ++pcpcc;
-+ ppc = (char**) pcpcc;
-+ pcpcc = (char const *const *) ppc;
- { /* SCO 3.2v4 cc rejects this. */
- char *t;
- char const *s = 0 ? (char *) 0 : (char const *) 0;
-
- *t++ = 0;
-+ if (s) return 0;
- }
- { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
- int x[] = {25, 17};
-@@ -3171,7 +3909,9 @@
- }
- { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
- const int foo = 10;
-+ if (!foo) return 0;
- }
-+ return !cs[0] && !zero.x;
- #endif
-
- ;
-@@ -3179,24 +3919,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -3205,12 +3957,13 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_c_const=no
-+ ac_cv_c_const=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
--echo "${ECHO_T}$ac_cv_c_const" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-+echo "${ECHO_T}$ac_cv_c_const" >&6; }
- if test $ac_cv_c_const = no; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -3219,62 +3972,8 @@
+ # Check whether --with-extraident or --without-extraident was given.
+ if test "${with_extraident+set}" = set; then
+@@ -2116,8 +2125,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2175,8 +2183,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2292,8 +2299,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2347,8 +2353,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2393,8 +2398,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2438,8 +2442,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -2984,8 +2987,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3039,8 +3041,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3187,8 +3188,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3219,60 +3219,6 @@
fi
@@ -7179,2545 +3333,309 @@
-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
-+{ echo "$as_me:$LINENO: checking for inline" >&5
-+echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
+ echo "$as_me:$LINENO: checking for inline" >&5
+ echo $ECHO_N "checking for inline... $ECHO_C" >&6
if test "${ac_cv_c_inline+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3294,39 +3993,54 @@
-
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- ac_cv_c_inline=$ac_kw; break
-+ ac_cv_c_inline=$ac_kw
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ test "$ac_cv_c_inline" != no && break
- done
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
--echo "${ECHO_T}$ac_cv_c_inline" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-+echo "${ECHO_T}$ac_cv_c_inline" >&6; }
-
-
- case $ac_cv_c_inline in
-@@ -3345,8 +4059,8 @@
- esac
-
-
--echo "$as_me:$LINENO: checking for ANSI C header files" >&5
--echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&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
-@@ -3370,24 +4084,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -3396,9 +4122,10 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_header_stdc=no
-+ ac_cv_header_stdc=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
- if test $ac_cv_header_stdc = yes; then
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -3454,6 +4181,7 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <ctype.h>
-+#include <stdlib.h>
- #if ((' ' & 0x0FF) == 0x020)
- # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
- # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -3473,18 +4201,27 @@
- for (i = 0; i < 256; i++)
- if (XOR (islower (i), ISLOWER (i))
- || toupper (i) != TOUPPER (i))
-- exit(2);
-- exit (0);
-+ return 2;
-+ return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -3497,12 +4234,14 @@
- ( 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
-+rm -f core *.core core.conftest.* 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
-+{ 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
-@@ -3525,9 +4264,9 @@
- 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 "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -3541,24 +4280,36 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -3567,12 +4318,14 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "$as_ac_Header=no"
-+ eval "$as_ac_Header=no"
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -3583,8 +4336,8 @@
- done
-
-
--echo "$as_me:$LINENO: checking for long" >&5
--echo $ECHO_N "checking for long... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for long" >&5
-+echo $ECHO_N "checking for long... $ECHO_C" >&6; }
- if test "${ac_cv_type_long+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -3595,36 +4348,49 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef long ac__type_new_;
- int
- main ()
- {
--if ((long *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (long))
-+if (sizeof (ac__type_new_))
- 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
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -3633,23 +4399,23 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_type_long=no
-+ ac_cv_type_long=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
--echo "${ECHO_T}$ac_cv_type_long" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-+echo "${ECHO_T}$ac_cv_type_long" >&6; }
-
--echo "$as_me:$LINENO: checking size of long" >&5
--echo $ECHO_N "checking size of long... $ECHO_C" >&6
-+# The cast to long int works around a bug in the HP C Compiler
-+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+# This bug is HP SR number 8606223364.
-+{ echo "$as_me:$LINENO: checking size of long" >&5
-+echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
- if test "${ac_cv_sizeof_long+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- if test "$ac_cv_type_long" = yes; then
-- # The cast to unsigned long works around a bug in the HP C Compiler
-- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-- # This bug is HP SR number 8606223364.
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
-@@ -3659,10 +4425,12 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef long ac__type_sizeof_;
-+
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
- test_array [0] = 0
-
- ;
-@@ -3670,24 +4438,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -3700,10 +4480,12 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef long ac__type_sizeof_;
-+
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -3711,24 +4493,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -3737,30 +4531,33 @@
- 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`
-+ 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
-+
-+rm -f core 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
-+ 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
-+ typedef long ac__type_sizeof_;
-+
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
- test_array [0] = 0
-
- ;
-@@ -3768,24 +4565,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -3798,10 +4607,12 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef long ac__type_sizeof_;
-+
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -3809,24 +4620,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -3835,24 +4658,27 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_hi=`expr '(' $ac_mid ')' - 1`
-- if test $ac_mid -le $ac_hi; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid`
-+ ac_hi=`expr '(' $ac_mid ')' - 1`
-+ if test $ac_mid -le $ac_hi; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core 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=
-+ ac_lo= ac_hi=
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- # 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`
-@@ -3863,10 +4689,12 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef long ac__type_sizeof_;
-+
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -3874,24 +4702,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -3900,26 +4740,24 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_lo=`expr '(' $ac_mid ')' + 1`
-+ ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof_long=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-+'') if test "$ac_cv_type_long" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (long), 77
-+echo "$as_me: error: cannot compute sizeof (long)
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; } ;;
-+ { (exit 77); exit 77; }; }
-+ else
-+ ac_cv_sizeof_long=0
-+ fi ;;
+@@ -3302,8 +3248,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3378,8 +3323,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3549,8 +3493,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3615,8 +3558,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3678,8 +3620,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3719,8 +3660,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3776,8 +3716,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3817,8 +3756,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3882,8 +3820,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -3914,10 +3851,8 @@
esac
else
-- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
--else
++ { { 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
-@@ -3927,8 +4765,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--long longval () { return (long) (sizeof (long)); }
--unsigned long ulongval () { return (long) (sizeof (long)); }
-+ typedef long ac__type_sizeof_;
-+
-+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
- #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -3937,35 +4777,44 @@
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
-- exit (1);
-- if (((long) (sizeof (long))) < 0)
-+ return 1;
-+ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
- {
-- long i = longval ();
-- if (i != ((long) (sizeof (long))))
-- exit (1);
-+ long int i = longval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%ld\n", i);
- }
- else
- {
-- unsigned long i = ulongval ();
-- if (i != ((long) (sizeof (long))))
-- exit (1);
-+ unsigned long int i = ulongval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%lu\n", i);
- }
-- exit (ferror (f) || fclose (f) != 0);
-+ return 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
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -3976,30 +4825,33 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-+if test "$ac_cv_type_long" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (long), 77
-+echo "$as_me: error: cannot compute sizeof (long)
- 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
-+ { (exit 77); exit 77; }; }
-+ else
-+ ac_cv_sizeof_long=0
-+ fi
- fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
--else
-- ac_cv_sizeof_long=0
--fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
--echo "${ECHO_T}$ac_cv_sizeof_long" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
-+
-+
-+
- cat >>confdefs.h <<_ACEOF
- #define SIZEOF_LONG $ac_cv_sizeof_long
- _ACEOF
-
-
-
--echo "$as_me:$LINENO: checking for long long int" >&5
--echo $ECHO_N "checking for long long int... $ECHO_C" >&6
-+{ 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
-@@ -4010,36 +4862,49 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef long long int ac__type_new_;
- int
- main ()
- {
--if ((long long int *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (long long int))
-+if (sizeof (ac__type_new_))
- 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
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -4048,23 +4913,23 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_type_long_long_int=no
-+ ac_cv_type_long_long_int=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_long_long_int" >&5
--echo "${ECHO_T}$ac_cv_type_long_long_int" >&6
-+{ 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
-+# The cast to long int works around a bug in the HP C Compiler
-+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+# This bug is HP SR number 8606223364.
-+{ 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
-@@ -4074,10 +4939,12 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef long long int ac__type_sizeof_;
-+
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (long long int))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
- test_array [0] = 0
-
- ;
-@@ -4085,24 +4952,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -4115,10 +4994,12 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef long long int ac__type_sizeof_;
-+
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (long long int))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -4126,24 +5007,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -4152,30 +5045,33 @@
- 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`
-+ 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
-+
-+rm -f core 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
-+ 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
-+ typedef long long int ac__type_sizeof_;
-+
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (long long int))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
- test_array [0] = 0
-
- ;
-@@ -4183,24 +5079,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -4213,10 +5121,12 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef long long int ac__type_sizeof_;
-+
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (long long int))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -4224,24 +5134,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -4250,24 +5172,27 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_hi=`expr '(' $ac_mid ')' - 1`
-- if test $ac_mid -le $ac_hi; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid`
-+ ac_hi=`expr '(' $ac_mid ')' - 1`
-+ if test $ac_mid -le $ac_hi; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core 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=
-+ ac_lo= ac_hi=
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- # 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`
-@@ -4278,10 +5203,12 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef long long int ac__type_sizeof_;
-+
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (long long int))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -4289,24 +5216,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -4315,26 +5254,24 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_lo=`expr '(' $ac_mid ')' + 1`
-+ ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core 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
-+'') if test "$ac_cv_type_long_long_int" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long int)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (long long int), 77
-+echo "$as_me: error: cannot compute sizeof (long long int)
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; } ;;
-+ { (exit 77); exit 77; }; }
-+ else
-+ ac_cv_sizeof_long_long_int=0
-+ fi ;;
+@@ -4030,8 +3965,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4093,8 +4027,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4134,8 +4067,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4191,8 +4123,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4232,8 +4163,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4297,8 +4227,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4329,10 +4258,8 @@
esac
else
-- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
--else
++ { { 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
-@@ -4342,8 +5279,10 @@
- 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)); }
-+ typedef long long int ac__type_sizeof_;
-+
-+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
- #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -4352,35 +5291,44 @@
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
-- exit (1);
-- if (((long) (sizeof (long long int))) < 0)
-+ return 1;
-+ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
- {
-- long i = longval ();
-- if (i != ((long) (sizeof (long long int))))
-- exit (1);
-+ long int i = longval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%ld\n", i);
- }
- else
- {
-- unsigned long i = ulongval ();
-- if (i != ((long) (sizeof (long long int))))
-- exit (1);
-+ unsigned long int i = ulongval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%lu\n", i);
- }
-- exit (ferror (f) || fclose (f) != 0);
-+ return 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
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -4391,29 +5339,32 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long int), 77
-+if test "$ac_cv_type_long_long_int" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long int)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (long long int), 77
-+echo "$as_me: error: cannot compute sizeof (long long int)
- 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
-+ { (exit 77); exit 77; }; }
-+ else
-+ ac_cv_sizeof_long_long_int=0
-+ fi
- fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- 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
-+{ 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
-+{ 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
-@@ -4424,36 +5375,49 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef unsigned long long int ac__type_new_;
- int
- main ()
- {
--if ((unsigned long long int *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (unsigned long long int))
-+if (sizeof (ac__type_new_))
- 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
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -4462,23 +5426,23 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_type_unsigned_long_long_int=no
-+ ac_cv_type_unsigned_long_long_int=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long_long_int" >&5
--echo "${ECHO_T}$ac_cv_type_unsigned_long_long_int" >&6
-+{ 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
-+# The cast to long int works around a bug in the HP C Compiler
-+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+# This bug is HP SR number 8606223364.
-+{ 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
-@@ -4488,10 +5452,12 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef unsigned long long int ac__type_sizeof_;
-+
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (unsigned long long int))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
- test_array [0] = 0
-
- ;
-@@ -4499,24 +5465,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -4529,10 +5507,12 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef unsigned long long int ac__type_sizeof_;
-+
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (unsigned long long int))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -4540,24 +5520,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -4566,30 +5558,33 @@
- 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`
-+ 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
-+
-+rm -f core 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
-+ 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
-+ typedef unsigned long long int ac__type_sizeof_;
-+
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (unsigned long long int))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
- test_array [0] = 0
-
- ;
-@@ -4597,24 +5592,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -4627,10 +5634,12 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef unsigned long long int ac__type_sizeof_;
-+
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (unsigned long long int))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -4638,24 +5647,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -4664,24 +5685,27 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_hi=`expr '(' $ac_mid ')' - 1`
-- if test $ac_mid -le $ac_hi; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid`
-+ ac_hi=`expr '(' $ac_mid ')' - 1`
-+ if test $ac_mid -le $ac_hi; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core 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=
-+ ac_lo= ac_hi=
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- # 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`
-@@ -4692,10 +5716,12 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef unsigned long long int ac__type_sizeof_;
-+
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (unsigned long long int))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -4703,24 +5729,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -4729,26 +5767,24 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_lo=`expr '(' $ac_mid ')' + 1`
-+ ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core 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
-+'') if test "$ac_cv_type_unsigned_long_long_int" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long long int)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (unsigned long long int), 77
-+echo "$as_me: error: cannot compute sizeof (unsigned long long int)
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; } ;;
-+ { (exit 77); exit 77; }; }
-+ else
-+ ac_cv_sizeof_unsigned_long_long_int=0
-+ fi ;;
+@@ -4444,8 +4371,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4507,8 +4433,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4548,8 +4473,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4605,8 +4529,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4646,8 +4569,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4711,8 +4633,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4743,10 +4664,8 @@
esac
else
-- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
--else
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -4756,8 +5792,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--long longval () { return (long) (sizeof (unsigned long long int)); }
--unsigned long ulongval () { return (long) (sizeof (unsigned long long int)); }
-+ typedef unsigned long long int ac__type_sizeof_;
-+
-+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
- #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -4766,35 +5804,44 @@
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
-- exit (1);
-- if (((long) (sizeof (unsigned long long int))) < 0)
-+ return 1;
-+ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
- {
-- long i = longval ();
-- if (i != ((long) (sizeof (unsigned long long int))))
-- exit (1);
-+ long int i = longval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%ld\n", i);
- }
- else
- {
-- unsigned long i = ulongval ();
-- if (i != ((long) (sizeof (unsigned long long int))))
-- exit (1);
-+ unsigned long int i = ulongval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%lu\n", i);
- }
-- exit (ferror (f) || fclose (f) != 0);
-+ return 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
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -4805,22 +5852,25 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long long int), 77
-+if test "$ac_cv_type_unsigned_long_long_int" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long long int)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (unsigned long long int), 77
-+echo "$as_me: error: cannot compute sizeof (unsigned long long int)
- 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
-+ { (exit 77); exit 77; }; }
-+ else
-+ ac_cv_sizeof_unsigned_long_long_int=0
-+ fi
- fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- 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
-+{ 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
-@@ -4833,8 +5883,8 @@
- #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
-+ { 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
-@@ -4851,7 +5901,8 @@
- int
- main ()
- {
--#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
-+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
-+ && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
- bogus endian macros
- #endif
-
-@@ -4860,24 +5911,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -4903,24 +5966,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -4929,14 +6004,15 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_c_bigendian=no
-+ ac_cv_c_bigendian=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core 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.
-+ # 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
-@@ -4946,11 +6022,11 @@
- 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 };
-+short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-+short int 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 };
-+short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-+short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
- void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
- int
- main ()
-@@ -4961,24 +6037,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -4997,8 +6085,10 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ { { 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. */
-@@ -5006,27 +6096,41 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-+$ac_includes_default
- int
- main ()
- {
-+
- /* Are we little or big endian? From Harbison&Steele. */
- union
- {
-- long l;
-- char c[sizeof (long)];
-+ long int l;
-+ char c[sizeof (long int)];
- } u;
- u.l = 1;
-- exit (u.c[sizeof (long) - 1] == 1);
-+ return u.c[sizeof (long int) - 1] == 1;
-+
-+ ;
-+ return 0;
- }
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -5039,13 +6143,16 @@
- ( exit $ac_status )
- ac_cv_c_bigendian=yes
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
--echo "${ECHO_T}$ac_cv_c_bigendian" >&6
-+{ 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)
-
-@@ -5066,8 +6173,8 @@
- fi
-
-
--echo "$as_me:$LINENO: checking for __attribute__" >&5
--echo $ECHO_N "checking for __attribute__... $ECHO_C" >&6
-+{ 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
-@@ -5098,24 +6205,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -5124,9 +6243,10 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv___attribute__=no
-+ ac_cv___attribute__=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
-
- if test "$ac_cv___attribute__" = "yes"; then
-@@ -5136,12 +6256,12 @@
- _ACEOF
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv___attribute__" >&5
--echo "${ECHO_T}$ac_cv___attribute__" >&6
-+{ 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
-+{ 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
-@@ -5172,24 +6292,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -5198,9 +6330,10 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_fpic=no
-+ ac_cv_fpic=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- CFLAGS=$save_CFLAGS
-
- fi
-@@ -5210,120 +6343,14 @@
- else
- FPIC_CFLAGS=""
- fi
--echo "$as_me:$LINENO: result: $ac_cv_fpic" >&5
--echo "${ECHO_T}$ac_cv_fpic" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_fpic" >&5
-+echo "${ECHO_T}$ac_cv_fpic" >&6; }
-
+@@ -4868,8 +4787,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4911,8 +4829,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -4969,8 +4886,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -5106,8 +5022,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -5180,8 +5095,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -5216,114 +5130,8 @@
# CMU GUESS RUNPATH SWITCH
@@ -9820,6126 +3738,584 @@
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-+ andrew_runpath_switch="none"
-
+-
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LDFLAGS="${SAVE_LDFLAGS}"
--
++ andrew_runpath_switch="none"
+
-fi
-echo "$as_me:$LINENO: result: $andrew_runpath_switch" >&5
-echo "${ECHO_T}$andrew_runpath_switch" >&6
-@@ -5332,18 +6359,19 @@
- for ac_header in unistd.h sys/select.h sys/param.h stdarg.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -5354,24 +6382,36 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -5380,15 +6420,16 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -5397,8 +6438,13 @@
- /* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
-@@ -5422,9 +6468,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -5448,25 +6495,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -5485,9 +6526,9 @@
- for ac_func in memmove strcasecmp ftruncate strerror
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -5513,53 +6554,59 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -5568,25 +6615,25 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "$as_ac_var=no"
-+ eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- 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
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-
- else
-- case $LIBOBJS in
-- "$ac_func.$ac_objext" | \
-- *" $ac_func.$ac_objext" | \
-- "$ac_func.$ac_objext "* | \
-+ case " $LIBOBJS " in
- *" $ac_func.$ac_objext "* ) ;;
-- *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
-+ *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
-+ ;;
- esac
-
- fi
-@@ -5598,9 +6645,9 @@
- for ac_func in strlcat strlcpy
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -5626,53 +6673,59 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -5681,13 +6734,15 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "$as_ac_var=no"
-+ eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- 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
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -5704,9 +6759,9 @@
- ac_header_dirent=no
- for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
- as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
--echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
-+echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -5728,24 +6783,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -5754,12 +6821,14 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "$as_ac_Header=no"
-+ eval "$as_ac_Header=no"
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-@@ -5771,13 +6840,12 @@
- done
- # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
- if test $ac_header_dirent = dirent.h; then
-- echo "$as_me:$LINENO: checking for library containing opendir" >&5
--echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for library containing opendir" >&5
-+echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
- if test "${ac_cv_search_opendir+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_func_search_save_LIBS=$LIBS
--ac_cv_search_opendir=no
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -5785,126 +6853,99 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char opendir ();
- int
- main ()
- {
--opendir ();
-+return opendir ();
- ;
- 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
-+for ac_lib in '' dir; do
-+ if test -z "$ac_lib"; then
-+ ac_res="none required"
-+ else
-+ ac_res=-l$ac_lib
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ fi
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- ac_cv_search_opendir="none required"
-+ ac_cv_search_opendir=$ac_res
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--if test "$ac_cv_search_opendir" = no; then
-- for ac_lib in dir; do
-- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char opendir ();
--int
--main ()
--{
--opendir ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_search_opendir="-l$ac_lib"
--break
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+fi
-
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext
-+ if test "${ac_cv_search_opendir+set}" = set; then
-+ break
- fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
-- done
-+done
-+if test "${ac_cv_search_opendir+set}" = set; then
-+ :
-+else
-+ ac_cv_search_opendir=no
- fi
-+rm conftest.$ac_ext
- LIBS=$ac_func_search_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
--echo "${ECHO_T}$ac_cv_search_opendir" >&6
--if test "$ac_cv_search_opendir" != no; then
-- test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
-+{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-+echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
-+ac_res=$ac_cv_search_opendir
-+if test "$ac_res" != no; then
-+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
- fi
-
- else
-- echo "$as_me:$LINENO: checking for library containing opendir" >&5
--echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for library containing opendir" >&5
-+echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
- if test "${ac_cv_search_opendir+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_func_search_save_LIBS=$LIBS
--ac_cv_search_opendir=no
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -5912,115 +6953,89 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char opendir ();
- int
- main ()
- {
--opendir ();
-+return opendir ();
- ;
- 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
-+for ac_lib in '' x; do
-+ if test -z "$ac_lib"; then
-+ ac_res="none required"
-+ else
-+ ac_res=-l$ac_lib
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ fi
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- ac_cv_search_opendir="none required"
-+ ac_cv_search_opendir=$ac_res
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--if test "$ac_cv_search_opendir" = no; then
-- for ac_lib in x; do
-- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char opendir ();
--int
--main ()
--{
--opendir ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_search_opendir="-l$ac_lib"
--break
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+fi
-
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext
-+ if test "${ac_cv_search_opendir+set}" = set; then
-+ break
- fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
-- done
-+done
-+if test "${ac_cv_search_opendir+set}" = set; then
-+ :
-+else
-+ ac_cv_search_opendir=no
- fi
-+rm conftest.$ac_ext
- LIBS=$ac_func_search_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
--echo "${ECHO_T}$ac_cv_search_opendir" >&6
--if test "$ac_cv_search_opendir" != no; then
-- test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
-+{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-+echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
-+ac_res=$ac_cv_search_opendir
-+if test "$ac_res" != no; then
-+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
- fi
-
-@@ -6030,8 +7045,8 @@
-
- save_LIBS="$LIBS"
- LIB_SOCKET=""
-- echo "$as_me:$LINENO: checking for connect" >&5
--echo $ECHO_N "checking for connect... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for connect" >&5
-+echo $ECHO_N "checking for connect... $ECHO_C" >&6; }
- if test "${ac_cv_func_connect+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6058,53 +7073,59 @@
-
- #undef connect
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char connect ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_connect) || defined (__stub___connect)
-+#if defined __stub_connect || defined __stub___connect
- choke me
--#else
--char (*f) () = connect;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != connect;
-+return connect ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -6113,18 +7134,19 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_func_connect=no
-+ ac_cv_func_connect=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- 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
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
-+echo "${ECHO_T}$ac_cv_func_connect" >&6; }
- if test $ac_cv_func_connect = yes; then
- :
- else
-- echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
--echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
-+echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6137,40 +7159,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char gethostbyname ();
- int
- main ()
- {
--gethostbyname ();
-+return gethostbyname ();
- ;
- 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
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -6179,20 +7213,21 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_nsl_gethostbyname=no
-+ ac_cv_lib_nsl_gethostbyname=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
--echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
-+echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; }
- if test $ac_cv_lib_nsl_gethostbyname = yes; then
- LIB_SOCKET="-lnsl $LIB_SOCKET"
- fi
-
-- echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
--echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-+echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }
- if test "${ac_cv_lib_socket_connect+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6205,40 +7240,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char connect ();
- int
- main ()
- {
--connect ();
-+return connect ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -6247,14 +7294,15 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_socket_connect=no
-+ ac_cv_lib_socket_connect=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
--echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
-+echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; }
- if test $ac_cv_lib_socket_connect = yes; then
- LIB_SOCKET="-lsocket $LIB_SOCKET"
- fi
-@@ -6263,8 +7311,8 @@
- fi
-
- LIBS="$LIB_SOCKET $save_LIBS"
-- echo "$as_me:$LINENO: checking for res_search" >&5
--echo $ECHO_N "checking for res_search... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for res_search" >&5
-+echo $ECHO_N "checking for res_search... $ECHO_C" >&6; }
- if test "${ac_cv_func_res_search+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6291,53 +7339,59 @@
-
- #undef res_search
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char res_search ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_res_search) || defined (__stub___res_search)
-+#if defined __stub_res_search || defined __stub___res_search
- choke me
--#else
--char (*f) () = res_search;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != res_search;
-+return res_search ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -6346,13 +7400,14 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_func_res_search=no
-+ ac_cv_func_res_search=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- 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
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_res_search" >&5
-+echo "${ECHO_T}$ac_cv_func_res_search" >&6; }
- if test $ac_cv_func_res_search = yes; then
- :
- else
-@@ -6385,24 +7440,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -6411,8 +7478,10 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-
- fi
-@@ -6423,9 +7492,9 @@
- for ac_func in dn_expand dns_lookup
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -6451,53 +7520,59 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -6506,13 +7581,15 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "$as_ac_var=no"
-+ eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- 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
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -6528,8 +7605,8 @@
-
- cyrus_cv_getaddrinfo=yes
-
--echo "$as_me:$LINENO: checking for getaddrinfo" >&5
--echo $ECHO_N "checking for getaddrinfo... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for getaddrinfo" >&5
-+echo $ECHO_N "checking for getaddrinfo... $ECHO_C" >&6; }
- if test "${ac_cv_func_getaddrinfo+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6556,53 +7633,59 @@
-
- #undef getaddrinfo
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char getaddrinfo ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_getaddrinfo) || defined (__stub___getaddrinfo)
-+#if defined __stub_getaddrinfo || defined __stub___getaddrinfo
- choke me
--#else
--char (*f) () = getaddrinfo;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != getaddrinfo;
-+return getaddrinfo ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -6611,20 +7694,21 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_func_getaddrinfo=no
-+ ac_cv_func_getaddrinfo=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- 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
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_getaddrinfo" >&5
-+echo "${ECHO_T}$ac_cv_func_getaddrinfo" >&6; }
- if test $ac_cv_func_getaddrinfo = yes; then
- ac_cv_lib_socket_getaddrinfo=no
- ac_cv_lib_inet6_getaddrinfo=no
-
- else
-- echo "$as_me:$LINENO: checking for getaddrinfo in -lsocket" >&5
--echo $ECHO_N "checking for getaddrinfo in -lsocket... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for getaddrinfo in -lsocket" >&5
-+echo $ECHO_N "checking for getaddrinfo in -lsocket... $ECHO_C" >&6; }
- if test "${ac_cv_lib_socket_getaddrinfo+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6637,40 +7721,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char getaddrinfo ();
- int
- main ()
- {
--getaddrinfo ();
-+return getaddrinfo ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -6679,21 +7775,22 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_socket_getaddrinfo=no
-+ ac_cv_lib_socket_getaddrinfo=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_socket_getaddrinfo" >&5
--echo "${ECHO_T}$ac_cv_lib_socket_getaddrinfo" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_getaddrinfo" >&5
-+echo "${ECHO_T}$ac_cv_lib_socket_getaddrinfo" >&6; }
- if test $ac_cv_lib_socket_getaddrinfo = yes; then
- LIBS="$LIBS -lsocket"
- ac_cv_lib_inet6_getaddrinfo=no
-
- else
-- echo "$as_me:$LINENO: checking whether your system has IPv6 directory" >&5
--echo $ECHO_N "checking whether your system has IPv6 directory... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking whether your system has IPv6 directory" >&5
-+echo $ECHO_N "checking whether your system has IPv6 directory... $ECHO_C" >&6; }
- if test "${ipv6_cv_dir+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6703,8 +7800,8 @@
- fi
- done
- fi
-- echo "$as_me:$LINENO: result: $ipv6_cv_dir" >&5
--echo "${ECHO_T}$ipv6_cv_dir" >&6
-+ { echo "$as_me:$LINENO: result: $ipv6_cv_dir" >&5
-+echo "${ECHO_T}$ipv6_cv_dir" >&6; }
- if test $ipv6_cv_dir = no; then
- ac_cv_lib_inet6_getaddrinfo=no
- else
-@@ -6713,8 +7810,8 @@
- SAVELDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
- fi
-- echo "$as_me:$LINENO: checking for getaddrinfo in -linet6" >&5
--echo $ECHO_N "checking for getaddrinfo in -linet6... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for getaddrinfo in -linet6" >&5
-+echo $ECHO_N "checking for getaddrinfo in -linet6... $ECHO_C" >&6; }
- if test "${ac_cv_lib_inet6_getaddrinfo+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6727,40 +7824,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char getaddrinfo ();
- int
- main ()
- {
--getaddrinfo ();
-+return getaddrinfo ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -6769,14 +7878,15 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_inet6_getaddrinfo=no
-+ ac_cv_lib_inet6_getaddrinfo=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_inet6_getaddrinfo" >&5
--echo "${ECHO_T}$ac_cv_lib_inet6_getaddrinfo" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_inet6_getaddrinfo" >&5
-+echo "${ECHO_T}$ac_cv_lib_inet6_getaddrinfo" >&6; }
- if test $ac_cv_lib_inet6_getaddrinfo = yes; then
- if test $ipv6_libinet6 = no; then
- ipv6_libinet6=yes
-@@ -6811,9 +7921,9 @@
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "${ipv6_cv_pfx}getaddrinfo" >/dev/null 2>&1; then
- as_ac_var=`echo "ac_cv_func_${ipv6_cv_pfx}getaddrinfo" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for ${ipv6_cv_pfx}getaddrinfo" >&5
--echo $ECHO_N "checking for ${ipv6_cv_pfx}getaddrinfo... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for ${ipv6_cv_pfx}getaddrinfo" >&5
-+echo $ECHO_N "checking for ${ipv6_cv_pfx}getaddrinfo... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -6839,53 +7949,59 @@
-
- #undef ${ipv6_cv_pfx}getaddrinfo
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char ${ipv6_cv_pfx}getaddrinfo ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_${ipv6_cv_pfx}getaddrinfo) || defined (__stub___${ipv6_cv_pfx}getaddrinfo)
-+#if defined __stub_${ipv6_cv_pfx}getaddrinfo || defined __stub___${ipv6_cv_pfx}getaddrinfo
- choke me
--#else
--char (*f) () = ${ipv6_cv_pfx}getaddrinfo;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != ${ipv6_cv_pfx}getaddrinfo;
-+return ${ipv6_cv_pfx}getaddrinfo ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -6894,13 +8010,15 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "$as_ac_var=no"
-+ eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- 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
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- rm -f conftest*
-@@ -6919,8 +8037,8 @@
- fi
- if test $ipv6_cv_getaddrinfo = yes; then
-
--echo "$as_me:$LINENO: checking for gai_strerror" >&5
--echo $ECHO_N "checking for gai_strerror... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for gai_strerror" >&5
-+echo $ECHO_N "checking for gai_strerror... $ECHO_C" >&6; }
- if test "${ac_cv_func_gai_strerror+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -6947,53 +8065,59 @@
-
- #undef gai_strerror
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char gai_strerror ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_gai_strerror) || defined (__stub___gai_strerror)
-+#if defined __stub_gai_strerror || defined __stub___gai_strerror
- choke me
--#else
--char (*f) () = gai_strerror;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != gai_strerror;
-+return gai_strerror ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -7002,20 +8126,21 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_func_gai_strerror=no
-+ ac_cv_func_gai_strerror=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- 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
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_gai_strerror" >&5
-+echo "${ECHO_T}$ac_cv_func_gai_strerror" >&6; }
- if test $ac_cv_func_gai_strerror = yes; then
- ac_cv_lib_socket_gai_strerror=no
- ac_cv_lib_inet6_gai_strerror=no
-
- else
-- echo "$as_me:$LINENO: checking for gai_strerror in -lsocket" >&5
--echo $ECHO_N "checking for gai_strerror in -lsocket... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for gai_strerror in -lsocket" >&5
-+echo $ECHO_N "checking for gai_strerror in -lsocket... $ECHO_C" >&6; }
- if test "${ac_cv_lib_socket_gai_strerror+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7028,40 +8153,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char gai_strerror ();
- int
- main ()
- {
--gai_strerror ();
-+return gai_strerror ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -7070,21 +8207,22 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_socket_gai_strerror=no
-+ ac_cv_lib_socket_gai_strerror=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_socket_gai_strerror" >&5
--echo "${ECHO_T}$ac_cv_lib_socket_gai_strerror" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_gai_strerror" >&5
-+echo "${ECHO_T}$ac_cv_lib_socket_gai_strerror" >&6; }
- if test $ac_cv_lib_socket_gai_strerror = yes; then
- LIBS="$LIBS -lsocket"
- ac_cv_lib_inet6_gai_strerror=no
-
- else
-- echo "$as_me:$LINENO: checking whether your system has IPv6 directory" >&5
--echo $ECHO_N "checking whether your system has IPv6 directory... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking whether your system has IPv6 directory" >&5
-+echo $ECHO_N "checking whether your system has IPv6 directory... $ECHO_C" >&6; }
- if test "${ipv6_cv_dir+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7094,8 +8232,8 @@
- fi
- done
- fi
-- echo "$as_me:$LINENO: result: $ipv6_cv_dir" >&5
--echo "${ECHO_T}$ipv6_cv_dir" >&6
-+ { echo "$as_me:$LINENO: result: $ipv6_cv_dir" >&5
-+echo "${ECHO_T}$ipv6_cv_dir" >&6; }
- if test $ipv6_cv_dir = no; then
- ac_cv_lib_inet6_gai_strerror=no
- else
-@@ -7104,8 +8242,8 @@
- SAVELDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
- fi
-- echo "$as_me:$LINENO: checking for gai_strerror in -linet6" >&5
--echo $ECHO_N "checking for gai_strerror in -linet6... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for gai_strerror in -linet6" >&5
-+echo $ECHO_N "checking for gai_strerror in -linet6... $ECHO_C" >&6; }
- if test "${ac_cv_lib_inet6_gai_strerror+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7118,40 +8256,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char gai_strerror ();
- int
- main ()
- {
--gai_strerror ();
-+return gai_strerror ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -7160,14 +8310,15 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_inet6_gai_strerror=no
-+ ac_cv_lib_inet6_gai_strerror=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_inet6_gai_strerror" >&5
--echo "${ECHO_T}$ac_cv_lib_inet6_gai_strerror" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_inet6_gai_strerror" >&5
-+echo "${ECHO_T}$ac_cv_lib_inet6_gai_strerror" >&6; }
- if test $ac_cv_lib_inet6_gai_strerror = yes; then
- if test $ipv6_libinet6 = no; then
- ipv6_libinet6=yes
-@@ -7202,9 +8353,9 @@
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "${ipv6_cv_pfx}gai_strerror" >/dev/null 2>&1; then
- as_ac_var=`echo "ac_cv_func_${ipv6_cv_pfx}gai_strerror" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for ${ipv6_cv_pfx}gai_strerror" >&5
--echo $ECHO_N "checking for ${ipv6_cv_pfx}gai_strerror... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for ${ipv6_cv_pfx}gai_strerror" >&5
-+echo $ECHO_N "checking for ${ipv6_cv_pfx}gai_strerror... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -7230,53 +8381,59 @@
-
- #undef ${ipv6_cv_pfx}gai_strerror
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char ${ipv6_cv_pfx}gai_strerror ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_${ipv6_cv_pfx}gai_strerror) || defined (__stub___${ipv6_cv_pfx}gai_strerror)
-+#if defined __stub_${ipv6_cv_pfx}gai_strerror || defined __stub___${ipv6_cv_pfx}gai_strerror
- choke me
--#else
--char (*f) () = ${ipv6_cv_pfx}gai_strerror;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != ${ipv6_cv_pfx}gai_strerror;
-+return ${ipv6_cv_pfx}gai_strerror ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -7285,13 +8442,15 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "$as_ac_var=no"
-+ eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- 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
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- rm -f conftest*
-@@ -7327,8 +8486,8 @@
-
- cyrus_cv_getnameinfo=yes
-
--echo "$as_me:$LINENO: checking for getnameinfo" >&5
--echo $ECHO_N "checking for getnameinfo... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for getnameinfo" >&5
-+echo $ECHO_N "checking for getnameinfo... $ECHO_C" >&6; }
- if test "${ac_cv_func_getnameinfo+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7355,53 +8514,59 @@
-
- #undef getnameinfo
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char getnameinfo ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_getnameinfo) || defined (__stub___getnameinfo)
-+#if defined __stub_getnameinfo || defined __stub___getnameinfo
- choke me
--#else
--char (*f) () = getnameinfo;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != getnameinfo;
-+return getnameinfo ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -7410,20 +8575,21 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_func_getnameinfo=no
-+ ac_cv_func_getnameinfo=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- 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
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_getnameinfo" >&5
-+echo "${ECHO_T}$ac_cv_func_getnameinfo" >&6; }
- if test $ac_cv_func_getnameinfo = yes; then
- ac_cv_lib_socket_getnameinfo=no
- ac_cv_lib_inet6_getnameinfo=no
-
- else
-- echo "$as_me:$LINENO: checking for getnameinfo in -lsocket" >&5
--echo $ECHO_N "checking for getnameinfo in -lsocket... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for getnameinfo in -lsocket" >&5
-+echo $ECHO_N "checking for getnameinfo in -lsocket... $ECHO_C" >&6; }
- if test "${ac_cv_lib_socket_getnameinfo+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7436,40 +8602,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char getnameinfo ();
- int
- main ()
- {
--getnameinfo ();
-+return getnameinfo ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -7478,21 +8656,22 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_socket_getnameinfo=no
-+ ac_cv_lib_socket_getnameinfo=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_socket_getnameinfo" >&5
--echo "${ECHO_T}$ac_cv_lib_socket_getnameinfo" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_getnameinfo" >&5
-+echo "${ECHO_T}$ac_cv_lib_socket_getnameinfo" >&6; }
- if test $ac_cv_lib_socket_getnameinfo = yes; then
- LIBS="$LIBS -lsocket"
- ac_cv_lib_inet6_getnameinfo=no
-
- else
-- echo "$as_me:$LINENO: checking whether your system has IPv6 directory" >&5
--echo $ECHO_N "checking whether your system has IPv6 directory... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking whether your system has IPv6 directory" >&5
-+echo $ECHO_N "checking whether your system has IPv6 directory... $ECHO_C" >&6; }
- if test "${ipv6_cv_dir+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7502,8 +8681,8 @@
- fi
- done
- fi
-- echo "$as_me:$LINENO: result: $ipv6_cv_dir" >&5
--echo "${ECHO_T}$ipv6_cv_dir" >&6
-+ { echo "$as_me:$LINENO: result: $ipv6_cv_dir" >&5
-+echo "${ECHO_T}$ipv6_cv_dir" >&6; }
- if test $ipv6_cv_dir = no; then
- ac_cv_lib_inet6_getnameinfo=no
- else
-@@ -7512,8 +8691,8 @@
- SAVELDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
- fi
-- echo "$as_me:$LINENO: checking for getnameinfo in -linet6" >&5
--echo $ECHO_N "checking for getnameinfo in -linet6... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for getnameinfo in -linet6" >&5
-+echo $ECHO_N "checking for getnameinfo in -linet6... $ECHO_C" >&6; }
- if test "${ac_cv_lib_inet6_getnameinfo+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7526,40 +8705,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char getnameinfo ();
- int
- main ()
- {
--getnameinfo ();
-+return getnameinfo ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -7568,14 +8759,15 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_inet6_getnameinfo=no
-+ ac_cv_lib_inet6_getnameinfo=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_inet6_getnameinfo" >&5
--echo "${ECHO_T}$ac_cv_lib_inet6_getnameinfo" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_inet6_getnameinfo" >&5
-+echo "${ECHO_T}$ac_cv_lib_inet6_getnameinfo" >&6; }
- if test $ac_cv_lib_inet6_getnameinfo = yes; then
- if test $ipv6_libinet6 = no; then
- ipv6_libinet6=yes
-@@ -7610,9 +8802,9 @@
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "${ipv6_cv_pfx}getnameinfo" >/dev/null 2>&1; then
- as_ac_var=`echo "ac_cv_func_${ipv6_cv_pfx}getnameinfo" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for ${ipv6_cv_pfx}getnameinfo" >&5
--echo $ECHO_N "checking for ${ipv6_cv_pfx}getnameinfo... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for ${ipv6_cv_pfx}getnameinfo" >&5
-+echo $ECHO_N "checking for ${ipv6_cv_pfx}getnameinfo... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -7638,53 +8830,59 @@
-
- #undef ${ipv6_cv_pfx}getnameinfo
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char ${ipv6_cv_pfx}getnameinfo ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_${ipv6_cv_pfx}getnameinfo) || defined (__stub___${ipv6_cv_pfx}getnameinfo)
-+#if defined __stub_${ipv6_cv_pfx}getnameinfo || defined __stub___${ipv6_cv_pfx}getnameinfo
- choke me
--#else
--char (*f) () = ${ipv6_cv_pfx}getnameinfo;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != ${ipv6_cv_pfx}getnameinfo;
-+return ${ipv6_cv_pfx}getnameinfo ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -7693,13 +8891,15 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "$as_ac_var=no"
-+ eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- 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
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- rm -f conftest*
-@@ -7731,8 +8931,8 @@
- fi
-
-
--echo "$as_me:$LINENO: checking whether you have ss_family in struct sockaddr_storage" >&5
--echo $ECHO_N "checking whether you have ss_family in struct sockaddr_storage... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether you have ss_family in struct sockaddr_storage" >&5
-+echo $ECHO_N "checking whether you have ss_family in struct sockaddr_storage... $ECHO_C" >&6; }
- if test "${ipv6_cv_ss_family+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7753,24 +8953,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -7779,9 +8991,10 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ipv6_cv_ss_family=no
-+ ipv6_cv_ss_family=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- if test $ipv6_cv_ss_family = yes; then
-
-@@ -7792,11 +9005,11 @@
- else
- :
- fi
--echo "$as_me:$LINENO: result: $ipv6_cv_ss_family" >&5
--echo "${ECHO_T}$ipv6_cv_ss_family" >&6
-+{ echo "$as_me:$LINENO: result: $ipv6_cv_ss_family" >&5
-+echo "${ECHO_T}$ipv6_cv_ss_family" >&6; }
-
--echo "$as_me:$LINENO: checking whether you have sa_len in struct sockaddr" >&5
--echo $ECHO_N "checking whether you have sa_len in struct sockaddr... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether you have sa_len in struct sockaddr" >&5
-+echo $ECHO_N "checking whether you have sa_len in struct sockaddr... $ECHO_C" >&6; }
- if test "${ipv6_cv_sa_len+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -7817,24 +9030,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -7843,9 +9068,10 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ipv6_cv_sa_len=no
-+ ipv6_cv_sa_len=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- if test $ipv6_cv_sa_len = yes; then
-
-@@ -7856,8 +9082,8 @@
- else
- :
- fi
--echo "$as_me:$LINENO: result: $ipv6_cv_sa_len" >&5
--echo "${ECHO_T}$ipv6_cv_sa_len" >&6
-+{ echo "$as_me:$LINENO: result: $ipv6_cv_sa_len" >&5
-+echo "${ECHO_T}$ipv6_cv_sa_len" >&6; }
-
-
-
-@@ -7865,18 +9091,19 @@
- for ac_header in sys/time.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -7887,24 +9114,36 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -7913,15 +9152,16 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -7930,8 +9170,13 @@
- /* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
-@@ -7955,9 +9200,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -7981,25 +9227,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -8011,8 +9251,8 @@
-
- done
-
--echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
--echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
-+echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; }
- if test "${ac_cv_header_time+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8036,24 +9276,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -8062,12 +9314,13 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_header_time=no
-+ ac_cv_header_time=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
--echo "${ECHO_T}$ac_cv_header_time" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
-+echo "${ECHO_T}$ac_cv_header_time" >&6; }
- if test $ac_cv_header_time = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -8076,8 +9329,8 @@
-
- fi
-
--echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
--echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
-+echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6; }
- if test "${ac_cv_struct_tm+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8099,24 +9352,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -8125,12 +9390,13 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_struct_tm=sys/time.h
-+ ac_cv_struct_tm=sys/time.h
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
--echo "${ECHO_T}$ac_cv_struct_tm" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
-+echo "${ECHO_T}$ac_cv_struct_tm" >&6; }
- if test $ac_cv_struct_tm = sys/time.h; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -8139,8 +9405,8 @@
-
- fi
-
--echo "$as_me:$LINENO: checking for struct tm.tm_zone" >&5
--echo $ECHO_N "checking for struct tm.tm_zone... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for struct tm.tm_zone" >&5
-+echo $ECHO_N "checking for struct tm.tm_zone... $ECHO_C" >&6; }
- if test "${ac_cv_member_struct_tm_tm_zone+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8165,24 +9431,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -8191,7 +9469,7 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--cat >conftest.$ac_ext <<_ACEOF
-+ cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -8212,24 +9490,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -8238,14 +9528,16 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_member_struct_tm_tm_zone=no
-+ ac_cv_member_struct_tm_tm_zone=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_zone" >&5
--echo "${ECHO_T}$ac_cv_member_struct_tm_tm_zone" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_member_struct_tm_tm_zone" >&5
-+echo "${ECHO_T}$ac_cv_member_struct_tm_tm_zone" >&6; }
- if test $ac_cv_member_struct_tm_tm_zone = yes; then
-
- cat >>confdefs.h <<_ACEOF
-@@ -8262,8 +9554,95 @@
- _ACEOF
-
- else
-- echo "$as_me:$LINENO: checking for tzname" >&5
--echo $ECHO_N "checking for tzname... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking whether tzname is declared" >&5
-+echo $ECHO_N "checking whether tzname is declared... $ECHO_C" >&6; }
-+if test "${ac_cv_have_decl_tzname+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+#include <time.h>
-+
-+int
-+main ()
-+{
-+#ifndef tzname
-+ char *p = (char *) tzname;
-+ return !p;
-+#endif
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }; }; then
-+ ac_cv_have_decl_tzname=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_cv_have_decl_tzname=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_have_decl_tzname" >&5
-+echo "${ECHO_T}$ac_cv_have_decl_tzname" >&6; }
-+if test $ac_cv_have_decl_tzname = yes; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_DECL_TZNAME 1
-+_ACEOF
-+
-+
-+else
-+ cat >>confdefs.h <<_ACEOF
-+#define HAVE_DECL_TZNAME 0
-+_ACEOF
-+
-+
-+fi
-+
-+
-+ { echo "$as_me:$LINENO: checking for tzname" >&5
-+echo $ECHO_N "checking for tzname... $ECHO_C" >&6; }
- if test "${ac_cv_var_tzname+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8274,37 +9653,49 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- #include <time.h>
--#ifndef tzname /* For SGI. */
--extern char *tzname[]; /* RS6000 and others reject char **tzname. */
-+#if !HAVE_DECL_TZNAME
-+extern char *tzname[];
- #endif
-
- int
- main ()
- {
--atoi(*tzname);
-+return tzname[0][0];
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -8313,13 +9704,14 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_var_tzname=no
-+ ac_cv_var_tzname=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- 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
-+{ echo "$as_me:$LINENO: result: $ac_cv_var_tzname" >&5
-+echo "${ECHO_T}$ac_cv_var_tzname" >&6; }
- if test $ac_cv_var_tzname = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -8339,9 +9731,9 @@
- for ac_func in vprintf
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -8367,53 +9759,59 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -8422,20 +9820,22 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "$as_ac_var=no"
-+ eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- 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
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-
--echo "$as_me:$LINENO: checking for _doprnt" >&5
--echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for _doprnt" >&5
-+echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6; }
- if test "${ac_cv_func__doprnt+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8462,53 +9862,59 @@
-
- #undef _doprnt
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char _doprnt ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub__doprnt) || defined (__stub____doprnt)
-+#if defined __stub__doprnt || defined __stub____doprnt
- choke me
--#else
--char (*f) () = _doprnt;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != _doprnt;
-+return _doprnt ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -8517,13 +9923,14 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_func__doprnt=no
-+ ac_cv_func__doprnt=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- 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
-+{ echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5
-+echo "${ECHO_T}$ac_cv_func__doprnt" >&6; }
- if test $ac_cv_func__doprnt = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -8542,20 +9949,20 @@
-
-
-
--# Check whether --with-bdb or --without-bdb was given.
-+# Check whether --with-bdb was given.
- if test "${with_bdb+set}" = set; then
-- withval="$with_bdb"
-- with_bdb=$withval
-+ withval=$with_bdb; with_bdb=$withval
- else
- with_bdb="yes"
--fi;
-+fi
-
-
--# Check whether --with-dbdir or --without-dbdir was given.
-+
-+# Check whether --with-dbdir was given.
- if test "${with_dbdir+set}" = set; then
-- withval="$with_dbdir"
-- with_bdb=$withval
--fi;
-+ withval=$with_dbdir; with_bdb=$withval
-+fi
-+
-
- case "$with_bdb" in
- no)
-@@ -8577,21 +9984,21 @@
- if test "$use_berkeley" != "no"; then
-
-
--# Check whether --with-bdb-libdir or --without-bdb-libdir was given.
-+# Check whether --with-bdb-libdir was given.
- if test "${with_bdb_libdir+set}" = set; then
-- withval="$with_bdb_libdir"
-- with_bdb_lib=$withval
-+ withval=$with_bdb_libdir; with_bdb_lib=$withval
- else
- test "${with_bdb_lib+set}" = set || with_bdb_lib=none
--fi;
-+fi
-
--# Check whether --with-bdb-incdir or --without-bdb-incdir was given.
-+
-+# Check whether --with-bdb-incdir was given.
- if test "${with_bdb_incdir+set}" = set; then
-- withval="$with_bdb_incdir"
-- with_bdb_inc=$withval
-+ withval=$with_bdb_incdir; with_bdb_inc=$withval
- else
- test "${with_bdb_inc+set}" = set || with_bdb_inc=none
--fi;
-+fi
-+
-
-
-
-@@ -8606,17 +10013,17 @@
- fi
-
- if test "${ac_cv_header_db_h+set}" = set; then
-- echo "$as_me:$LINENO: checking for db.h" >&5
--echo $ECHO_N "checking for db.h... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for db.h" >&5
-+echo $ECHO_N "checking for db.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_db_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_db_h" >&5
--echo "${ECHO_T}$ac_cv_header_db_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_db_h" >&5
-+echo "${ECHO_T}$ac_cv_header_db_h" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking db.h usability" >&5
--echo $ECHO_N "checking db.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking db.h usability" >&5
-+echo $ECHO_N "checking db.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -8627,24 +10034,36 @@
- #include <db.h>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -8653,15 +10072,16 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking db.h presence" >&5
--echo $ECHO_N "checking db.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking db.h presence" >&5
-+echo $ECHO_N "checking db.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -8670,8 +10090,13 @@
- /* end confdefs.h. */
- #include <db.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
-@@ -8695,9 +10120,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8721,25 +10147,18 @@
- echo "$as_me: WARNING: db.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: db.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: db.h: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for db.h" >&5
--echo $ECHO_N "checking for db.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for db.h" >&5
-+echo $ECHO_N "checking for db.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_db_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_header_db_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_db_h" >&5
--echo "${ECHO_T}$ac_cv_header_db_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_db_h" >&5
-+echo "${ECHO_T}$ac_cv_header_db_h" >&6; }
-
- fi
- if test $ac_cv_header_db_h = yes; then
-@@ -8787,24 +10206,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -8813,9 +10244,10 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--dblib="no"
-+ dblib="no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- if test "$dblib" = "berkeley"; then break; fi
- done
-@@ -8837,24 +10269,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -8863,9 +10307,10 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--dblib="no"
-+ dblib="no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
- LIBS=$saved_LIBS
-@@ -8921,13 +10366,13 @@
-
- SIEVE_SUBDIRS=""
- sievedir="sieve"
--# Check whether --enable-sieve or --disable-sieve was given.
-+# Check whether --enable-sieve was given.
- if test "${enable_sieve+set}" = set; then
-- enableval="$enable_sieve"
-- if test "$enableval" = no; then
-+ enableval=$enable_sieve; if test "$enableval" = no; then
- sievedir="no"
- fi
--fi;
-+fi
-+
-
- if test "$sievedir" != "no"; then
- SIEVE_OBJS="lmtp_sieve.o smtpclient.o"
-@@ -8946,8 +10391,8 @@
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_YACC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -8960,25 +10405,27 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_YACC="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- YACC=$ac_cv_prog_YACC
- if test -n "$YACC"; then
-- echo "$as_me:$LINENO: result: $YACC" >&5
--echo "${ECHO_T}$YACC" >&6
-+ { echo "$as_me:$LINENO: result: $YACC" >&5
-+echo "${ECHO_T}$YACC" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- test -n "$YACC" && break
- done
- test -n "$YACC" || YACC="yacc"
-@@ -8987,8 +10434,8 @@
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_LEX+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9001,236 +10448,196 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_LEX="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- LEX=$ac_cv_prog_LEX
- if test -n "$LEX"; then
-- echo "$as_me:$LINENO: result: $LEX" >&5
--echo "${ECHO_T}$LEX" >&6
-+ { echo "$as_me:$LINENO: result: $LEX" >&5
-+echo "${ECHO_T}$LEX" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- test -n "$LEX" && break
- done
- test -n "$LEX" || LEX=":"
-
--if test -z "$LEXLIB"
--then
-- echo "$as_me:$LINENO: checking for yywrap in -lfl" >&5
--echo $ECHO_N "checking for yywrap in -lfl... $ECHO_C" >&6
--if test "${ac_cv_lib_fl_yywrap+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lfl $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
-+if test "x$LEX" != "x:"; then
-+ cat >conftest.l <<_ACEOF
-+%%
-+a { ECHO; }
-+b { REJECT; }
-+c { yymore (); }
-+d { yyless (1); }
-+e { yyless (input () != 0); }
-+f { unput (yytext[0]); }
-+. { BEGIN INITIAL; }
-+%%
-+#ifdef YYTEXT_POINTER
-+extern char *yytext;
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char yywrap ();
- int
--main ()
-+main (void)
- {
--yywrap ();
-- ;
-- return 0;
-+ return ! yylex () + ! yywrap ();
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+{ (ac_try="$LEX conftest.l"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$LEX conftest.l") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_lib_fl_yywrap=yes
-+ (exit $ac_status); }
-+{ echo "$as_me:$LINENO: checking lex output file root" >&5
-+echo $ECHO_N "checking lex output file root... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_lex_root+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_fl_yywrap=no
-+if test -f lex.yy.c; then
-+ ac_cv_prog_lex_root=lex.yy
-+elif test -f lexyy.c; then
-+ ac_cv_prog_lex_root=lexyy
-+else
-+ { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
-+echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
-+ { (exit 1); exit 1; }; }
- fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_fl_yywrap" >&5
--echo "${ECHO_T}$ac_cv_lib_fl_yywrap" >&6
--if test $ac_cv_lib_fl_yywrap = yes; then
-- LEXLIB="-lfl"
--else
-- echo "$as_me:$LINENO: checking for yywrap in -ll" >&5
--echo $ECHO_N "checking for yywrap in -ll... $ECHO_C" >&6
--if test "${ac_cv_lib_l_yywrap+set}" = set; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
-+echo "${ECHO_T}$ac_cv_prog_lex_root" >&6; }
-+LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
-+
-+if test -z "${LEXLIB+set}"; then
-+ { echo "$as_me:$LINENO: checking lex library" >&5
-+echo $ECHO_N "checking lex library... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_lex+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-ll $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char yywrap ();
--int
--main ()
--{
--yywrap ();
-- ;
-- return 0;
--}
-+ ac_save_LIBS=$LIBS
-+ ac_cv_lib_lex='none needed'
-+ for ac_lib in '' -lfl -ll; do
-+ LIBS="$ac_lib $ac_save_LIBS"
-+ cat >conftest.$ac_ext <<_ACEOF
-+`cat $LEX_OUTPUT_ROOT.c`
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- ac_cv_lib_l_yywrap=yes
-+ ac_cv_lib_lex=$ac_lib
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_l_yywrap=no
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_l_yywrap" >&5
--echo "${ECHO_T}$ac_cv_lib_l_yywrap" >&6
--if test $ac_cv_lib_l_yywrap = yes; then
-- LEXLIB="-ll"
--fi
-
- fi
-
--fi
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
-+ test "$ac_cv_lib_lex" != 'none needed' && break
-+ done
-+ LIBS=$ac_save_LIBS
-
--if test "x$LEX" != "x:"; then
-- echo "$as_me:$LINENO: checking lex output file root" >&5
--echo $ECHO_N "checking lex output file root... $ECHO_C" >&6
--if test "${ac_cv_prog_lex_root+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- # The minimal lex program is just a single line: %%. But some broken lexes
--# (Solaris, I think it was) want two %% lines, so accommodate them.
--cat >conftest.l <<_ACEOF
--%%
--%%
--_ACEOF
--{ (eval echo "$as_me:$LINENO: \"$LEX conftest.l\"") >&5
-- (eval $LEX conftest.l) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }
--if test -f lex.yy.c; then
-- ac_cv_prog_lex_root=lex.yy
--elif test -f lexyy.c; then
-- ac_cv_prog_lex_root=lexyy
--else
-- { { echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
--echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
-- { (exit 1); exit 1; }; }
- fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_lex" >&5
-+echo "${ECHO_T}$ac_cv_lib_lex" >&6; }
-+ test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
--echo "${ECHO_T}$ac_cv_prog_lex_root" >&6
--rm -f conftest.l
--LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
-
--echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5
--echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6
-+
-+{ echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5
-+echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6; }
- if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- # POSIX says lex can declare yytext either as a pointer or an array; the
--# default is implementation-dependent. Figure out which it is, since
-+# default is implementation-dependent. Figure out which it is, since
- # not all implementations provide the %pointer and %array declarations.
- ac_cv_prog_lex_yytext_pointer=no
--echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c
- ac_save_LIBS=$LIBS
--LIBS="$LIBS $LEXLIB"
-+LIBS="$LEXLIB $ac_save_LIBS"
- cat >conftest.$ac_ext <<_ACEOF
-+#define YYTEXT_POINTER 1
- `cat $LEX_OUTPUT_ROOT.c`
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -9239,15 +10646,16 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-+
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_save_LIBS
--rm -f "${LEX_OUTPUT_ROOT}.c"
-
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
--echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
-+echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6; }
- if test $ac_cv_prog_lex_yytext_pointer = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -9255,11 +10663,12 @@
- _ACEOF
-
- fi
-+rm -f conftest.l $LEX_OUTPUT_ROOT.c
-
- fi
-
--echo "$as_me:$LINENO: checking for main in -lfl" >&5
--echo $ECHO_N "checking for main in -lfl... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for main in -lfl" >&5
-+echo $ECHO_N "checking for main in -lfl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_fl_main+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9276,30 +10685,42 @@
- int
- main ()
- {
--main ();
-+return main ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -9308,14 +10729,15 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_fl_main=no
-+ ac_cv_lib_fl_main=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_fl_main" >&5
--echo "${ECHO_T}$ac_cv_lib_fl_main" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_fl_main" >&5
-+echo "${ECHO_T}$ac_cv_lib_fl_main" >&6; }
- if test $ac_cv_lib_fl_main = yes; then
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBFL 1
-@@ -9326,13 +10748,12 @@
- fi
-
-
-- echo "$as_me:$LINENO: checking for library containing regcomp" >&5
--echo $ECHO_N "checking for library containing regcomp... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for library containing regcomp" >&5
-+echo $ECHO_N "checking for library containing regcomp... $ECHO_C" >&6; }
- if test "${ac_cv_search_regcomp+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_func_search_save_LIBS=$LIBS
--ac_cv_search_regcomp=no
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -9340,115 +10761,89 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char regcomp ();
- int
- main ()
- {
--regcomp ();
-+return regcomp ();
- ;
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+for ac_lib in '' rx regex; do
-+ if test -z "$ac_lib"; then
-+ ac_res="none required"
-+ else
-+ ac_res=-l$ac_lib
-+ LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-+ fi
-+ rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-- ac_cv_search_regcomp="none required"
-+ ac_cv_search_regcomp=$ac_res
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--if test "$ac_cv_search_regcomp" = no; then
-- for ac_lib in rx regex; do
-- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char regcomp ();
--int
--main ()
--{
--regcomp ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_search_regcomp="-l$ac_lib"
--break
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+fi
-
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext
-+ if test "${ac_cv_search_regcomp+set}" = set; then
-+ break
- fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
-- done
-+done
-+if test "${ac_cv_search_regcomp+set}" = set; then
-+ :
-+else
-+ ac_cv_search_regcomp=no
- fi
-+rm conftest.$ac_ext
- LIBS=$ac_func_search_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_search_regcomp" >&5
--echo "${ECHO_T}$ac_cv_search_regcomp" >&6
--if test "$ac_cv_search_regcomp" != no; then
-- test "$ac_cv_search_regcomp" = "none required" || LIBS="$ac_cv_search_regcomp $LIBS"
-+{ echo "$as_me:$LINENO: result: $ac_cv_search_regcomp" >&5
-+echo "${ECHO_T}$ac_cv_search_regcomp" >&6; }
-+ac_res=$ac_cv_search_regcomp
-+if test "$ac_res" != no; then
-+ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-
- cat >>confdefs.h <<\_ACEOF
-@@ -9456,17 +10851,17 @@
- _ACEOF
-
- if test "${ac_cv_header_rxposix_h+set}" = set; then
-- echo "$as_me:$LINENO: checking for rxposix.h" >&5
--echo $ECHO_N "checking for rxposix.h... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for rxposix.h" >&5
-+echo $ECHO_N "checking for rxposix.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_rxposix_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_rxposix_h" >&5
--echo "${ECHO_T}$ac_cv_header_rxposix_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_rxposix_h" >&5
-+echo "${ECHO_T}$ac_cv_header_rxposix_h" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking rxposix.h usability" >&5
--echo $ECHO_N "checking rxposix.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking rxposix.h usability" >&5
-+echo $ECHO_N "checking rxposix.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -9477,24 +10872,36 @@
- #include <rxposix.h>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -9503,15 +10910,16 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking rxposix.h presence" >&5
--echo $ECHO_N "checking rxposix.h presence... $ECHO_C" >&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
- /* confdefs.h. */
- _ACEOF
-@@ -9520,8 +10928,13 @@
- /* end confdefs.h. */
- #include <rxposix.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
-@@ -9545,9 +10958,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -9571,25 +10985,18 @@
- echo "$as_me: WARNING: rxposix.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: rxposix.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: rxposix.h: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for rxposix.h" >&5
--echo $ECHO_N "checking for rxposix.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for rxposix.h" >&5
-+echo $ECHO_N "checking for rxposix.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_rxposix_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_header_rxposix_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_rxposix_h" >&5
--echo "${ECHO_T}$ac_cv_header_rxposix_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_rxposix_h" >&5
-+echo "${ECHO_T}$ac_cv_header_rxposix_h" >&6; }
-
- fi
- if test $ac_cv_header_rxposix_h = yes; then
-@@ -9611,8 +11018,8 @@
-
-
-
--echo "$as_me:$LINENO: checking for strerror" >&5
--echo $ECHO_N "checking for strerror... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for strerror" >&5
-+echo $ECHO_N "checking for strerror... $ECHO_C" >&6; }
- if test "${ac_cv_func_strerror+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -9639,53 +11046,59 @@
-
- #undef strerror
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char strerror ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_strerror) || defined (__stub___strerror)
-+#if defined __stub_strerror || defined __stub___strerror
- choke me
--#else
--char (*f) () = strerror;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != strerror;
-+return 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
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -9694,13 +11107,14 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_func_strerror=no
-+ ac_cv_func_strerror=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- 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
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_strerror" >&5
-+echo "${ECHO_T}$ac_cv_func_strerror" >&6; }
- if test $ac_cv_func_strerror = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -9720,18 +11134,19 @@
- for ac_header in sys/resource.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -9742,24 +11157,36 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -9768,15 +11195,16 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -9785,8 +11213,13 @@
- /* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
-@@ -9810,9 +11243,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -9836,25 +11270,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -9870,9 +11298,9 @@
- for ac_func in setrlimit
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -9898,53 +11326,59 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -9953,13 +11387,15 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "$as_ac_var=no"
-+ eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- 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
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -9972,9 +11408,9 @@
- for ac_func in getrlimit
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -10000,53 +11436,59 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -10055,13 +11497,15 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "$as_ac_var=no"
-+ eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- 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
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -10076,9 +11520,9 @@
- for ac_func in daemon setsid
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -10104,53 +11548,59 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -10159,13 +11609,15 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "$as_ac_var=no"
-+ eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- 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
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -10179,9 +11631,9 @@
- for ac_func in shutdown
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -10207,53 +11659,59 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -10262,13 +11720,15 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "$as_ac_var=no"
-+ eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- 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
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -10337,8 +11797,8 @@
-
-
- spt_type=""
--echo "$as_me:$LINENO: checking for setproctitle" >&5
--echo $ECHO_N "checking for setproctitle... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for setproctitle" >&5
-+echo $ECHO_N "checking for setproctitle... $ECHO_C" >&6; }
- if test "${ac_cv_func_setproctitle+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10365,53 +11825,59 @@
-
- #undef setproctitle
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char setproctitle ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_setproctitle) || defined (__stub___setproctitle)
-+#if defined __stub_setproctitle || defined __stub___setproctitle
- choke me
--#else
--char (*f) () = setproctitle;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != setproctitle;
-+return setproctitle ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -10420,20 +11886,21 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_func_setproctitle=no
-+ ac_cv_func_setproctitle=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- 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
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_setproctitle" >&5
-+echo "${ECHO_T}$ac_cv_func_setproctitle" >&6; }
- if test $ac_cv_func_setproctitle = yes; then
- spt_type=SPT_BUILTIN
- fi
-
+@@ -5362,8 +5170,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -5550,8 +5357,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -5663,8 +5469,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -5736,8 +5541,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -5809,8 +5613,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -5864,8 +5667,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -5936,8 +5738,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -5991,8 +5792,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -6095,8 +5895,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -6161,8 +5960,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -6229,8 +6027,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -6328,8 +6125,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -6393,8 +6189,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -6488,8 +6283,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -6593,8 +6387,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -6661,8 +6454,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -6751,8 +6543,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -6876,8 +6667,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -6984,8 +6774,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -7052,8 +6841,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -7142,8 +6930,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -7267,8 +7054,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -7392,8 +7178,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -7460,8 +7245,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -7550,8 +7334,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -7675,8 +7458,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -7761,8 +7543,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -7825,8 +7606,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -7895,8 +7675,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -8044,8 +7823,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -8107,8 +7885,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -8173,8 +7950,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -8220,8 +7996,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -8295,8 +8070,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -8404,8 +8178,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -8499,8 +8272,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -8635,8 +8407,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -8795,8 +8566,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -8845,8 +8615,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -9064,8 +8833,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -9131,8 +8899,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -9221,8 +8988,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -9290,8 +9056,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -9364,8 +9129,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -9419,8 +9183,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -9485,8 +9248,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -9676,8 +9438,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -9750,8 +9511,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -9935,8 +9695,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -10037,8 +9796,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -10141,8 +9899,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -10244,8 +10001,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -10402,8 +10158,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -10470,8 +10225,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -10533,8 +10287,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -10677,8 +10430,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -10793,54 +10545,51 @@
if test "$spt_type" = ""; then
-- echo "$as_me:$LINENO: checking for setproctitle in -lutil" >&5
--echo $ECHO_N "checking for setproctitle in -lutil... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for setproctitle in -lutil" >&5
-+echo $ECHO_N "checking for setproctitle in -lutil... $ECHO_C" >&6; }
- if test "${ac_cv_lib_util_setproctitle+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10446,40 +11913,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char setproctitle ();
- int
- main ()
- {
--setproctitle ();
-+return setproctitle ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -10488,14 +11967,15 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_util_setproctitle=no
-+ ac_cv_lib_util_setproctitle=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_util_setproctitle" >&5
--echo "${ECHO_T}$ac_cv_lib_util_setproctitle" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_util_setproctitle" >&5
-+echo "${ECHO_T}$ac_cv_lib_util_setproctitle" >&6; }
- if test $ac_cv_lib_util_setproctitle = yes; then
- spt_type=SPT_BUILTIN
- LIBS="${LIBS} -lutil"
-@@ -10504,17 +11984,17 @@
- fi
- if test "$spt_type" = ""; then
- if test "${ac_cv_header_sys_pstat_h+set}" = set; then
-- echo "$as_me:$LINENO: checking for sys/pstat.h" >&5
--echo $ECHO_N "checking for sys/pstat.h... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for sys/pstat.h" >&5
-+echo $ECHO_N "checking for sys/pstat.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_sys_pstat_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_sys_pstat_h" >&5
--echo "${ECHO_T}$ac_cv_header_sys_pstat_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_pstat_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sys_pstat_h" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking sys/pstat.h usability" >&5
--echo $ECHO_N "checking sys/pstat.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking sys/pstat.h usability" >&5
-+echo $ECHO_N "checking sys/pstat.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -10525,24 +12005,36 @@
- #include <sys/pstat.h>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -10551,15 +12043,16 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking sys/pstat.h presence" >&5
--echo $ECHO_N "checking sys/pstat.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking sys/pstat.h presence" >&5
-+echo $ECHO_N "checking sys/pstat.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -10568,8 +12061,13 @@
- /* end confdefs.h. */
- #include <sys/pstat.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
-@@ -10593,9 +12091,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -10619,25 +12118,18 @@
- echo "$as_me: WARNING: sys/pstat.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/pstat.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: sys/pstat.h: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for sys/pstat.h" >&5
--echo $ECHO_N "checking for sys/pstat.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for sys/pstat.h" >&5
-+echo $ECHO_N "checking for sys/pstat.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_sys_pstat_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_header_sys_pstat_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_sys_pstat_h" >&5
--echo "${ECHO_T}$ac_cv_header_sys_pstat_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_pstat_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sys_pstat_h" >&6; }
-
- fi
- if test $ac_cv_header_sys_pstat_h = yes; then
-@@ -10648,17 +12140,17 @@
- fi
- if test "$spt_type" = ""; then
- if test "${ac_cv_header_sys_sysnews_h+set}" = set; then
-- echo "$as_me:$LINENO: checking for sys/sysnews.h" >&5
--echo $ECHO_N "checking for sys/sysnews.h... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for sys/sysnews.h" >&5
-+echo $ECHO_N "checking for sys/sysnews.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_sys_sysnews_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysnews_h" >&5
--echo "${ECHO_T}$ac_cv_header_sys_sysnews_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysnews_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sys_sysnews_h" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking sys/sysnews.h usability" >&5
--echo $ECHO_N "checking sys/sysnews.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking sys/sysnews.h usability" >&5
-+echo $ECHO_N "checking sys/sysnews.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -10669,24 +12161,36 @@
- #include <sys/sysnews.h>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -10695,15 +12199,16 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking sys/sysnews.h presence" >&5
--echo $ECHO_N "checking sys/sysnews.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking sys/sysnews.h presence" >&5
-+echo $ECHO_N "checking sys/sysnews.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -10712,8 +12217,13 @@
- /* end confdefs.h. */
- #include <sys/sysnews.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
-@@ -10737,9 +12247,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -10763,25 +12274,18 @@
- echo "$as_me: WARNING: sys/sysnews.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: sys/sysnews.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: sys/sysnews.h: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for sys/sysnews.h" >&5
--echo $ECHO_N "checking for sys/sysnews.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for sys/sysnews.h" >&5
-+echo $ECHO_N "checking for sys/sysnews.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_sys_sysnews_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_header_sys_sysnews_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysnews_h" >&5
--echo "${ECHO_T}$ac_cv_header_sys_sysnews_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_sysnews_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sys_sysnews_h" >&6; }
-
- fi
- if test $ac_cv_header_sys_sysnews_h = yes; then
-@@ -10791,61 +12295,72 @@
-
- fi
- if test "$spt_type" = ""; then
-- echo "$as_me:$LINENO: checking for PS_STRINGS" >&5
--echo $ECHO_N "checking for PS_STRINGS... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for PS_STRINGS" >&5
+ echo $ECHO_N "checking for PS_STRINGS... $ECHO_C" >&6
- if test "${cyrus_cv_sys_psstrings+set}" = set; then
-+ { echo "$as_me:$LINENO: checking for PS_STRINGS" >&5
-+echo $ECHO_N "checking for PS_STRINGS... $ECHO_C" >&6; }
+if test "${cyrus_cv_sys_psstrings+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -15961,13 +4337,8 @@
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_compile") 2>conftest.er1
++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
@@ -15985,23 +4356,15 @@
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } &&
-+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
++ { (eval 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
@@ -16011,9642 +4374,666 @@
sed 's/^/| /' conftest.$ac_ext >&5
- cyrus_cv_sys_psstrings=no
-+ cyrus_cv_sys_psstrings=no
++cyrus_cv_sys_psstrings=no
fi
-rm -f conftest.err conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
fi
- if test $cyrus_cv_sys_psstrings = yes; then
- spt_type=SPT_PSSTRINGS
- fi
- echo "$as_me:$LINENO: result: $cyrus_cv_sys_psstrings" >&5
--echo "${ECHO_T}$cyrus_cv_sys_psstrings" >&6
+ if test $cyrus_cv_sys_psstrings = yes; then
+ spt_type=SPT_PSSTRINGS
+ fi
-+ { echo "$as_me:$LINENO: result: $cyrus_cv_sys_psstrings" >&5
-+echo "${ECHO_T}$cyrus_cv_sys_psstrings" >&6; }
++ echo "$as_me:$LINENO: result: $cyrus_cv_sys_psstrings" >&5
+ echo "${ECHO_T}$cyrus_cv_sys_psstrings" >&6
fi
if test "$spt_type" = ""; then
-- echo "$as_me:$LINENO: checking for SCO" >&5
--echo $ECHO_N "checking for SCO... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for SCO" >&5
-+echo $ECHO_N "checking for SCO... $ECHO_C" >&6; }
- if test "${cyrus_cv_sys_sco+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10860,8 +12375,13 @@
- #include </nonexistent>
- #endif
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
-@@ -10885,18 +12405,19 @@
-
- cyrus_cv_sys_sco=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
- fi
-
- if test $cyrus_cv_sys_sco = yes; then
- spt_type=SPT_SCO
- fi
-- echo "$as_me:$LINENO: result: $cyrus_cv_sys_sco" >&5
--echo "${ECHO_T}$cyrus_cv_sys_sco" >&6
-+ { echo "$as_me:$LINENO: result: $cyrus_cv_sys_sco" >&5
-+echo "${ECHO_T}$cyrus_cv_sys_sco" >&6; }
- fi
- if test "$spt_type" = ""; then
-- echo "$as_me:$LINENO: checking for setproctitle usability" >&5
--echo $ECHO_N "checking for setproctitle usability... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for setproctitle usability" >&5
-+echo $ECHO_N "checking for setproctitle usability... $ECHO_C" >&6; }
- if test "${cyrus_cv_sys_setproctitle+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10911,8 +12432,13 @@
- #include </nonexistent>
- #endif
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
-@@ -10936,14 +12462,15 @@
-
- cyrus_cv_sys_setproctitle=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
- fi
-
- if test $cyrus_cv_sys_setproctitle = no; then
- spt_type=SPT_NONE
- fi
-- echo "$as_me:$LINENO: result: $cyrus_cv_sys_setproctitle" >&5
--echo "${ECHO_T}$cyrus_cv_sys_setproctitle" >&6
-+ { echo "$as_me:$LINENO: result: $cyrus_cv_sys_setproctitle" >&5
-+echo "${ECHO_T}$cyrus_cv_sys_setproctitle" >&6; }
- fi
- if test "$spt_type" != ""; then
-
-@@ -10953,8 +12480,8 @@
-
- fi
-
--echo "$as_me:$LINENO: checking nonblocking method" >&5
--echo $ECHO_N "checking nonblocking method... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking nonblocking method" >&5
-+echo $ECHO_N "checking nonblocking method... $ECHO_C" >&6; }
- if test "${cyrus_cv_sys_nonblock+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -10979,24 +12506,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -11005,19 +12544,20 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--cyrus_cv_sys_nonblock=ioctl
-+ cyrus_cv_sys_nonblock=ioctl
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- fi
-
- WITH_NONBLOCK=$cyrus_cv_sys_nonblock
-
--echo "$as_me:$LINENO: result: $WITH_NONBLOCK" >&5
--echo "${ECHO_T}$WITH_NONBLOCK" >&6
-+{ echo "$as_me:$LINENO: result: $WITH_NONBLOCK" >&5
-+echo "${ECHO_T}$WITH_NONBLOCK" >&6; }
-
--echo "$as_me:$LINENO: checking timezone GMT offset method" >&5
--echo $ECHO_N "checking timezone GMT offset method... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking timezone GMT offset method" >&5
-+echo $ECHO_N "checking timezone GMT offset method... $ECHO_C" >&6; }
- if test "${cyrus_cv_struct_sys_gmtoff+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11040,24 +12580,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -11066,17 +12618,18 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--cyrus_cv_struct_sys_gmtoff=gmtime
-+ cyrus_cv_struct_sys_gmtoff=gmtime
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
-
- WITH_GMTOFF=$cyrus_cv_struct_sys_gmtoff
-
--echo "$as_me:$LINENO: result: $WITH_GMTOFF" >&5
--echo "${ECHO_T}$WITH_GMTOFF" >&6
--echo "$as_me:$LINENO: checking for shared mmap" >&5
--echo $ECHO_N "checking for shared mmap... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: result: $WITH_GMTOFF" >&5
-+echo "${ECHO_T}$WITH_GMTOFF" >&6; }
-+{ echo "$as_me:$LINENO: checking for shared mmap" >&5
-+echo $ECHO_N "checking for shared mmap... $ECHO_C" >&6; }
- if test "${cyrus_cv_func_mmap_shared+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11116,13 +12669,22 @@
-
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -11135,17 +12697,19 @@
- ( exit $ac_status )
- cyrus_cv_func_mmap_shared=no
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
-
--echo "$as_me:$LINENO: result: $cyrus_cv_func_mmap_shared" >&5
--echo "${ECHO_T}$cyrus_cv_func_mmap_shared" >&6
-+{ echo "$as_me:$LINENO: result: $cyrus_cv_func_mmap_shared" >&5
-+echo "${ECHO_T}$cyrus_cv_func_mmap_shared" >&6; }
- if test $cyrus_cv_func_mmap_shared = yes; then
- WITH_MAP="shared"
- else
--echo "$as_me:$LINENO: checking for stupid shared mmap" >&5
--echo $ECHO_N "checking for stupid shared mmap... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for stupid shared mmap" >&5
-+echo $ECHO_N "checking for stupid shared mmap... $ECHO_C" >&6; }
- if test "${cyrus_cv_func_mmap_stupidshared+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11186,13 +12750,22 @@
-
- _ACEOF
- rm -f conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>&5
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -11205,12 +12778,14 @@
- ( exit $ac_status )
- cyrus_cv_func_mmap_stupidshared=no
- fi
--rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
-+
-+
- fi
-
--echo "$as_me:$LINENO: result: $cyrus_cv_func_mmap_stupidshared" >&5
--echo "${ECHO_T}$cyrus_cv_func_mmap_stupidshared" >&6
-+{ echo "$as_me:$LINENO: result: $cyrus_cv_func_mmap_stupidshared" >&5
-+echo "${ECHO_T}$cyrus_cv_func_mmap_stupidshared" >&6; }
- if test $cyrus_cv_func_mmap_stupidshared = yes; then
- WITH_MAP="stupidshared"
- else
-@@ -11224,14 +12799,13 @@
-
-
-
--# Check whether --with-lock or --without-lock was given.
-+# Check whether --with-lock was given.
- if test "${with_lock+set}" = set; then
-- withval="$with_lock"
-- WITH_LOCK="$withval"
-+ withval=$with_lock; WITH_LOCK="$withval"
- else
-
-- echo "$as_me:$LINENO: checking for fcntl" >&5
--echo $ECHO_N "checking for fcntl... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for fcntl" >&5
-+echo $ECHO_N "checking for fcntl... $ECHO_C" >&6; }
- if test "${ac_cv_func_fcntl+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11258,53 +12832,59 @@
-
- #undef fcntl
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char fcntl ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_fcntl) || defined (__stub___fcntl)
-+#if defined __stub_fcntl || defined __stub___fcntl
- choke me
--#else
--char (*f) () = fcntl;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != fcntl;
-+return fcntl ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -11313,19 +12893,20 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_func_fcntl=no
-+ ac_cv_func_fcntl=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- 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
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_fcntl" >&5
-+echo "${ECHO_T}$ac_cv_func_fcntl" >&6; }
- if test $ac_cv_func_fcntl = yes; then
- WITH_LOCK="fcntl"
- else
-
-- echo "$as_me:$LINENO: checking for flock" >&5
--echo $ECHO_N "checking for flock... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for flock" >&5
-+echo $ECHO_N "checking for flock... $ECHO_C" >&6; }
- if test "${ac_cv_func_flock+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11352,53 +12933,59 @@
-
- #undef flock
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char flock ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_flock) || defined (__stub___flock)
-+#if defined __stub_flock || defined __stub___flock
- choke me
--#else
--char (*f) () = flock;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != flock;
-+return flock ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -11407,13 +12994,14 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_func_flock=no
-+ ac_cv_func_flock=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- 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
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_flock" >&5
-+echo "${ECHO_T}$ac_cv_func_flock" >&6; }
- if test $ac_cv_func_flock = yes; then
- WITH_LOCK="flock"
- else
-@@ -11428,13 +13016,14 @@
- fi
-
-
--fi;
-+fi
-+
-
-
-
- LIB_RT=""
--echo "$as_me:$LINENO: checking for fdatasync" >&5
--echo $ECHO_N "checking for fdatasync... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for fdatasync" >&5
-+echo $ECHO_N "checking for fdatasync... $ECHO_C" >&6; }
- if test "${ac_cv_func_fdatasync+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11461,53 +13050,59 @@
-
- #undef fdatasync
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char fdatasync ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_fdatasync) || defined (__stub___fdatasync)
-+#if defined __stub_fdatasync || defined __stub___fdatasync
- choke me
--#else
--char (*f) () = fdatasync;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != fdatasync;
-+return fdatasync ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -11516,13 +13111,14 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_func_fdatasync=no
-+ ac_cv_func_fdatasync=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- 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
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_fdatasync" >&5
-+echo "${ECHO_T}$ac_cv_func_fdatasync" >&6; }
- if test $ac_cv_func_fdatasync = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -11531,8 +13127,8 @@
-
- else
-
-- echo "$as_me:$LINENO: checking for fdatasync in -lrt" >&5
--echo $ECHO_N "checking for fdatasync in -lrt... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for fdatasync in -lrt" >&5
-+echo $ECHO_N "checking for fdatasync in -lrt... $ECHO_C" >&6; }
- if test "${ac_cv_lib_rt_fdatasync+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11545,40 +13141,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char fdatasync ();
- int
- main ()
- {
--fdatasync ();
-+return fdatasync ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -11587,14 +13195,15 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_rt_fdatasync=no
-+ ac_cv_lib_rt_fdatasync=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_rt_fdatasync" >&5
--echo "${ECHO_T}$ac_cv_lib_rt_fdatasync" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_rt_fdatasync" >&5
-+echo "${ECHO_T}$ac_cv_lib_rt_fdatasync" >&6; }
- if test $ac_cv_lib_rt_fdatasync = yes; then
-
- LIB_RT="-lrt"
-@@ -11615,8 +13224,8 @@
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-
-- echo "$as_me:$LINENO: checking for sigvec" >&5
--echo $ECHO_N "checking for sigvec... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for sigvec" >&5
-+echo $ECHO_N "checking for sigvec... $ECHO_C" >&6; }
- if test "${ac_cv_func_sigvec+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11643,53 +13252,59 @@
-
- #undef sigvec
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char sigvec ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_sigvec) || defined (__stub___sigvec)
-+#if defined __stub_sigvec || defined __stub___sigvec
- choke me
--#else
--char (*f) () = sigvec;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != sigvec;
-+return sigvec ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -11698,21 +13313,22 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_func_sigvec=no
-+ ac_cv_func_sigvec=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- 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
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_sigvec" >&5
-+echo "${ECHO_T}$ac_cv_func_sigvec" >&6; }
- if test $ac_cv_func_sigvec = yes; then
-
- cyrus_sigveclib=""
-
- else
-
-- echo "$as_me:$LINENO: checking for sigvec in -lBSD" >&5
--echo $ECHO_N "checking for sigvec in -lBSD... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for sigvec in -lBSD" >&5
-+echo $ECHO_N "checking for sigvec in -lBSD... $ECHO_C" >&6; }
- if test "${ac_cv_lib_BSD_sigvec+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11725,40 +13341,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char sigvec ();
- int
- main ()
- {
--sigvec ();
-+return sigvec ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -11767,22 +13395,23 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_BSD_sigvec=no
-+ ac_cv_lib_BSD_sigvec=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_BSD_sigvec" >&5
--echo "${ECHO_T}$ac_cv_lib_BSD_sigvec" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_BSD_sigvec" >&5
-+echo "${ECHO_T}$ac_cv_lib_BSD_sigvec" >&6; }
- if test $ac_cv_lib_BSD_sigvec = yes; then
- cyrus_sigveclib="-lBSD"
- else
-
- SAVE_LDFLAGS="$LDFLAGS"
- LDFLAGS="-L/usr/ucblib -R/usr/ucblib $LDFLAGS"
-- echo "$as_me:$LINENO: checking for sigvec in -lucb" >&5
--echo $ECHO_N "checking for sigvec in -lucb... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for sigvec in -lucb" >&5
-+echo $ECHO_N "checking for sigvec in -lucb... $ECHO_C" >&6; }
- if test "${ac_cv_lib_ucb_sigvec+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -11795,40 +13424,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char sigvec ();
- int
- main ()
- {
--sigvec ();
-+return sigvec ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -11837,14 +13478,15 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_ucb_sigvec=no
-+ ac_cv_lib_ucb_sigvec=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_ucb_sigvec" >&5
--echo "${ECHO_T}$ac_cv_lib_ucb_sigvec" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ucb_sigvec" >&5
-+echo "${ECHO_T}$ac_cv_lib_ucb_sigvec" >&6; }
- if test $ac_cv_lib_ucb_sigvec = yes; then
-
- cyrus_sigveclib="-lc -L/usr/ucblib -R/usr/ucblib -lucb"
-@@ -11867,34 +13509,34 @@
- # all authentication goes through SASL
-
-
--# Check whether --with-afs or --without-afs was given.
-+# Check whether --with-afs was given.
- if test "${with_afs+set}" = set; then
-- withval="$with_afs"
-- with_afs="${withval}"
-+ withval=$with_afs; with_afs="${withval}"
- else
- with_afs="no"
--fi;
-+fi
-
-
--# Check whether --with-ldap or --without-ldap was given.
-+
-+# Check whether --with-ldap was given.
- if test "${with_ldap+set}" = set; then
-- withval="$with_ldap"
-- with_ldap="${withval}"
-+ withval=$with_ldap; with_ldap="${withval}"
- else
- with_ldap="no"
--fi;
-+fi
-
--# Check whether --enable-krb5afspts or --disable-krb5afspts was given.
-+
-+# Check whether --enable-krb5afspts was given.
- if test "${enable_krb5afspts+set}" = set; then
-- enableval="$enable_krb5afspts"
-- SASL_GSSAPI_LIBS_SET="yes"
-+ enableval=$enable_krb5afspts; SASL_GSSAPI_LIBS_SET="yes"
-
-
- cat >>confdefs.h <<\_ACEOF
- #define AFSPTS_USE_KRB5
- _ACEOF
-
--fi;
-+fi
-+
-
- if test "x$with_afs" != "xno"; then
- if test ! -d $with_afs; then
-@@ -11923,8 +13565,8 @@
-
- SAVE_LIBS="$LIBS"
- LIBS="${with_afs}/lib/liblwp.a"
-- echo "$as_me:$LINENO: checking if AFS libraries need sigvec" >&5
--echo $ECHO_N "checking if AFS libraries need sigvec... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking if AFS libraries need sigvec" >&5
-+echo $ECHO_N "checking if AFS libraries need sigvec... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -11941,30 +13583,42 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- cyrus_afs_sigvec="no"
-
- else
-@@ -11972,12 +13626,13 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
-
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- cyrus_afs_sigvec="yes"
-
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-
- fi
-@@ -12027,8 +13682,8 @@
- CPPFLAGS=$LDAP_CPPFLAGS
- LDFLAGS=$LDAP_LDFLAGS
-
-- echo "$as_me:$LINENO: checking for ldap_initialize in -lldap" >&5
--echo $ECHO_N "checking for ldap_initialize in -lldap... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for ldap_initialize in -lldap" >&5
-+echo $ECHO_N "checking for ldap_initialize in -lldap... $ECHO_C" >&6; }
- if test "${ac_cv_lib_ldap_ldap_initialize+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -12041,40 +13696,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char ldap_initialize ();
- int
- main ()
- {
--ldap_initialize ();
-+return ldap_initialize ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -12083,14 +13750,15 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_ldap_ldap_initialize=no
-+ ac_cv_lib_ldap_ldap_initialize=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_initialize" >&5
--echo "${ECHO_T}$ac_cv_lib_ldap_ldap_initialize" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_initialize" >&5
-+echo "${ECHO_T}$ac_cv_lib_ldap_ldap_initialize" >&6; }
- if test $ac_cv_lib_ldap_ldap_initialize = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -12107,8 +13775,8 @@
- CPPFLAGS=$save_CPPFLAGS
- LDFLAGS=$LDAP_LDFLAGS
-
-- echo "$as_me:$LINENO: checking for ldap_initialize in -lldap" >&5
--echo $ECHO_N "checking for ldap_initialize in -lldap... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for ldap_initialize in -lldap" >&5
-+echo $ECHO_N "checking for ldap_initialize in -lldap... $ECHO_C" >&6; }
- if test "${ac_cv_lib_ldap_ldap_initialize+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -12121,40 +13789,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char ldap_initialize ();
- int
- main ()
- {
--ldap_initialize ();
-+return ldap_initialize ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -12163,14 +13843,15 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_ldap_ldap_initialize=no
-+ ac_cv_lib_ldap_ldap_initialize=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_initialize" >&5
--echo "${ECHO_T}$ac_cv_lib_ldap_ldap_initialize" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_initialize" >&5
-+echo "${ECHO_T}$ac_cv_lib_ldap_ldap_initialize" >&6; }
- if test $ac_cv_lib_ldap_ldap_initialize = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -12202,46 +13883,46 @@
-
-
- SERVER_SUBDIRS="master imap"
--# Check whether --enable-server or --disable-server was given.
-+# Check whether --enable-server was given.
- if test "${enable_server+set}" = set; then
-- enableval="$enable_server"
-- if test "$enableval" = no; then
-+ enableval=$enable_server; if test "$enableval" = no; then
- SERVER_SUBDIRS=""
- fi
--fi;
-+fi
-+
-
- # We always output a server makefile (just because we can)
-
-
--# Check whether --with-krb or --without-krb was given.
-+# Check whether --with-krb was given.
- if test "${with_krb+set}" = set; then
-- withval="$with_krb"
-- with_krb="$withval"
-+ withval=$with_krb; with_krb="$withval"
- else
- with_krb="no"
--fi;
-+fi
-
-
--# Check whether --with-krbimpl or --without-krbimpl was given.
-+
-+# Check whether --with-krbimpl was given.
- if test "${with_krbimpl+set}" = set; then
-- withval="$with_krbimpl"
-- with_krbimpl="$withval"
-+ withval=$with_krbimpl; with_krbimpl="$withval"
- else
- with_krbimpl="kth"
--fi;
-+fi
-
--# Check whether --enable-statickrb or --disable-statickrb was given.
-+
-+# Check whether --enable-statickrb was given.
- if test "${enable_statickrb+set}" = set; then
-- enableval="$enable_statickrb"
-- with_statickrb="yes"
-+ enableval=$enable_statickrb; with_statickrb="yes"
- else
- with_statickrb="no"
--fi;
-+fi
-
-
-
--echo "$as_me:$LINENO: checking for res_search in -lresolv" >&5
--echo $ECHO_N "checking for res_search in -lresolv... $ECHO_C" >&6
-+
-+{ echo "$as_me:$LINENO: checking for res_search in -lresolv" >&5
-+echo $ECHO_N "checking for res_search in -lresolv... $ECHO_C" >&6; }
- if test "${ac_cv_lib_resolv_res_search+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -12254,40 +13935,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char res_search ();
- int
- main ()
- {
--res_search ();
-+return res_search ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -12296,14 +13989,15 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_resolv_res_search=no
-+ ac_cv_lib_resolv_res_search=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_search" >&5
--echo "${ECHO_T}$ac_cv_lib_resolv_res_search" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_search" >&5
-+echo "${ECHO_T}$ac_cv_lib_resolv_res_search" >&6; }
- if test $ac_cv_lib_resolv_res_search = yes; then
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBRESOLV 1
-@@ -12322,16 +14016,16 @@
-
- if test "$with_krb" != "no"; then
-
--# Check whether --with-krbdes or --without-krbdes was given.
-+# Check whether --with-krbdes was given.
- if test "${with_krbdes+set}" = set; then
-- withval="$with_krbdes"
-- with_krbdes="$withval"
-+ withval=$with_krbdes; with_krbdes="$withval"
- else
- with_krbdes="yes"
--fi;
-+fi
-+
- if test "$with_krbdes" = "yes"; then
-- echo "$as_me:$LINENO: checking for des_ecb_encrypt in -ldes" >&5
--echo $ECHO_N "checking for des_ecb_encrypt in -ldes... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for des_ecb_encrypt in -ldes" >&5
-+echo $ECHO_N "checking for des_ecb_encrypt in -ldes... $ECHO_C" >&6; }
- if test "${ac_cv_lib_des_des_ecb_encrypt+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -12344,40 +14038,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char des_ecb_encrypt ();
- int
- main ()
- {
--des_ecb_encrypt ();
-+return des_ecb_encrypt ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -12386,14 +14092,15 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_des_des_ecb_encrypt=no
-+ ac_cv_lib_des_des_ecb_encrypt=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_des_des_ecb_encrypt" >&5
--echo "${ECHO_T}$ac_cv_lib_des_des_ecb_encrypt" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_des_des_ecb_encrypt" >&5
-+echo "${ECHO_T}$ac_cv_lib_des_des_ecb_encrypt" >&6; }
- if test $ac_cv_lib_des_des_ecb_encrypt = yes; then
- if test "$with_statickrb" = "yes"; then
- KRB_LIBS="$with_krb/lib/libdes.a"
-@@ -12410,8 +14117,8 @@
- fi
-
- if test -d ${with_krb}; then
-- echo "$as_me:$LINENO: checking for Kerberos includes" >&5
--echo $ECHO_N "checking for Kerberos includes... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for Kerberos includes" >&5
-+echo $ECHO_N "checking for Kerberos includes... $ECHO_C" >&6; }
- if test "${cyrus_krbinclude+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -12425,8 +14132,8 @@
- done
-
- fi
--echo "$as_me:$LINENO: result: $cyrus_krbinclude" >&5
--echo "${ECHO_T}$cyrus_krbinclude" >&6
-+{ echo "$as_me:$LINENO: result: $cyrus_krbinclude" >&5
-+echo "${ECHO_T}$cyrus_krbinclude" >&6; }
-
- if test -n "${cyrus_krbinclude}"; then
- CPPFLAGS="$CPPFLAGS -I${cyrus_krbinclude}"
-@@ -12449,17 +14156,17 @@
-
- if test "$with_des" != no; then
- if test "${ac_cv_header_krb_h+set}" = set; then
-- echo "$as_me:$LINENO: checking for krb.h" >&5
--echo $ECHO_N "checking for krb.h... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for krb.h" >&5
-+echo $ECHO_N "checking for krb.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_krb_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_krb_h" >&5
--echo "${ECHO_T}$ac_cv_header_krb_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_krb_h" >&5
-+echo "${ECHO_T}$ac_cv_header_krb_h" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking krb.h usability" >&5
--echo $ECHO_N "checking krb.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking krb.h usability" >&5
-+echo $ECHO_N "checking krb.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -12470,24 +14177,36 @@
- #include <krb.h>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -12496,15 +14215,16 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking krb.h presence" >&5
--echo $ECHO_N "checking krb.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking krb.h presence" >&5
-+echo $ECHO_N "checking krb.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -12513,8 +14233,13 @@
- /* end confdefs.h. */
- #include <krb.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
-@@ -12538,9 +14263,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -12564,32 +14290,25 @@
- echo "$as_me: WARNING: krb.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: krb.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: krb.h: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for krb.h" >&5
--echo $ECHO_N "checking for krb.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for krb.h" >&5
-+echo $ECHO_N "checking for krb.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_krb_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_header_krb_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_krb_h" >&5
--echo "${ECHO_T}$ac_cv_header_krb_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_krb_h" >&5
-+echo "${ECHO_T}$ac_cv_header_krb_h" >&6; }
-
- fi
- if test $ac_cv_header_krb_h = yes; then
- as_ac_Lib=`echo "ac_cv_lib_${KRBLIB}''_krb_mk_priv" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for krb_mk_priv in -l${KRBLIB}" >&5
--echo $ECHO_N "checking for krb_mk_priv in -l${KRBLIB}... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Lib+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for krb_mk_priv in -l${KRBLIB}" >&5
-+echo $ECHO_N "checking for krb_mk_priv in -l${KRBLIB}... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
-@@ -12601,40 +14320,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char krb_mk_priv ();
- int
- main ()
- {
--krb_mk_priv ();
-+return krb_mk_priv ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -12643,14 +14374,16 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "$as_ac_Lib=no"
-+ eval "$as_ac_Lib=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Lib'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Lib'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Lib'}'` = yes; then
- if test "$with_statickrb" = "yes"; then
- KRB_LIBS="$KRB_LIBS $with_krb/lib/lib${KRBLIB}.a"
-@@ -12689,11 +14422,11 @@
-
- IMAP_PROGS=""
-
--# Check whether --with-openssl or --without-openssl was given.
-+# Check whether --with-openssl was given.
- if test "${with_openssl+set}" = set; then
-- withval="$with_openssl"
-- with_openssl="${withval}"
--fi;
-+ withval=$with_openssl; with_openssl="${withval}"
-+fi
-+
-
- OPENSSL_INC=
- OPENSSL_LIB=
-@@ -12701,8 +14434,8 @@
- no) with_openssl="no";;
- ""|yes)
- LIB_RSAREF=""
-- echo "$as_me:$LINENO: checking for RSAPublicEncrypt in -lrsaref" >&5
--echo $ECHO_N "checking for RSAPublicEncrypt in -lrsaref... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for RSAPublicEncrypt in -lrsaref" >&5
-+echo $ECHO_N "checking for RSAPublicEncrypt in -lrsaref... $ECHO_C" >&6; }
- if test "${ac_cv_lib_rsaref_RSAPublicEncrypt+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -12715,40 +14448,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char RSAPublicEncrypt ();
- int
- main ()
- {
--RSAPublicEncrypt ();
-+return RSAPublicEncrypt ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -12757,14 +14502,15 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_rsaref_RSAPublicEncrypt=no
-+ ac_cv_lib_rsaref_RSAPublicEncrypt=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_rsaref_RSAPublicEncrypt" >&5
--echo "${ECHO_T}$ac_cv_lib_rsaref_RSAPublicEncrypt" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_rsaref_RSAPublicEncrypt" >&5
-+echo "${ECHO_T}$ac_cv_lib_rsaref_RSAPublicEncrypt" >&6; }
- if test $ac_cv_lib_rsaref_RSAPublicEncrypt = yes; then
- LIB_RSAREF="-lRSAglue -lrsaref"; cmu_have_rsaref=yes
- else
-@@ -12773,8 +14519,8 @@
-
-
- with_openssl="yes"
-- echo "$as_me:$LINENO: checking for BIO_accept in -lcrypto" >&5
--echo $ECHO_N "checking for BIO_accept in -lcrypto... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for BIO_accept in -lcrypto" >&5
-+echo $ECHO_N "checking for BIO_accept in -lcrypto... $ECHO_C" >&6; }
- if test "${ac_cv_lib_crypto_BIO_accept+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -12787,40 +14533,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char BIO_accept ();
- int
- main ()
- {
--BIO_accept ();
-+return BIO_accept ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -12829,22 +14587,23 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_crypto_BIO_accept=no
-+ ac_cv_lib_crypto_BIO_accept=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_BIO_accept" >&5
--echo "${ECHO_T}$ac_cv_lib_crypto_BIO_accept" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_BIO_accept" >&5
-+echo "${ECHO_T}$ac_cv_lib_crypto_BIO_accept" >&6; }
- if test $ac_cv_lib_crypto_BIO_accept = yes; then
- LIBS="-lcrypto $LIB_RSAREF ${LIBS}"
- else
- with_openssl="no"
- fi
-
-- echo "$as_me:$LINENO: checking for SSL_CTX_new in -lssl" >&5
--echo $ECHO_N "checking for SSL_CTX_new in -lssl... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for SSL_CTX_new in -lssl" >&5
-+echo $ECHO_N "checking for SSL_CTX_new in -lssl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_ssl_SSL_CTX_new+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -12857,40 +14616,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char SSL_CTX_new ();
- int
- main ()
- {
--SSL_CTX_new ();
-+return SSL_CTX_new ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -12899,14 +14670,15 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_ssl_SSL_CTX_new=no
-+ ac_cv_lib_ssl_SSL_CTX_new=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_CTX_new" >&5
--echo "${ECHO_T}$ac_cv_lib_ssl_SSL_CTX_new" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ssl_SSL_CTX_new" >&5
-+echo "${ECHO_T}$ac_cv_lib_ssl_SSL_CTX_new" >&6; }
- if test $ac_cv_lib_ssl_SSL_CTX_new = yes; then
- LIBS="-lssl ${LIBS}"
- else
-@@ -12938,10 +14710,10 @@
- LIBS="${LIBS} -lssl -lcrypto";;
- esac
-
--echo "$as_me:$LINENO: checking for openssl" >&5
--echo $ECHO_N "checking for openssl... $ECHO_C" >&6
--echo "$as_me:$LINENO: result: $with_openssl" >&5
--echo "${ECHO_T}$with_openssl" >&6
-+{ echo "$as_me:$LINENO: checking for openssl" >&5
-+echo $ECHO_N "checking for openssl... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: result: $with_openssl" >&5
-+echo "${ECHO_T}$with_openssl" >&6; }
-
- if test "$with_openssl" != "no"; then
-
-@@ -12967,12 +14739,12 @@
-
-
-
--# Check whether --with-egd-socket or --without-egd-socket was given.
-+# Check whether --with-egd-socket was given.
- if test "${with_egd_socket+set}" = set; then
-- withval="$with_egd_socket"
-- EGD_SOCKET="$withval"
-+ withval=$with_egd_socket; EGD_SOCKET="$withval"
-+
-+fi
-
--fi;
- if test -n "$EGD_SOCKET" ; then
-
- cat >>confdefs.h <<_ACEOF
-@@ -12982,11 +14754,11 @@
- fi
-
-
--# Check whether --with-zephyr or --without-zephyr was given.
-+# Check whether --with-zephyr was given.
- if test "${with_zephyr+set}" = set; then
-- withval="$with_zephyr"
-- with_zephyr="${withval}"
--fi;
-+ withval=$with_zephyr; with_zephyr="${withval}"
-+fi
-+
- if test -z "$with_zephyr"; then
- if test -f /usr/local/lib/libzephyr.a; then
- with_zephyr="/usr/local"
-@@ -12998,8 +14770,8 @@
- ZEPHYR_CPPFLAGS=""
- case "$with_zephyr" in
- no) true;;
-- ""|yes) echo "$as_me:$LINENO: checking for ZInitialize in -lzephyr" >&5
--echo $ECHO_N "checking for ZInitialize in -lzephyr... $ECHO_C" >&6
-+ ""|yes) { echo "$as_me:$LINENO: checking for ZInitialize in -lzephyr" >&5
-+echo $ECHO_N "checking for ZInitialize in -lzephyr... $ECHO_C" >&6; }
- if test "${ac_cv_lib_zephyr_ZInitialize+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -13012,40 +14784,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char ZInitialize ();
- int
- main ()
- {
--ZInitialize ();
-+return ZInitialize ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -13054,14 +14838,15 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_zephyr_ZInitialize=no
-+ ac_cv_lib_zephyr_ZInitialize=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_zephyr_ZInitialize" >&5
--echo "${ECHO_T}$ac_cv_lib_zephyr_ZInitialize" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_zephyr_ZInitialize" >&5
-+echo "${ECHO_T}$ac_cv_lib_zephyr_ZInitialize" >&6; }
- if test $ac_cv_lib_zephyr_ZInitialize = yes; then
- ZEPHYR_LIBS="-lzephyr"
- else
-@@ -13086,13 +14871,13 @@
- fi
-
-
--# Check whether --with-pidfile or --without-pidfile was given.
-+# Check whether --with-pidfile was given.
- if test "${with_pidfile+set}" = set; then
-- withval="$with_pidfile"
-- MASTERPIDFILE="$withval"
-+ withval=$with_pidfile; MASTERPIDFILE="$withval"
- else
- MASTERPIDFILE="/var/run/cyrus-master.pid"
--fi;
-+fi
-+
- MASTERPIDFILE="\"$MASTERPIDFILE\""
-
- cat >>confdefs.h <<_ACEOF
-@@ -13100,30 +14885,30 @@
- _ACEOF
-
-
--# Check whether --enable-idled or --disable-idled was given.
-+# Check whether --enable-idled was given.
- if test "${enable_idled+set}" = set; then
-- enableval="$enable_idled"
-- if test "$enable_val" != no; then
-+ enableval=$enable_idled; if test "$enable_val" != no; then
- IMAP_PROGS="$IMAP_PROGS idled"
- fi
--fi;
-+fi
-+
-
- ENABLE_NNTP=no
--# Check whether --enable-nntp or --disable-nntp was given.
-+# Check whether --enable-nntp was given.
- if test "${enable_nntp+set}" = set; then
-- enableval="$enable_nntp"
-- ENABLE_NNTP=$enableval
-+ enableval=$enable_nntp; ENABLE_NNTP=$enableval
- if test "$ENABLE_NNTP" != no; then
- IMAP_PROGS="$IMAP_PROGS nntpd fetchnews"
- fi
--fi;
-+fi
-+
-
- ENABLE_MURDER=no
--# Check whether --enable-murder or --disable-murder was given.
-+# Check whether --enable-murder was given.
- if test "${enable_murder+set}" = set; then
-- enableval="$enable_murder"
-- ENABLE_MURDER=$enableval
--fi;
-+ enableval=$enable_murder; ENABLE_MURDER=$enableval
-+fi
-+
-
- if test "$ENABLE_MURDER" != no; then
- IMAP_PROGS="$IMAP_PROGS mupdate"
-@@ -13132,18 +14917,19 @@
- for ac_header in sys/sockio.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -13154,24 +14940,36 @@
- #include <$ac_header>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -13180,15 +14978,16 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -13197,8 +14996,13 @@
- /* end confdefs.h. */
- #include <$ac_header>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
-@@ -13222,9 +15026,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -13248,25 +15053,19 @@
- echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- eval "$as_ac_Header=\$ac_header_preproc"
- fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-
- fi
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -13281,27 +15080,27 @@
- fi
-
- ENABLE_REPLICATION=no
--# Check whether --enable-replication or --disable-replication was given.
-+# Check whether --enable-replication was given.
- if test "${enable_replication+set}" = set; then
-- enableval="$enable_replication"
-- ENABLE_REPLICATION=$enableval
-+ enableval=$enable_replication; ENABLE_REPLICATION=$enableval
- if test "$ENABLE_REPLICATION" != no; then
- IMAP_PROGS="$IMAP_PROGS sync_client sync_server sync_reset make_md5"
- fi
--fi;
-+fi
-
-
-
-
--# Check whether --with-com_err or --without-com_err was given.
-+
-+# Check whether --with-com_err was given.
- if test "${with_com_err+set}" = set; then
-- withval="$with_com_err"
-+ withval=$with_com_err;
-+fi
-
--fi;
- if test -z "$with_com_err"; then
- # no value supplied
-- echo "$as_me:$LINENO: checking for com_err in -lcom_err" >&5
--echo $ECHO_N "checking for com_err in -lcom_err... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for com_err in -lcom_err" >&5
-+echo $ECHO_N "checking for com_err in -lcom_err... $ECHO_C" >&6; }
- if test "${ac_cv_lib_com_err_com_err+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -13314,40 +15113,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char com_err ();
- int
- main ()
- {
--com_err ();
-+return com_err ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -13356,14 +15167,15 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_com_err_com_err=no
-+ ac_cv_lib_com_err_com_err=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_com_err_com_err" >&5
--echo "${ECHO_T}$ac_cv_lib_com_err_com_err" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_com_err_com_err" >&5
-+echo "${ECHO_T}$ac_cv_lib_com_err_com_err" >&6; }
- if test $ac_cv_lib_com_err_com_err = yes; then
-
- # com_err is already in library path
-@@ -13371,17 +15183,17 @@
- # can use system com_err
- with_com_err=""
- if test "${ac_cv_header_et_com_err_h+set}" = set; then
-- echo "$as_me:$LINENO: checking for et/com_err.h" >&5
--echo $ECHO_N "checking for et/com_err.h... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for et/com_err.h" >&5
-+echo $ECHO_N "checking for et/com_err.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_et_com_err_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_et_com_err_h" >&5
--echo "${ECHO_T}$ac_cv_header_et_com_err_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_et_com_err_h" >&5
-+echo "${ECHO_T}$ac_cv_header_et_com_err_h" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking et/com_err.h usability" >&5
--echo $ECHO_N "checking et/com_err.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking et/com_err.h usability" >&5
-+echo $ECHO_N "checking et/com_err.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -13392,24 +15204,36 @@
- #include <et/com_err.h>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -13418,15 +15242,16 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking et/com_err.h presence" >&5
--echo $ECHO_N "checking et/com_err.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking et/com_err.h presence" >&5
-+echo $ECHO_N "checking et/com_err.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -13435,8 +15260,13 @@
- /* end confdefs.h. */
- #include <et/com_err.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
-@@ -13460,9 +15290,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -13486,25 +15317,18 @@
- echo "$as_me: WARNING: et/com_err.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: et/com_err.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: et/com_err.h: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for et/com_err.h" >&5
--echo $ECHO_N "checking for et/com_err.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for et/com_err.h" >&5
-+echo $ECHO_N "checking for et/com_err.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_et_com_err_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_header_et_com_err_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_et_com_err_h" >&5
--echo "${ECHO_T}$ac_cv_header_et_com_err_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_et_com_err_h" >&5
-+echo "${ECHO_T}$ac_cv_header_et_com_err_h" >&6; }
-
- fi
- if test $ac_cv_header_et_com_err_h = yes; then
-@@ -13515,17 +15339,17 @@
-
- else
- if test "${ac_cv_header_com_err_h+set}" = set; then
-- echo "$as_me:$LINENO: checking for com_err.h" >&5
--echo $ECHO_N "checking for com_err.h... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for com_err.h" >&5
-+echo $ECHO_N "checking for com_err.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_com_err_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_com_err_h" >&5
--echo "${ECHO_T}$ac_cv_header_com_err_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_com_err_h" >&5
-+echo "${ECHO_T}$ac_cv_header_com_err_h" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking com_err.h usability" >&5
--echo $ECHO_N "checking com_err.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking com_err.h usability" >&5
-+echo $ECHO_N "checking com_err.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -13536,24 +15360,36 @@
- #include <com_err.h>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -13562,15 +15398,16 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking com_err.h presence" >&5
--echo $ECHO_N "checking com_err.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking com_err.h presence" >&5
-+echo $ECHO_N "checking com_err.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -13579,8 +15416,13 @@
- /* end confdefs.h. */
- #include <com_err.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
-@@ -13604,9 +15446,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -13630,25 +15473,18 @@
- echo "$as_me: WARNING: com_err.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: com_err.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: com_err.h: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for com_err.h" >&5
--echo $ECHO_N "checking for com_err.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for com_err.h" >&5
-+echo $ECHO_N "checking for com_err.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_com_err_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_header_com_err_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_com_err_h" >&5
--echo "${ECHO_T}$ac_cv_header_com_err_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_com_err_h" >&5
-+echo "${ECHO_T}$ac_cv_header_com_err_h" >&6; }
-
- fi
- if test $ac_cv_header_com_err_h = yes; then
-@@ -13665,8 +15501,8 @@
-
- # Extract the first word of "compile_et", so it can be a program name with args.
- set dummy compile_et; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_COMPILE_ET+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -13681,37 +15517,38 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_COMPILE_ET="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- test -z "$ac_cv_path_COMPILE_ET" && ac_cv_path_COMPILE_ET="no compile et"
- ;;
- esac
- fi
- COMPILE_ET=$ac_cv_path_COMPILE_ET
--
- if test -n "$COMPILE_ET"; then
-- echo "$as_me:$LINENO: result: $COMPILE_ET" >&5
--echo "${ECHO_T}$COMPILE_ET" >&6
-+ { echo "$as_me:$LINENO: result: $COMPILE_ET" >&5
-+echo "${ECHO_T}$COMPILE_ET" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-
-+
- else
-
- if test -f /usr/local/include/com_err.h -o -f /usr/local/include/et/com_err.h; then
- with_com_err="/usr/local"
- # Extract the first word of "/usr/local/bin/compile_et", so it can be a program name with args.
- set dummy /usr/local/bin/compile_et; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_COMPILE_ET+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -13726,34 +15563,35 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_COMPILE_ET="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- test -z "$ac_cv_path_COMPILE_ET" && ac_cv_path_COMPILE_ET="no compile et"
- ;;
- esac
- fi
- COMPILE_ET=$ac_cv_path_COMPILE_ET
--
- if test -n "$COMPILE_ET"; then
-- echo "$as_me:$LINENO: result: $COMPILE_ET" >&5
--echo "${ECHO_T}$COMPILE_ET" >&6
-+ { echo "$as_me:$LINENO: result: $COMPILE_ET" >&5
-+echo "${ECHO_T}$COMPILE_ET" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- elif test -f /usr/include/com_err.h -o -f /usr/include/et/com_err.h; then
- with_com_err="/usr"
- # Extract the first word of "/usr/bin/compile_et", so it can be a program name with args.
- set dummy /usr/bin/compile_et; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_COMPILE_ET+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -13768,28 +15606,29 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_COMPILE_ET="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- test -z "$ac_cv_path_COMPILE_ET" && ac_cv_path_COMPILE_ET="no compile et"
- ;;
- esac
- fi
- COMPILE_ET=$ac_cv_path_COMPILE_ET
--
- if test -n "$COMPILE_ET"; then
-- echo "$as_me:$LINENO: result: $COMPILE_ET" >&5
--echo "${ECHO_T}$COMPILE_ET" >&6
-+ { echo "$as_me:$LINENO: result: $COMPILE_ET" >&5
-+echo "${ECHO_T}$COMPILE_ET" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- else
- # use ours
- with_com_err=yes
-@@ -13844,8 +15683,8 @@
-
-
-
--echo "$as_me:$LINENO: checking for modern syslog" >&5
--echo $ECHO_N "checking for modern syslog... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for modern syslog" >&5
-+echo $ECHO_N "checking for modern syslog... $ECHO_C" >&6; }
- if test "${cyrus_cv_lib_syslog+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -13860,8 +15699,13 @@
- #include </nonexistent>
- #endif
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
-@@ -13885,6 +15729,7 @@
-
- cyrus_cv_lib_syslog=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
- fi
-
-@@ -13894,35 +15739,35 @@
- DEPLIBS="${DEPLIBS} ../syslog/libsyslog.a"
- CPPFLAGS="$CPPFLAGS -I\$(srcdir)/../syslog"
- fi
--echo "$as_me:$LINENO: result: $cyrus_cv_lib_syslog" >&5
--echo "${ECHO_T}$cyrus_cv_lib_syslog" >&6
-+{ echo "$as_me:$LINENO: result: $cyrus_cv_lib_syslog" >&5
-+echo "${ECHO_T}$cyrus_cv_lib_syslog" >&6; }
-
--echo "$as_me:$LINENO: checking which syslog facility to use" >&5
--echo $ECHO_N "checking which syslog facility to use... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking which syslog facility to use" >&5
-+echo $ECHO_N "checking which syslog facility to use... $ECHO_C" >&6; }
- SYSLOG_FACILITY=LOG_LOCAL6
-
--# Check whether --with-syslogfacility or --without-syslogfacility was given.
-+# Check whether --with-syslogfacility was given.
- if test "${with_syslogfacility+set}" = set; then
-- withval="$with_syslogfacility"
-- if test "$withval" != "yes" -a "$withval" != "no" ; then
-+ withval=$with_syslogfacility; if test "$withval" != "yes" -a "$withval" != "no" ; then
- SYSLOG_FACILITY=LOG_$withval
- fi;
--fi;
-+fi
-+
-
- cat >>confdefs.h <<_ACEOF
- #define SYSLOG_FACILITY $SYSLOG_FACILITY
- _ACEOF
-
--echo "$as_me:$LINENO: result: $SYSLOG_FACILITY" >&5
--echo "${ECHO_T}$SYSLOG_FACILITY" >&6
-+{ echo "$as_me:$LINENO: result: $SYSLOG_FACILITY" >&5
-+echo "${ECHO_T}$SYSLOG_FACILITY" >&6; }
-
-
- for ac_func in getdtablesize
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -13948,53 +15793,59 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -14003,88 +15854,88 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "$as_ac_var=no"
-+ eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- 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
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
-
- else
-- case $LIBOBJS in
-- "$ac_func.$ac_objext" | \
-- *" $ac_func.$ac_objext" | \
-- "$ac_func.$ac_objext "* | \
-+ case " $LIBOBJS " in
- *" $ac_func.$ac_objext "* ) ;;
-- *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
-+ *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
-+ ;;
- esac
-
- fi
- done
-
-
--# Check whether --enable-cmulocal or --disable-cmulocal was given.
-+# Check whether --enable-cmulocal was given.
- if test "${enable_cmulocal+set}" = set; then
-- enableval="$enable_cmulocal"
-- if test "$enableval" = yes; then
-+ enableval=$enable_cmulocal; if test "$enableval" = yes; then
- EXTRA_SUBDIRS="${EXTRA_SUBDIRS} netnews depot"
- EXTRA_OUTPUT="${EXTRA_OUTPUT} depot/Makefile"
- fi
--fi;
-+fi
-
--echo "$as_me:$LINENO: checking to use old sieve service name" >&5
--echo $ECHO_N "checking to use old sieve service name... $ECHO_C" >&6
--# Check whether --enable-oldsievename or --disable-oldsievename was given.
-+
-+{ echo "$as_me:$LINENO: checking to use old sieve service name" >&5
-+echo $ECHO_N "checking to use old sieve service name... $ECHO_C" >&6; }
-+# Check whether --enable-oldsievename was given.
- if test "${enable_oldsievename+set}" = set; then
-- enableval="$enable_oldsievename"
-- if test "$enableval" = yes; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ enableval=$enable_oldsievename; if test "$enableval" = yes; then
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-
- cat >>confdefs.h <<\_ACEOF
- #define OLD_SIEVE_SERVICE_NAME
- _ACEOF
-
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi;
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-
--# Check whether --enable-listext or --disable-listext was given.
-+
-+# Check whether --enable-listext was given.
- if test "${enable_listext+set}" = set; then
-- enableval="$enable_listext"
-- if test "$enableval" = yes; then
-+ enableval=$enable_listext; if test "$enableval" = yes; then
-
- cat >>confdefs.h <<\_ACEOF
- #define ENABLE_LISTEXT
- _ACEOF
-
- fi
--fi;
-+fi
-
--# Check whether --enable-netscapehack or --disable-netscapehack was given.
-+
-+# Check whether --enable-netscapehack was given.
- if test "${enable_netscapehack+set}" = set; then
-- enableval="$enable_netscapehack"
-- if test "$enableval" = yes; then
-+ enableval=$enable_netscapehack; if test "$enableval" = yes; then
-
- cat >>confdefs.h <<\_ACEOF
- #define ENABLE_X_NETSCAPE_HACK
- _ACEOF
-
- fi
--fi;
-+fi
-
--echo "$as_me:$LINENO: checking for dlopen" >&5
--echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
-+
-+{ echo "$as_me:$LINENO: checking for dlopen" >&5
-+echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
- if test "${ac_cv_func_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -14111,53 +15962,59 @@
-
- #undef dlopen
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char dlopen ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_dlopen) || defined (__stub___dlopen)
-+#if defined __stub_dlopen || defined __stub___dlopen
- choke me
--#else
--char (*f) () = dlopen;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != dlopen;
-+return dlopen ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -14166,19 +16023,20 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_func_dlopen=no
-+ ac_cv_func_dlopen=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- 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
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_func_dlopen" >&6; }
- if test $ac_cv_func_dlopen = yes; then
- :
- else
-
--echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-+echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -14191,40 +16049,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char dlopen ();
- int
- main ()
- {
--dlopen ();
-+return dlopen ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -14233,14 +16103,15 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_dl_dlopen=no
-+ ac_cv_lib_dl_dlopen=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
- if test $ac_cv_lib_dl_dlopen = yes; then
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBDL 1
-@@ -14252,8 +16123,8 @@
-
- fi
-
--echo "$as_me:$LINENO: checking for crypt" >&5
--echo $ECHO_N "checking for crypt... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for crypt" >&5
-+echo $ECHO_N "checking for crypt... $ECHO_C" >&6; }
- if test "${ac_cv_func_crypt+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -14280,53 +16151,59 @@
-
- #undef crypt
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char crypt ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_crypt) || defined (__stub___crypt)
-+#if defined __stub_crypt || defined __stub___crypt
- choke me
--#else
--char (*f) () = crypt;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != crypt;
-+return crypt ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -14335,18 +16212,19 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_func_crypt=no
-+ ac_cv_func_crypt=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- 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
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_crypt" >&5
-+echo "${ECHO_T}$ac_cv_func_crypt" >&6; }
- if test $ac_cv_func_crypt = yes; then
- cmu_have_crypt=yes
- else
-- echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
--echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5
-+echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6; }
- if test "${ac_cv_lib_crypt_crypt+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -14359,40 +16237,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char crypt ();
- int
- main ()
- {
--crypt ();
-+return crypt ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -14401,14 +16291,15 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_crypt_crypt=no
-+ ac_cv_lib_crypt_crypt=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
--echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5
-+echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6; }
- if test $ac_cv_lib_crypt_crypt = yes; then
- LIB_CRYPT="-lcrypt"; cmu_have_crypt=yes
- else
-@@ -14421,21 +16312,21 @@
-
-
-
--# Check whether --enable-gssapi or --disable-gssapi was given.
-+# Check whether --enable-gssapi was given.
- if test "${enable_gssapi+set}" = set; then
-- enableval="$enable_gssapi"
-- gssapi=$enableval
-+ enableval=$enable_gssapi; gssapi=$enableval
- else
- gssapi=yes
--fi;
-+fi
-
--# Check whether --with-gss_impl or --without-gss_impl was given.
-+
-+# Check whether --with-gss_impl was given.
- if test "${with_gss_impl+set}" = set; then
-- withval="$with_gss_impl"
-- gss_impl=$withval
-+ withval=$with_gss_impl; gss_impl=$withval
- else
- gss_impl=auto
--fi;
-+fi
-+
-
- if test "$gssapi" != no; then
- platform=
-@@ -14488,17 +16379,17 @@
- fi
- fi
- if test "${ac_cv_header_gssapi_h+set}" = set; then
-- echo "$as_me:$LINENO: checking for gssapi.h" >&5
--echo $ECHO_N "checking for gssapi.h... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for gssapi.h" >&5
-+echo $ECHO_N "checking for gssapi.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_gssapi_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_h" >&5
--echo "${ECHO_T}$ac_cv_header_gssapi_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_h" >&5
-+echo "${ECHO_T}$ac_cv_header_gssapi_h" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking gssapi.h usability" >&5
--echo $ECHO_N "checking gssapi.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking gssapi.h usability" >&5
-+echo $ECHO_N "checking gssapi.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -14509,24 +16400,36 @@
- #include <gssapi.h>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -14535,15 +16438,16 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking gssapi.h presence" >&5
--echo $ECHO_N "checking gssapi.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking gssapi.h presence" >&5
-+echo $ECHO_N "checking gssapi.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -14552,8 +16456,13 @@
- /* end confdefs.h. */
- #include <gssapi.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
-@@ -14577,9 +16486,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -14603,25 +16513,18 @@
- echo "$as_me: WARNING: gssapi.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: gssapi.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: gssapi.h: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for gssapi.h" >&5
--echo $ECHO_N "checking for gssapi.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for gssapi.h" >&5
-+echo $ECHO_N "checking for gssapi.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_gssapi_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_header_gssapi_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_h" >&5
--echo "${ECHO_T}$ac_cv_header_gssapi_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_h" >&5
-+echo "${ECHO_T}$ac_cv_header_gssapi_h" >&6; }
-
- fi
- if test $ac_cv_header_gssapi_h = yes; then
-@@ -14632,17 +16535,17 @@
-
- else
- if test "${ac_cv_header_gssapi_gssapi_h+set}" = set; then
-- echo "$as_me:$LINENO: checking for gssapi/gssapi.h" >&5
--echo $ECHO_N "checking for gssapi/gssapi.h... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for gssapi/gssapi.h" >&5
-+echo $ECHO_N "checking for gssapi/gssapi.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_gssapi_gssapi_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_gssapi_h" >&5
--echo "${ECHO_T}$ac_cv_header_gssapi_gssapi_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_gssapi_h" >&5
-+echo "${ECHO_T}$ac_cv_header_gssapi_gssapi_h" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking gssapi/gssapi.h usability" >&5
--echo $ECHO_N "checking gssapi/gssapi.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking gssapi/gssapi.h usability" >&5
-+echo $ECHO_N "checking gssapi/gssapi.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -14653,24 +16556,36 @@
- #include <gssapi/gssapi.h>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -14679,15 +16594,16 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking gssapi/gssapi.h presence" >&5
--echo $ECHO_N "checking gssapi/gssapi.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking gssapi/gssapi.h presence" >&5
-+echo $ECHO_N "checking gssapi/gssapi.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -14696,8 +16612,13 @@
- /* end confdefs.h. */
- #include <gssapi/gssapi.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
-@@ -14721,9 +16642,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -14747,25 +16669,18 @@
- echo "$as_me: WARNING: gssapi/gssapi.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: gssapi/gssapi.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: gssapi/gssapi.h: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for gssapi/gssapi.h" >&5
--echo $ECHO_N "checking for gssapi/gssapi.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for gssapi/gssapi.h" >&5
-+echo $ECHO_N "checking for gssapi/gssapi.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_gssapi_gssapi_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_header_gssapi_gssapi_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_gssapi_h" >&5
--echo "${ECHO_T}$ac_cv_header_gssapi_gssapi_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_gssapi_gssapi_h" >&5
-+echo "${ECHO_T}$ac_cv_header_gssapi_gssapi_h" >&6; }
-
- fi
- if test $ac_cv_header_gssapi_gssapi_h = yes; then
-@@ -14794,8 +16709,8 @@
- # The choice is reflected in GSSAPIBASE_LIBS
-
-
--echo "$as_me:$LINENO: checking for res_search in -lresolv" >&5
--echo $ECHO_N "checking for res_search in -lresolv... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for res_search in -lresolv" >&5
-+echo $ECHO_N "checking for res_search in -lresolv... $ECHO_C" >&6; }
- if test "${ac_cv_lib_resolv_res_search+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -14808,40 +16723,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char res_search ();
- int
- main ()
- {
--res_search ();
-+return res_search ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -14850,14 +16777,15 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_resolv_res_search=no
-+ ac_cv_lib_resolv_res_search=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_search" >&5
--echo "${ECHO_T}$ac_cv_lib_resolv_res_search" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_search" >&5
-+echo "${ECHO_T}$ac_cv_lib_resolv_res_search" >&6; }
- if test $ac_cv_lib_resolv_res_search = yes; then
- cat >>confdefs.h <<_ACEOF
- #define HAVE_LIBRESOLV 1
-@@ -14884,8 +16812,8 @@
-
- if test "$gss_impl" = "auto" -o "$gss_impl" = "heimdal"; then
- gss_failed=0
-- echo "$as_me:$LINENO: checking for gss_unwrap in -lgssapi" >&5
--echo $ECHO_N "checking for gss_unwrap in -lgssapi... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for gss_unwrap in -lgssapi" >&5
-+echo $ECHO_N "checking for gss_unwrap in -lgssapi... $ECHO_C" >&6; }
- if test "${ac_cv_lib_gssapi_gss_unwrap+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -14898,40 +16826,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char gss_unwrap ();
- int
- main ()
- {
--gss_unwrap ();
-+return gss_unwrap ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -14940,14 +16880,15 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_gssapi_gss_unwrap=no
-+ ac_cv_lib_gssapi_gss_unwrap=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_gssapi_gss_unwrap" >&5
--echo "${ECHO_T}$ac_cv_lib_gssapi_gss_unwrap" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_gssapi_gss_unwrap" >&5
-+echo "${ECHO_T}$ac_cv_lib_gssapi_gss_unwrap" >&6; }
- if test $ac_cv_lib_gssapi_gss_unwrap = yes; then
- gss_impl="heimdal"
- else
-@@ -14961,8 +16902,8 @@
-
- if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then
- # check for libkrb5support first
-- echo "$as_me:$LINENO: checking for krb5int_getspecific in -lkrb5support" >&5
--echo $ECHO_N "checking for krb5int_getspecific in -lkrb5support... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for krb5int_getspecific in -lkrb5support" >&5
-+echo $ECHO_N "checking for krb5int_getspecific in -lkrb5support... $ECHO_C" >&6; }
- if test "${ac_cv_lib_krb5support_krb5int_getspecific+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -14975,40 +16916,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char krb5int_getspecific ();
- int
- main ()
- {
--krb5int_getspecific ();
-+return krb5int_getspecific ();
- ;
- 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
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -15017,22 +16970,23 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_krb5support_krb5int_getspecific=no
-+ ac_cv_lib_krb5support_krb5int_getspecific=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_krb5support_krb5int_getspecific" >&5
--echo "${ECHO_T}$ac_cv_lib_krb5support_krb5int_getspecific" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_krb5support_krb5int_getspecific" >&5
-+echo "${ECHO_T}$ac_cv_lib_krb5support_krb5int_getspecific" >&6; }
- if test $ac_cv_lib_krb5support_krb5int_getspecific = yes; then
- K5SUP=-lkrb5support K5SUPSTATIC=$gssapi_dir/libkrb5support.a
- fi
-
-
- gss_failed=0
-- echo "$as_me:$LINENO: checking for gss_unwrap in -lgssapi_krb5" >&5
--echo $ECHO_N "checking for gss_unwrap in -lgssapi_krb5... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for gss_unwrap in -lgssapi_krb5" >&5
-+echo $ECHO_N "checking for gss_unwrap in -lgssapi_krb5... $ECHO_C" >&6; }
- if test "${ac_cv_lib_gssapi_krb5_gss_unwrap+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -15045,40 +16999,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char gss_unwrap ();
- int
- main ()
- {
--gss_unwrap ();
-+return gss_unwrap ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -15087,14 +17053,15 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_gssapi_krb5_gss_unwrap=no
-+ ac_cv_lib_gssapi_krb5_gss_unwrap=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_gssapi_krb5_gss_unwrap" >&5
--echo "${ECHO_T}$ac_cv_lib_gssapi_krb5_gss_unwrap" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_gssapi_krb5_gss_unwrap" >&5
-+echo "${ECHO_T}$ac_cv_lib_gssapi_krb5_gss_unwrap" >&6; }
- if test $ac_cv_lib_gssapi_krb5_gss_unwrap = yes; then
- gss_impl="mit"
- else
-@@ -15126,8 +17093,8 @@
- # library (older CyberSafe)
-
- unset ac_cv_lib_gss_csf_gss_acq_user
-- echo "$as_me:$LINENO: checking for csf_gss_acq_user in -lgss" >&5
--echo $ECHO_N "checking for csf_gss_acq_user in -lgss... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for csf_gss_acq_user in -lgss" >&5
-+echo $ECHO_N "checking for csf_gss_acq_user in -lgss... $ECHO_C" >&6; }
- if test "${ac_cv_lib_gss_csf_gss_acq_user+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -15140,40 +17107,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char csf_gss_acq_user ();
- int
- main ()
- {
--csf_gss_acq_user ();
-+return csf_gss_acq_user ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -15182,20 +17161,21 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_gss_csf_gss_acq_user=no
-+ ac_cv_lib_gss_csf_gss_acq_user=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_gss_csf_gss_acq_user" >&5
--echo "${ECHO_T}$ac_cv_lib_gss_csf_gss_acq_user" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_gss_csf_gss_acq_user" >&5
-+echo "${ECHO_T}$ac_cv_lib_gss_csf_gss_acq_user" >&6; }
- if test $ac_cv_lib_gss_csf_gss_acq_user = yes; then
- gss_impl="cybersafe03"
- else
- unset ac_cv_lib_gss_csf_gss_acq_user;
-- echo "$as_me:$LINENO: checking for csf_gss_acq_user in -lgss" >&5
--echo $ECHO_N "checking for csf_gss_acq_user in -lgss... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for csf_gss_acq_user in -lgss" >&5
-+echo $ECHO_N "checking for csf_gss_acq_user in -lgss... $ECHO_C" >&6; }
- if test "${ac_cv_lib_gss_csf_gss_acq_user+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -15208,40 +17188,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char csf_gss_acq_user ();
- int
- main ()
- {
--csf_gss_acq_user ();
-+return csf_gss_acq_user ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -15250,14 +17242,15 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_gss_csf_gss_acq_user=no
-+ ac_cv_lib_gss_csf_gss_acq_user=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_gss_csf_gss_acq_user" >&5
--echo "${ECHO_T}$ac_cv_lib_gss_csf_gss_acq_user" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_gss_csf_gss_acq_user" >&5
-+echo "${ECHO_T}$ac_cv_lib_gss_csf_gss_acq_user" >&6; }
- if test $ac_cv_lib_gss_csf_gss_acq_user = yes; then
- gss_impl="cybersafe"
- else
-@@ -15280,8 +17273,8 @@
-
- if test "$gss_impl" = "auto" -o "$gss_impl" = "seam"; then
- gss_failed=0
-- echo "$as_me:$LINENO: checking for gss_unwrap in -lgss" >&5
--echo $ECHO_N "checking for gss_unwrap in -lgss... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for gss_unwrap in -lgss" >&5
-+echo $ECHO_N "checking for gss_unwrap in -lgss... $ECHO_C" >&6; }
- if test "${ac_cv_lib_gss_gss_unwrap+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -15294,40 +17287,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char gss_unwrap ();
- int
- main ()
- {
--gss_unwrap ();
-+return gss_unwrap ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -15336,14 +17341,15 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_gss_gss_unwrap=no
-+ ac_cv_lib_gss_gss_unwrap=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_gss_gss_unwrap" >&5
--echo "${ECHO_T}$ac_cv_lib_gss_gss_unwrap" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_gss_gss_unwrap" >&5
-+echo "${ECHO_T}$ac_cv_lib_gss_gss_unwrap" >&6; }
- if test $ac_cv_lib_gss_gss_unwrap = yes; then
- gss_impl="seam"
- else
-@@ -15534,13 +17540,13 @@
- fi
-
- GSSAPI_LIBS=""
--echo "$as_me:$LINENO: checking GSSAPI" >&5
--echo $ECHO_N "checking GSSAPI... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking GSSAPI" >&5
-+echo $ECHO_N "checking GSSAPI... $ECHO_C" >&6; }
- if test "$gssapi" != no; then
-- echo "$as_me:$LINENO: result: with implementation ${gss_impl}" >&5
--echo "${ECHO_T}with implementation ${gss_impl}" >&6
-- echo "$as_me:$LINENO: checking for res_search in -lresolv" >&5
--echo $ECHO_N "checking for res_search in -lresolv... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: result: with implementation ${gss_impl}" >&5
-+echo "${ECHO_T}with implementation ${gss_impl}" >&6; }
-+ { echo "$as_me:$LINENO: checking for res_search in -lresolv" >&5
-+echo $ECHO_N "checking for res_search in -lresolv... $ECHO_C" >&6; }
- if test "${ac_cv_lib_resolv_res_search+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -15553,40 +17559,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char res_search ();
- int
- main ()
- {
--res_search ();
-+return res_search ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -15595,14 +17613,15 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_resolv_res_search=no
-+ ac_cv_lib_resolv_res_search=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_search" >&5
--echo "${ECHO_T}$ac_cv_lib_resolv_res_search" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_search" >&5
-+echo "${ECHO_T}$ac_cv_lib_resolv_res_search" >&6; }
- if test $ac_cv_lib_resolv_res_search = yes; then
- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv"
- fi
-@@ -15617,9 +17636,9 @@
- for ac_func in gsskrb5_register_acceptor_identity
- do
- as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
--if eval "test \"\${$as_ac_var+set}\" = set"; then
-+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -15645,53 +17664,59 @@
-
- #undef $ac_func
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char $ac_func ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-+#if defined __stub_$ac_func || defined __stub___$ac_func
- choke me
--#else
--char (*f) () = $ac_func;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != $ac_func;
-+return $ac_func ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -15700,13 +17725,15 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--eval "$as_ac_var=no"
-+ eval "$as_ac_var=no"
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- 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
-+ac_res=`eval echo '${'$as_ac_var'}'`
-+ { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_var'}'` = yes; then
- cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -15717,8 +17744,8 @@
-
- LIBS="$cmu_save_LIBS"
- else
-- echo "$as_me:$LINENO: result: disabled" >&5
--echo "${ECHO_T}disabled" >&6
-+ { echo "$as_me:$LINENO: result: disabled" >&5
-+echo "${ECHO_T}disabled" >&6; }
- fi
-
-
-@@ -15726,25 +17753,25 @@
-
-
-
--# Check whether --with-sasl or --without-sasl was given.
-+# Check whether --with-sasl was given.
- if test "${with_sasl+set}" = set; then
-- withval="$with_sasl"
-- with_sasl="$withval"
-+ withval=$with_sasl; with_sasl="$withval"
- else
- with_sasl="yes"
--fi;
-+fi
-
-
--# Check whether --with-staticsasl or --without-staticsasl was given.
-+
-+# Check whether --with-staticsasl was given.
- if test "${with_staticsasl+set}" = set; then
-- withval="$with_staticsasl"
-- with_staticsasl="$withval";
-+ withval=$with_staticsasl; with_staticsasl="$withval";
- if test $with_staticsasl != "no"; then
- using_static_sasl="static"
- fi
- else
- with_staticsasl="no"; using_static_sasl="no"
--fi;
-+fi
-+
-
- SASLFLAGS=""
- LIB_SASL=""
-@@ -15772,17 +17799,17 @@
- fi
-
- if test "${ac_cv_header_sasl_sasl_h+set}" = set; then
-- echo "$as_me:$LINENO: checking for sasl/sasl.h" >&5
--echo $ECHO_N "checking for sasl/sasl.h... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for sasl/sasl.h" >&5
-+echo $ECHO_N "checking for sasl/sasl.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_sasl_sasl_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_sasl_sasl_h" >&5
--echo "${ECHO_T}$ac_cv_header_sasl_sasl_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sasl_sasl_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sasl_sasl_h" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking sasl/sasl.h usability" >&5
--echo $ECHO_N "checking sasl/sasl.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking sasl/sasl.h usability" >&5
-+echo $ECHO_N "checking sasl/sasl.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -15793,24 +17820,36 @@
- #include <sasl/sasl.h>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -15819,15 +17858,16 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking sasl/sasl.h presence" >&5
--echo $ECHO_N "checking sasl/sasl.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking sasl/sasl.h presence" >&5
-+echo $ECHO_N "checking sasl/sasl.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -15836,8 +17876,13 @@
- /* end confdefs.h. */
- #include <sasl/sasl.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
-@@ -15861,9 +17906,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -15887,40 +17933,33 @@
- echo "$as_me: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: sasl/sasl.h: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for sasl/sasl.h" >&5
--echo $ECHO_N "checking for sasl/sasl.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for sasl/sasl.h" >&5
-+echo $ECHO_N "checking for sasl/sasl.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_sasl_sasl_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_header_sasl_sasl_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_sasl_sasl_h" >&5
--echo "${ECHO_T}$ac_cv_header_sasl_sasl_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sasl_sasl_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sasl_sasl_h" >&6; }
-
- fi
- if test $ac_cv_header_sasl_sasl_h = yes; then
- if test "${ac_cv_header_sasl_saslutil_h+set}" = set; then
-- echo "$as_me:$LINENO: checking for sasl/saslutil.h" >&5
--echo $ECHO_N "checking for sasl/saslutil.h... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for sasl/saslutil.h" >&5
-+echo $ECHO_N "checking for sasl/saslutil.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_sasl_saslutil_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_sasl_saslutil_h" >&5
--echo "${ECHO_T}$ac_cv_header_sasl_saslutil_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sasl_saslutil_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sasl_saslutil_h" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking sasl/saslutil.h usability" >&5
--echo $ECHO_N "checking sasl/saslutil.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking sasl/saslutil.h usability" >&5
-+echo $ECHO_N "checking sasl/saslutil.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -15931,24 +17970,36 @@
- #include <sasl/saslutil.h>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -15957,15 +18008,16 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking sasl/saslutil.h presence" >&5
--echo $ECHO_N "checking sasl/saslutil.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking sasl/saslutil.h presence" >&5
-+echo $ECHO_N "checking sasl/saslutil.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -15974,8 +18026,13 @@
- /* end confdefs.h. */
- #include <sasl/saslutil.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
-@@ -15999,9 +18056,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -16025,39 +18083,32 @@
- echo "$as_me: WARNING: sasl/saslutil.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: sasl/saslutil.h: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for sasl/saslutil.h" >&5
--echo $ECHO_N "checking for sasl/saslutil.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for sasl/saslutil.h" >&5
-+echo $ECHO_N "checking for sasl/saslutil.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_sasl_saslutil_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_header_sasl_saslutil_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_sasl_saslutil_h" >&5
--echo "${ECHO_T}$ac_cv_header_sasl_saslutil_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sasl_saslutil_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sasl_saslutil_h" >&6; }
-
- fi
- if test $ac_cv_header_sasl_saslutil_h = yes; then
- for i42 in lib64 lib; do
- if test -r ${with_staticsasl}/$i42/libsasl2.a; then
- ac_cv_found_sasl=yes
-- echo "$as_me:$LINENO: checking for static libsasl" >&5
--echo $ECHO_N "checking for static libsasl... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for static libsasl" >&5
-+echo $ECHO_N "checking for static libsasl... $ECHO_C" >&6; }
- LIB_SASL="$LIB_SASL ${with_staticsasl}/$i42/libsasl2.a"
- fi
- done
- if test ! "$ac_cv_found_sasl" = "yes"; then
-- echo "$as_me:$LINENO: checking for static libsasl" >&5
--echo $ECHO_N "checking for static libsasl... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for static libsasl" >&5
-+echo $ECHO_N "checking for static libsasl... $ECHO_C" >&6; }
- { { echo "$as_me:$LINENO: error: Could not find ${with_staticsasl}/lib*/libsasl2.a" >&5
- echo "$as_me: error: Could not find ${with_staticsasl}/lib*/libsasl2.a" >&2;}
- { (exit 1); exit 1; }; }
-@@ -16069,8 +18120,8 @@
-
-
-
-- echo "$as_me:$LINENO: result: found" >&5
--echo "${ECHO_T}found" >&6
-+ { echo "$as_me:$LINENO: result: found" >&5
-+echo "${ECHO_T}found" >&6; }
-
- if test "x$SASL_GSSAPI_LIBS_SET" = "x"; then
- LIB_SASL="$LIB_SASL $GSSAPIBASE_STATIC_LIBS"
-@@ -16102,17 +18153,17 @@
-
- # be sure to check for a SASLv2 specific function
- if test "${ac_cv_header_sasl_sasl_h+set}" = set; then
-- echo "$as_me:$LINENO: checking for sasl/sasl.h" >&5
--echo $ECHO_N "checking for sasl/sasl.h... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for sasl/sasl.h" >&5
-+echo $ECHO_N "checking for sasl/sasl.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_sasl_sasl_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_sasl_sasl_h" >&5
--echo "${ECHO_T}$ac_cv_header_sasl_sasl_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sasl_sasl_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sasl_sasl_h" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking sasl/sasl.h usability" >&5
--echo $ECHO_N "checking sasl/sasl.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking sasl/sasl.h usability" >&5
-+echo $ECHO_N "checking sasl/sasl.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -16123,24 +18174,36 @@
- #include <sasl/sasl.h>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -16149,15 +18212,16 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking sasl/sasl.h presence" >&5
--echo $ECHO_N "checking sasl/sasl.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking sasl/sasl.h presence" >&5
-+echo $ECHO_N "checking sasl/sasl.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -16166,8 +18230,13 @@
- /* end confdefs.h. */
- #include <sasl/sasl.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
-@@ -16191,9 +18260,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -16217,40 +18287,33 @@
- echo "$as_me: WARNING: sasl/sasl.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: sasl/sasl.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: sasl/sasl.h: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for sasl/sasl.h" >&5
--echo $ECHO_N "checking for sasl/sasl.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for sasl/sasl.h" >&5
-+echo $ECHO_N "checking for sasl/sasl.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_sasl_sasl_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_header_sasl_sasl_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_sasl_sasl_h" >&5
--echo "${ECHO_T}$ac_cv_header_sasl_sasl_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sasl_sasl_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sasl_sasl_h" >&6; }
-
- fi
- if test $ac_cv_header_sasl_sasl_h = yes; then
- if test "${ac_cv_header_sasl_saslutil_h+set}" = set; then
-- echo "$as_me:$LINENO: checking for sasl/saslutil.h" >&5
--echo $ECHO_N "checking for sasl/saslutil.h... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for sasl/saslutil.h" >&5
-+echo $ECHO_N "checking for sasl/saslutil.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_sasl_saslutil_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_sasl_saslutil_h" >&5
--echo "${ECHO_T}$ac_cv_header_sasl_saslutil_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sasl_saslutil_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sasl_saslutil_h" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking sasl/saslutil.h usability" >&5
--echo $ECHO_N "checking sasl/saslutil.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking sasl/saslutil.h usability" >&5
-+echo $ECHO_N "checking sasl/saslutil.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -16261,24 +18324,36 @@
- #include <sasl/saslutil.h>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -16287,15 +18362,16 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking sasl/saslutil.h presence" >&5
--echo $ECHO_N "checking sasl/saslutil.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking sasl/saslutil.h presence" >&5
-+echo $ECHO_N "checking sasl/saslutil.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -16304,8 +18380,13 @@
- /* end confdefs.h. */
- #include <sasl/saslutil.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
-@@ -16329,9 +18410,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -16355,30 +18437,23 @@
- echo "$as_me: WARNING: sasl/saslutil.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: sasl/saslutil.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: sasl/saslutil.h: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for sasl/saslutil.h" >&5
--echo $ECHO_N "checking for sasl/saslutil.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for sasl/saslutil.h" >&5
-+echo $ECHO_N "checking for sasl/saslutil.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_sasl_saslutil_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_header_sasl_saslutil_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_sasl_saslutil_h" >&5
--echo "${ECHO_T}$ac_cv_header_sasl_saslutil_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_sasl_saslutil_h" >&5
-+echo "${ECHO_T}$ac_cv_header_sasl_saslutil_h" >&6; }
-
- fi
- if test $ac_cv_header_sasl_saslutil_h = yes; then
-- echo "$as_me:$LINENO: checking for prop_get in -lsasl2" >&5
--echo $ECHO_N "checking for prop_get in -lsasl2... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for prop_get in -lsasl2" >&5
-+echo $ECHO_N "checking for prop_get in -lsasl2... $ECHO_C" >&6; }
- if test "${ac_cv_lib_sasl2_prop_get+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -16391,40 +18466,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char prop_get ();
- int
- main ()
- {
--prop_get ();
-+return prop_get ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -16433,14 +18520,15 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_sasl2_prop_get=no
-+ ac_cv_lib_sasl2_prop_get=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_sasl2_prop_get" >&5
--echo "${ECHO_T}$ac_cv_lib_sasl2_prop_get" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_sasl2_prop_get" >&5
-+echo "${ECHO_T}$ac_cv_lib_sasl2_prop_get" >&6; }
- if test $ac_cv_lib_sasl2_prop_get = yes; then
- ac_cv_found_sasl=yes
- else
-@@ -16531,8 +18619,13 @@
- #endif
-
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
-@@ -16558,6 +18651,7 @@
- echo "$as_me: error: Incorrect SASL headers found. This package requires SASL 2.1.7 or newer." >&2;}
- { (exit 1); exit 1; }; }
- fi
-+
- rm -f conftest.err conftest.$ac_ext
-
- CPPFLAGS=$cmu_saved_CPPFLAGS
-@@ -16568,8 +18662,8 @@
-
- LDFLAGS="$LDFLAGS $LIB_SASL"
-
--echo "$as_me:$LINENO: checking for sasl_checkapop in -lsasl2" >&5
--echo $ECHO_N "checking for sasl_checkapop in -lsasl2... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for sasl_checkapop in -lsasl2" >&5
-+echo $ECHO_N "checking for sasl_checkapop in -lsasl2... $ECHO_C" >&6; }
- if test "${ac_cv_lib_sasl2_sasl_checkapop+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -16582,40 +18676,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char sasl_checkapop ();
- int
- main ()
- {
--sasl_checkapop ();
-+return sasl_checkapop ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -16624,14 +18730,15 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_sasl2_sasl_checkapop=no
-+ ac_cv_lib_sasl2_sasl_checkapop=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_sasl2_sasl_checkapop" >&5
--echo "${ECHO_T}$ac_cv_lib_sasl2_sasl_checkapop" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_sasl2_sasl_checkapop" >&5
-+echo "${ECHO_T}$ac_cv_lib_sasl2_sasl_checkapop" >&6; }
- if test $ac_cv_lib_sasl2_sasl_checkapop = yes; then
-
- cat >>confdefs.h <<\_ACEOF
-@@ -16649,13 +18756,13 @@
-
-
-
--# Check whether --with-perl or --without-perl was given.
-+# Check whether --with-perl was given.
- if test "${with_perl+set}" = set; then
-- withval="$with_perl"
-- with_perl="$withval"
-+ withval=$with_perl; with_perl="$withval"
- else
- with_perl="perl"
--fi;
-+fi
-+
-
- if test "${with_perl}" = yes; then
- with_perl="perl"
-@@ -16670,8 +18777,8 @@
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_PERL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -16684,25 +18791,27 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_PERL="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- fi
- fi
- PERL=$ac_cv_prog_PERL
- if test -n "$PERL"; then
-- echo "$as_me:$LINENO: result: $PERL" >&5
--echo "${ECHO_T}$PERL" >&6
-+ { echo "$as_me:$LINENO: result: $PERL" >&5
-+echo "${ECHO_T}$PERL" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- test -n "$PERL" && break
- done
- test -n "$PERL" || PERL="with_perl=notfound"
-@@ -16731,8 +18840,8 @@
- PERL_DEPSUBDIRS="none"
- fi
-
--echo "$as_me:$LINENO: checking for MD5Init" >&5
--echo $ECHO_N "checking for MD5Init... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for MD5Init" >&5
-+echo $ECHO_N "checking for MD5Init... $ECHO_C" >&6; }
- if test "${ac_cv_func_MD5Init+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -16759,53 +18868,59 @@
-
- #undef MD5Init
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
--{
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char MD5Init ();
- /* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
--#if defined (__stub_MD5Init) || defined (__stub___MD5Init)
-+#if defined __stub_MD5Init || defined __stub___MD5Init
- choke me
--#else
--char (*f) () = MD5Init;
--#endif
--#ifdef __cplusplus
--}
- #endif
-
- int
- main ()
- {
--return f != MD5Init;
-+return MD5Init ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -16814,18 +18929,19 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_func_MD5Init=no
-+ ac_cv_func_MD5Init=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- 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
-+{ echo "$as_me:$LINENO: result: $ac_cv_func_MD5Init" >&5
-+echo "${ECHO_T}$ac_cv_func_MD5Init" >&6; }
- if test $ac_cv_func_MD5Init = yes; then
- :
- else
-- echo "$as_me:$LINENO: checking for MD5Init in -lmd" >&5
--echo $ECHO_N "checking for MD5Init in -lmd... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for MD5Init in -lmd" >&5
-+echo $ECHO_N "checking for MD5Init in -lmd... $ECHO_C" >&6; }
- if test "${ac_cv_lib_md_MD5Init+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -16838,40 +18954,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char MD5Init ();
- int
- main ()
- {
--MD5Init ();
-+return MD5Init ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -16880,14 +19008,15 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_md_MD5Init=no
-+ ac_cv_lib_md_MD5Init=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_md_MD5Init" >&5
--echo "${ECHO_T}$ac_cv_lib_md_MD5Init" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_md_MD5Init" >&5
-+echo "${ECHO_T}$ac_cv_lib_md_MD5Init" >&6; }
- if test $ac_cv_lib_md_MD5Init = yes; then
- LIBS="${LIBS} -lmd"
- else
-@@ -16902,13 +19031,13 @@
-
-
-
--# Check whether --with-lib-subdir or --without-lib-subdir was given.
-+# Check whether --with-lib-subdir was given.
- if test "${with_lib_subdir+set}" = set; then
-- withval="$with_lib_subdir"
-+ withval=$with_lib_subdir;
-+fi
-
--fi;
--echo "$as_me:$LINENO: checking for long" >&5
--echo $ECHO_N "checking for long... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for long" >&5
-+echo $ECHO_N "checking for long... $ECHO_C" >&6; }
- if test "${ac_cv_type_long+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -16919,36 +19048,49 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+typedef long ac__type_new_;
- int
- main ()
- {
--if ((long *) 0)
-+if ((ac__type_new_ *) 0)
- return 0;
--if (sizeof (long))
-+if (sizeof (ac__type_new_))
- 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
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -16957,23 +19099,23 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_type_long=no
-+ ac_cv_type_long=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
--echo "${ECHO_T}$ac_cv_type_long" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
-+echo "${ECHO_T}$ac_cv_type_long" >&6; }
-
--echo "$as_me:$LINENO: checking size of long" >&5
--echo $ECHO_N "checking size of long... $ECHO_C" >&6
-+# The cast to long int works around a bug in the HP C Compiler
-+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+# This bug is HP SR number 8606223364.
-+{ echo "$as_me:$LINENO: checking size of long" >&5
-+echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
- if test "${ac_cv_sizeof_long+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-- if test "$ac_cv_type_long" = yes; then
-- # The cast to unsigned long works around a bug in the HP C Compiler
-- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-- # This bug is HP SR number 8606223364.
- if test "$cross_compiling" = yes; then
- # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
-@@ -16983,10 +19125,12 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef long ac__type_sizeof_;
-+
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
- test_array [0] = 0
-
- ;
-@@ -16994,24 +19138,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -17024,10 +19180,12 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef long ac__type_sizeof_;
-+
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -17035,24 +19193,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -17061,30 +19231,33 @@
- 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`
-+ 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
-+
-+rm -f core 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
-+ 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
-+ typedef long ac__type_sizeof_;
-+
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
- test_array [0] = 0
-
- ;
-@@ -17092,24 +19265,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -17122,10 +19307,12 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef long ac__type_sizeof_;
-+
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -17133,24 +19320,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -17159,24 +19358,27 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_hi=`expr '(' $ac_mid ')' - 1`
-- if test $ac_mid -le $ac_hi; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid`
-+ ac_hi=`expr '(' $ac_mid ')' - 1`
-+ if test $ac_mid -le $ac_hi; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core 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=
-+ ac_lo= ac_hi=
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- # 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`
-@@ -17187,10 +19389,12 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
-+ typedef long ac__type_sizeof_;
-+
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
-
- ;
-@@ -17198,24 +19402,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -17224,26 +19440,24 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_lo=`expr '(' $ac_mid ')' + 1`
-+ ac_lo=`expr '(' $ac_mid ')' + 1`
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof_long=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-+'') if test "$ac_cv_type_long" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (long), 77
-+echo "$as_me: error: cannot compute sizeof (long)
- See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; } ;;
-+ { (exit 77); exit 77; }; }
-+ else
-+ ac_cv_sizeof_long=0
-+ fi ;;
+@@ -10987,8 +10736,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -11048,8 +10796,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -11295,8 +11042,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -11389,8 +11135,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -11498,8 +11243,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -11569,8 +11313,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -11680,8 +11423,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -11749,8 +11491,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -11819,8 +11560,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -11949,8 +11689,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -12065,8 +11804,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -12145,8 +11883,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -12278,8 +12015,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -12368,8 +12104,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -12478,8 +12213,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -12625,8 +12359,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -12739,8 +12472,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -12811,8 +12543,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -12881,8 +12612,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -13036,8 +12766,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -13162,8 +12891,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -13338,8 +13066,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -13400,8 +13127,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -13544,8 +13270,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -13985,8 +13710,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -14148,8 +13872,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -14215,8 +13938,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -14317,8 +14039,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -14383,8 +14104,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -14517,8 +14237,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -14661,8 +14380,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -14832,8 +14550,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -14922,8 +14639,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -14999,8 +14715,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -15069,8 +14784,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -15164,8 +14878,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -15232,8 +14945,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -15318,8 +15030,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -15577,8 +15288,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -15682,8 +15392,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -15801,8 +15510,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -15939,8 +15647,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -16131,8 +15838,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -16269,8 +15975,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -16415,8 +16120,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -16606,8 +16310,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -16796,8 +16499,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -16862,8 +16564,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -16939,8 +16640,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -17002,8 +16702,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -17043,8 +16742,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -17100,8 +16798,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -17141,8 +16838,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -17206,8 +16902,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -17238,10 +16933,8 @@
esac
else
-- if test "$cross_compiling" = yes; then
+ if test "$cross_compiling" = yes; then
- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run test program while cross compiling
-See \`config.log' for more details." >&2;}
-- { (exit 1); exit 1; }; }
--else
++ { { 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
-@@ -17251,8 +19465,10 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
- $ac_includes_default
--long longval () { return (long) (sizeof (long)); }
--unsigned long ulongval () { return (long) (sizeof (long)); }
-+ typedef long ac__type_sizeof_;
-+
-+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
- #include <stdio.h>
- #include <stdlib.h>
- int
-@@ -17261,35 +19477,44 @@
-
- FILE *f = fopen ("conftest.val", "w");
- if (! f)
-- exit (1);
-- if (((long) (sizeof (long))) < 0)
-+ return 1;
-+ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
- {
-- long i = longval ();
-- if (i != ((long) (sizeof (long))))
-- exit (1);
-+ long int i = longval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%ld\n", i);
- }
- else
- {
-- unsigned long i = ulongval ();
-- if (i != ((long) (sizeof (long))))
-- exit (1);
-+ unsigned long int i = ulongval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
- fprintf (f, "%lu\n", i);
- }
-- exit (ferror (f) || fclose (f) != 0);
-+ return 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
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -17300,29 +19525,32 @@
- sed 's/^/| /' conftest.$ac_ext >&5
-
- ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-+if test "$ac_cv_type_long" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (long), 77
-+echo "$as_me: error: cannot compute sizeof (long)
- 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
-+ { (exit 77); exit 77; }; }
-+ else
-+ ac_cv_sizeof_long=0
-+ fi
- fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
--else
-- ac_cv_sizeof_long=0
- fi
--fi
--echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
--echo "${ECHO_T}$ac_cv_sizeof_long" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
-+
-+
-+
- cat >>confdefs.h <<_ACEOF
- #define SIZEOF_LONG $ac_cv_sizeof_long
- _ACEOF
-
-
--echo "$as_me:$LINENO: checking what directory libraries are found in" >&5
--echo $ECHO_N "checking what directory libraries are found in... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking what directory libraries are found in" >&5
-+echo $ECHO_N "checking what directory libraries are found in... $ECHO_C" >&6; }
- if test "${ac_cv_cmu_lib_subdir+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -17340,8 +19568,8 @@
- ac_cv_cmu_lib_subdir=$with_lib_subdir
- fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_cmu_lib_subdir" >&5
--echo "${ECHO_T}$ac_cv_cmu_lib_subdir" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_cmu_lib_subdir" >&5
-+echo "${ECHO_T}$ac_cv_cmu_lib_subdir" >&6; }
- CMU_LIB_SUBDIR=$ac_cv_cmu_lib_subdir
-
-
-@@ -17349,21 +19577,21 @@
-
-
-
--# Check whether --with-libwrap or --without-libwrap was given.
-+# Check whether --with-libwrap was given.
- if test "${with_libwrap+set}" = set; then
-- withval="$with_libwrap"
-- with_libwrap=$withval
-+ withval=$with_libwrap; with_libwrap=$withval
- else
- with_libwrap=yes
--fi;
-+fi
-+
- if test "$with_libwrap" != no; then
- if test -d "$with_libwrap"; then
- CPPFLAGS="$CPPFLAGS -I${with_libwrap}/include"
- LDFLAGS="$LDFLAGS -L${with_libwrap}/$CMU_LIB_SUBDIR"
- fi
- cmu_save_LIBS="$LIBS"
-- echo "$as_me:$LINENO: checking for request_init in -lwrap" >&5
--echo $ECHO_N "checking for request_init in -lwrap... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for request_init in -lwrap" >&5
-+echo $ECHO_N "checking for request_init in -lwrap... $ECHO_C" >&6; }
- if test "${ac_cv_lib_wrap_request_init+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -17376,40 +19604,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char request_init ();
- int
- main ()
- {
--request_init ();
-+return request_init ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -17418,28 +19658,29 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_wrap_request_init=no
-+ ac_cv_lib_wrap_request_init=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_wrap_request_init" >&5
--echo "${ECHO_T}$ac_cv_lib_wrap_request_init" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_wrap_request_init" >&5
-+echo "${ECHO_T}$ac_cv_lib_wrap_request_init" >&6; }
- if test $ac_cv_lib_wrap_request_init = yes; then
-
- if test "${ac_cv_header_tcpd_h+set}" = set; then
-- echo "$as_me:$LINENO: checking for tcpd.h" >&5
--echo $ECHO_N "checking for tcpd.h... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for tcpd.h" >&5
-+echo $ECHO_N "checking for tcpd.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_tcpd_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_tcpd_h" >&5
--echo "${ECHO_T}$ac_cv_header_tcpd_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_tcpd_h" >&5
-+echo "${ECHO_T}$ac_cv_header_tcpd_h" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking tcpd.h usability" >&5
--echo $ECHO_N "checking tcpd.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking tcpd.h usability" >&5
-+echo $ECHO_N "checking tcpd.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -17450,24 +19691,36 @@
- #include <tcpd.h>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -17476,15 +19729,16 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking tcpd.h presence" >&5
--echo $ECHO_N "checking tcpd.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking tcpd.h presence" >&5
-+echo $ECHO_N "checking tcpd.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -17493,8 +19747,13 @@
- /* end confdefs.h. */
- #include <tcpd.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
-@@ -17518,9 +19777,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -17544,25 +19804,18 @@
- echo "$as_me: WARNING: tcpd.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: tcpd.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: tcpd.h: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for tcpd.h" >&5
--echo $ECHO_N "checking for tcpd.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for tcpd.h" >&5
-+echo $ECHO_N "checking for tcpd.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_tcpd_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_header_tcpd_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_tcpd_h" >&5
--echo "${ECHO_T}$ac_cv_header_tcpd_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_tcpd_h" >&5
-+echo "${ECHO_T}$ac_cv_header_tcpd_h" >&6; }
-
- fi
- if test $ac_cv_header_tcpd_h = yes; then
-@@ -17578,10 +19831,10 @@
-
- LIBS="$cmu_save_LIBS"
- fi
-- echo "$as_me:$LINENO: checking libwrap support" >&5
--echo $ECHO_N "checking libwrap support... $ECHO_C" >&6
-- echo "$as_me:$LINENO: result: $with_libwrap" >&5
--echo "${ECHO_T}$with_libwrap" >&6
-+ { echo "$as_me:$LINENO: checking libwrap support" >&5
-+echo $ECHO_N "checking libwrap support... $ECHO_C" >&6; }
-+ { echo "$as_me:$LINENO: result: $with_libwrap" >&5
-+echo "${ECHO_T}$with_libwrap" >&6; }
- LIB_WRAP=""
- if test "$with_libwrap" != no; then
-
-@@ -17590,8 +19843,8 @@
- _ACEOF
-
- LIB_WRAP="-lwrap"
-- echo "$as_me:$LINENO: checking for yp_get_default_domain in -lnsl" >&5
--echo $ECHO_N "checking for yp_get_default_domain in -lnsl... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for yp_get_default_domain in -lnsl" >&5
-+echo $ECHO_N "checking for yp_get_default_domain in -lnsl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_nsl_yp_get_default_domain+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -17604,40 +19857,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char yp_get_default_domain ();
- int
- main ()
- {
--yp_get_default_domain ();
-+return yp_get_default_domain ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -17646,14 +19911,15 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_nsl_yp_get_default_domain=no
-+ ac_cv_lib_nsl_yp_get_default_domain=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_yp_get_default_domain" >&5
--echo "${ECHO_T}$ac_cv_lib_nsl_yp_get_default_domain" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_yp_get_default_domain" >&5
-+echo "${ECHO_T}$ac_cv_lib_nsl_yp_get_default_domain" >&6; }
- if test $ac_cv_lib_nsl_yp_get_default_domain = yes; then
- LIB_WRAP="${LIB_WRAP} -lnsl"
- fi
-@@ -17665,28 +19931,28 @@
-
-
-
--# Check whether --with-snmp or --without-snmp was given.
-+# Check whether --with-snmp was given.
- if test "${with_snmp+set}" = set; then
-- withval="$with_snmp"
-- with_snmp=$withval
-+ withval=$with_snmp; with_snmp=$withval
- else
- with_snmp=yes
--fi;
-+fi
-
-
--# Check whether --with-ucdsnmp or --without-ucdsnmp was given.
-+
-+# Check whether --with-ucdsnmp was given.
- if test "${with_ucdsnmp+set}" = set; then
-- withval="$with_ucdsnmp"
-- with_snmp=$withval
--fi;
-+ withval=$with_ucdsnmp; with_snmp=$withval
-+fi
-+
-
- if test "$with_snmp" != "no"; then
-
- if test "$with_snmp" = "yes"; then
- # Extract the first word of "net-snmp-config", so it can be a program name with args.
- set dummy net-snmp-config; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_path_SNMP_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -17702,34 +19968,35 @@
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_SNMP_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
- done
-+IFS=$as_save_IFS
-
- ;;
- esac
- fi
- SNMP_CONFIG=$ac_cv_path_SNMP_CONFIG
--
- if test -n "$SNMP_CONFIG"; then
-- echo "$as_me:$LINENO: result: $SNMP_CONFIG" >&5
--echo "${ECHO_T}$SNMP_CONFIG" >&6
-+ { echo "$as_me:$LINENO: result: $SNMP_CONFIG" >&5
-+echo "${ECHO_T}$SNMP_CONFIG" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- fi
-
-+
- else
- SNMP_CONFIG="$with_snmp/bin/net-snmp-config"
- fi
-
- if test -x "$SNMP_CONFIG"; then
-- echo "$as_me:$LINENO: checking NET SNMP libraries" >&5
--echo $ECHO_N "checking NET SNMP libraries... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking NET SNMP libraries" >&5
-+echo $ECHO_N "checking NET SNMP libraries... $ECHO_C" >&6; }
-
- SNMP_LIBS=`$SNMP_CONFIG --agent-libs`
- SNMP_PREFIX=`$SNMP_CONFIG --prefix`
-@@ -17743,11 +20010,11 @@
- _ACEOF
-
-
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- { echo "$as_me:$LINENO: WARNING: Could not find the required paths. Please check your net-snmp installation." >&5
- echo "$as_me: WARNING: Could not find the required paths. Please check your net-snmp installation." >&2;}
- fi
-@@ -17758,8 +20025,8 @@
- LDFLAGS="$LDFLAGS -L${with_snmp}/$CMU_LIB_SUBDIR"
- fi
- cmu_save_LIBS="$LIBS"
-- echo "$as_me:$LINENO: checking for sprint_objid in -lsnmp" >&5
--echo $ECHO_N "checking for sprint_objid in -lsnmp... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for sprint_objid in -lsnmp" >&5
-+echo $ECHO_N "checking for sprint_objid in -lsnmp... $ECHO_C" >&6; }
- if test "${ac_cv_lib_snmp_sprint_objid+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -17772,40 +20039,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char sprint_objid ();
- int
- main ()
- {
--sprint_objid ();
-+return sprint_objid ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -17814,28 +20093,29 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_snmp_sprint_objid=no
-+ ac_cv_lib_snmp_sprint_objid=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_snmp_sprint_objid" >&5
--echo "${ECHO_T}$ac_cv_lib_snmp_sprint_objid" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_snmp_sprint_objid" >&5
-+echo "${ECHO_T}$ac_cv_lib_snmp_sprint_objid" >&6; }
- if test $ac_cv_lib_snmp_sprint_objid = yes; then
-
- if test "${ac_cv_header_ucd_snmp_version_h+set}" = set; then
-- echo "$as_me:$LINENO: checking for ucd-snmp/version.h" >&5
--echo $ECHO_N "checking for ucd-snmp/version.h... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for ucd-snmp/version.h" >&5
-+echo $ECHO_N "checking for ucd-snmp/version.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_ucd_snmp_version_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_ucd_snmp_version_h" >&5
--echo "${ECHO_T}$ac_cv_header_ucd_snmp_version_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_ucd_snmp_version_h" >&5
-+echo "${ECHO_T}$ac_cv_header_ucd_snmp_version_h" >&6; }
- else
- # Is the header compilable?
--echo "$as_me:$LINENO: checking ucd-snmp/version.h usability" >&5
--echo $ECHO_N "checking ucd-snmp/version.h usability... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking ucd-snmp/version.h usability" >&5
-+echo $ECHO_N "checking ucd-snmp/version.h usability... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -17846,24 +20126,36 @@
- #include <ucd-snmp/version.h>
- _ACEOF
- rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -17872,15 +20164,16 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_header_compiler=no
-+ ac_header_compiler=no
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-+echo "${ECHO_T}$ac_header_compiler" >&6; }
-
- # Is the header present?
--echo "$as_me:$LINENO: checking ucd-snmp/version.h presence" >&5
--echo $ECHO_N "checking ucd-snmp/version.h presence... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking ucd-snmp/version.h presence" >&5
-+echo $ECHO_N "checking ucd-snmp/version.h presence... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -17889,8 +20182,13 @@
- /* end confdefs.h. */
- #include <ucd-snmp/version.h>
- _ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
-@@ -17914,9 +20212,10 @@
-
- ac_header_preproc=no
- fi
-+
- rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-
- # So? What about this header?
- case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -17940,25 +20239,18 @@
- echo "$as_me: WARNING: ucd-snmp/version.h: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: ucd-snmp/version.h: in the future, the compiler will take precedence" >&5
- echo "$as_me: WARNING: ucd-snmp/version.h: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-+
- ;;
- esac
--echo "$as_me:$LINENO: checking for ucd-snmp/version.h" >&5
--echo $ECHO_N "checking for ucd-snmp/version.h... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for ucd-snmp/version.h" >&5
-+echo $ECHO_N "checking for ucd-snmp/version.h... $ECHO_C" >&6; }
- if test "${ac_cv_header_ucd_snmp_version_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_cv_header_ucd_snmp_version_h=$ac_header_preproc
- fi
--echo "$as_me:$LINENO: result: $ac_cv_header_ucd_snmp_version_h" >&5
--echo "${ECHO_T}$ac_cv_header_ucd_snmp_version_h" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_ucd_snmp_version_h" >&5
-+echo "${ECHO_T}$ac_cv_header_ucd_snmp_version_h" >&6; }
-
- fi
- if test $ac_cv_header_ucd_snmp_version_h = yes; then
-@@ -17974,10 +20266,10 @@
-
- LIBS="$cmu_save_LIBS"
- fi
-- echo "$as_me:$LINENO: checking UCD SNMP libraries" >&5
--echo $ECHO_N "checking UCD SNMP libraries... $ECHO_C" >&6
-- echo "$as_me:$LINENO: result: $with_snmp" >&5
--echo "${ECHO_T}$with_snmp" >&6
-+ { echo "$as_me:$LINENO: checking UCD SNMP libraries" >&5
-+echo $ECHO_N "checking UCD SNMP libraries... $ECHO_C" >&6; }
-+ { echo "$as_me:$LINENO: result: $with_snmp" >&5
-+echo "${ECHO_T}$with_snmp" >&6; }
- LIB_UCDSNMP=""
- if test "$with_snmp" != no; then
-
-@@ -17986,8 +20278,8 @@
- _ACEOF
-
- LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
-- echo "$as_me:$LINENO: checking for rpmdbOpen in -lrpm" >&5
--echo $ECHO_N "checking for rpmdbOpen in -lrpm... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking for rpmdbOpen in -lrpm" >&5
-+echo $ECHO_N "checking for rpmdbOpen in -lrpm... $ECHO_C" >&6; }
- if test "${ac_cv_lib_rpm_rpmdbOpen+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -18000,40 +20292,52 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
--/* Override any gcc2 internal prototype to avoid an error. */
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
- #ifdef __cplusplus
- extern "C"
- #endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
- char rpmdbOpen ();
- int
- main ()
- {
--rpmdbOpen ();
-+return rpmdbOpen ();
- ;
- return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&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
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
-@@ -18042,14 +20346,15 @@
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--ac_cv_lib_rpm_rpmdbOpen=no
-+ ac_cv_lib_rpm_rpmdbOpen=no
- fi
--rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_rpm_rpmdbOpen" >&5
--echo "${ECHO_T}$ac_cv_lib_rpm_rpmdbOpen" >&6
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_rpm_rpmdbOpen" >&5
-+echo "${ECHO_T}$ac_cv_lib_rpm_rpmdbOpen" >&6; }
- if test $ac_cv_lib_rpm_rpmdbOpen = yes; then
- LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt"
- fi
-@@ -18108,7 +20413,8 @@
-
-
-
-- ac_config_files="$ac_config_files man/Makefile master/Makefile lib/Makefile imap/Makefile imtest/Makefile netnews/Makefile perl/Makefile $EXTRA_OUTPUT Makefile"
-+ac_config_files="$ac_config_files man/Makefile master/Makefile lib/Makefile imap/Makefile imtest/Makefile netnews/Makefile perl/Makefile $EXTRA_OUTPUT Makefile"
-+
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
- # tests run on this system so they can be shared between configure
-@@ -18127,39 +20433,58 @@
-
- # The following way of writing the cache mishandles newlines in values,
- # but we know of no workaround that is simple, portable, and efficient.
--# So, don't put newlines in cache variables' values.
-+# So, we kill variables containing newlines.
- # Ultrix sh set writes to stderr and can't be redirected directly,
- # and sets the high bit in the cache file unless we assign to the vars.
--{
-+(
-+ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-+ eval ac_val=\$$ac_var
-+ case $ac_val in #(
-+ *${as_nl}*)
-+ case $ac_var in #(
-+ *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
-+ esac
-+ case $ac_var in #(
-+ _ | IFS | as_nl) ;; #(
-+ *) $as_unset $ac_var ;;
-+ esac ;;
-+ esac
-+ done
-+
- (set) 2>&1 |
-- case `(ac_space=' '; set | grep ac_space) 2>&1` in
-- *ac_space=\ *)
-+ case $as_nl`(ac_space=' '; set) 2>&1` in #(
-+ *${as_nl}ac_space=\ *)
- # `set' does not quote correctly, so add quotes (double-quote
- # substitution turns \\\\ into \\, and sed turns \\ into \).
- sed -n \
- "s/'/'\\\\''/g;
- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-- ;;
-+ ;; #(
- *)
- # `set' quotes correctly as required by POSIX, so do not add quotes.
-- sed -n \
-- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
- ;;
-- esac;
--} |
-+ esac |
-+ sort
-+) |
- sed '
-+ /^ac_cv_env_/b end
- t clear
-- : clear
-+ :clear
- s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
- t end
-- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-- : end' >>confcache
--if diff $cache_file confcache >/dev/null 2>&1; then :; else
-- if test -w $cache_file; then
-- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-+ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+ :end' >>confcache
-+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-+ if test -w "$cache_file"; then
-+ test "x$cache_file" != "x/dev/null" &&
-+ { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-+echo "$as_me: updating cache $cache_file" >&6;}
- cat confcache >$cache_file
- else
-- echo "not updating unwritable cache $cache_file"
-+ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-+echo "$as_me: not updating unwritable cache $cache_file" >&6;}
- fi
- fi
- rm -f confcache
-@@ -18168,32 +20493,18 @@
- # Let make expand exec_prefix.
- test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
--# VPATH may cause trouble with some makes, so we remove $(srcdir),
--# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
--# trailing colons and then remove the whole line if VPATH becomes empty
--# (actually we leave an empty line to preserve line numbers).
--if test "x$srcdir" = x.; then
-- ac_vpsub='/^[ ]*VPATH[ ]*=/{
--s/:*\$(srcdir):*/:/;
--s/:*\${srcdir}:*/:/;
--s/:*@srcdir@:*/:/;
--s/^\([^=]*=[ ]*\):*/\1/;
--s/:*$//;
--s/^[^=]*=[ ]*$//;
--}'
--fi
--
- DEFS=-DHAVE_CONFIG_H
-
- ac_libobjs=
- ac_ltlibobjs=
- for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
- # 1. Remove the extension, and $U if already installed.
-- ac_i=`echo "$ac_i" |
-- sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-- # 2. Add them.
-- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-+ ac_i=`echo "$ac_i" | sed "$ac_script"`
-+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
-+ # will be set to the directory where LIBOBJS objects are built.
-+ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-+ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
- done
- LIBOBJS=$ac_libobjs
-
-@@ -18231,11 +20542,35 @@
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
--elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-- set -o posix
-+ setopt NO_GLOB_SUBST
-+else
-+ case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
- fi
-+BIN_SH=xpg4; export BIN_SH # for Tru64
- DUALCASE=1; export DUALCASE # for MKS sh
-
-+
-+# PATH needs CR
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+ echo "#! /bin/sh" >conf$$.sh
-+ echo "exit 0" >>conf$$.sh
-+ chmod +x conf$$.sh
-+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-+ PATH_SEPARATOR=';'
-+ else
-+ PATH_SEPARATOR=:
-+ fi
-+ rm -f conf$$.sh
-+fi
-+
- # Support unset when possible.
- if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
- as_unset=unset
-@@ -18244,8 +20579,43 @@
- fi
-
-
-+# IFS
-+# We need space, tab and new line, in precisely that order. Quoting is
-+# there to prevent editors from complaining about space-tab.
-+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-+# splitting by setting IFS to empty value.)
-+as_nl='
-+'
-+IFS=" "" $as_nl"
-+
-+# Find who we are. Look in the path if we contain no directory separator.
-+case $0 in
-+ *[\\/]* ) as_myself=$0 ;;
-+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+done
-+IFS=$as_save_IFS
-+
-+ ;;
-+esac
-+# We did not find ourselves, most probably we were run as `sh COMMAND'
-+# in which case we are not to be found in the path.
-+if test "x$as_myself" = x; then
-+ as_myself=$0
-+fi
-+if test ! -f "$as_myself"; then
-+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
-+ { (exit 1); exit 1; }
-+fi
-+
- # Work around bugs in pre-3.0 UWIN ksh.
--$as_unset ENV MAIL MAILPATH
-+for as_var in ENV MAIL MAILPATH
-+do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+done
- PS1='$ '
- PS2='> '
- PS4='+ '
-@@ -18259,18 +20629,19 @@
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
- eval $as_var=C; export $as_var
- else
-- $as_unset $as_var
-+ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- fi
- done
-
- # Required to use basename.
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
- else
- as_expr=false
- fi
-
--if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
- as_basename=basename
- else
- as_basename=false
-@@ -18278,159 +20649,120 @@
-
-
- # Name of the executable.
--as_me=`$as_basename "$0" ||
-+as_me=`$as_basename -- "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
-- X"$0" : 'X\(/\)$' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
- echo X/"$0" |
-- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-- /^X\/\(\/\/\)$/{ s//\1/; q; }
-- /^X\/\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
--
--
--# PATH needs CR, and LINENO needs CR and PATH.
--# Avoid depending upon Character Ranges.
--as_cr_letters='abcdefghijklmnopqrstuvwxyz'
--as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
--as_cr_Letters=$as_cr_letters$as_cr_LETTERS
--as_cr_digits='0123456789'
--as_cr_alnum=$as_cr_Letters$as_cr_digits
-+ sed '/^.*\/\([^/][^/]*\)\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\/\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\/\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'`
-
--# The user is always right.
--if test "${PATH_SEPARATOR+set}" != set; then
-- echo "#! /bin/sh" >conf$$.sh
-- echo "exit 0" >>conf$$.sh
-- chmod +x conf$$.sh
-- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-- PATH_SEPARATOR=';'
-- else
-- PATH_SEPARATOR=:
-- fi
-- rm -f conf$$.sh
--fi
-+# CDPATH.
-+$as_unset CDPATH
-
-
-- as_lineno_1=$LINENO
-- as_lineno_2=$LINENO
-- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-- test "x$as_lineno_1" != "x$as_lineno_2" &&
-- test "x$as_lineno_3" = "x$as_lineno_2" || {
-- # Find who we are. Look in the path if we contain no path at all
-- # relative or not.
-- case $0 in
-- *[\\/]* ) as_myself=$0 ;;
-- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
--done
-
-- ;;
-- esac
-- # We did not find ourselves, most probably we were run as `sh COMMAND'
-- # in which case we are not to be found in the path.
-- if test "x$as_myself" = x; then
-- as_myself=$0
-- fi
-- if test ! -f "$as_myself"; then
-- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
--echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-- { (exit 1); exit 1; }; }
-- fi
-- case $CONFIG_SHELL in
-- '')
-- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for as_base in sh bash ksh sh5; do
-- case $as_dir in
-- /*)
-- if ("$as_dir/$as_base" -c '
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
-- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
- test "x$as_lineno_1" != "x$as_lineno_2" &&
-- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
-- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-- CONFIG_SHELL=$as_dir/$as_base
-- export CONFIG_SHELL
-- exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-- fi;;
-- esac
-- done
--done
--;;
-- esac
-+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
-
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
-- # line-number line before each line; the second 'sed' does the real
-- # work. The second script uses 'N' to pair each line-number line
-- # with the numbered line, and appends trailing '-' during
-- # substitution so that $LINENO is not a special case at line end.
-+ # line-number line after each line using $LINENO; the second 'sed'
-+ # does the real work. The second script uses 'N' to pair each
-+ # line-number line with the line containing $LINENO, and appends
-+ # trailing '-' during substitution so that $LINENO is not a special
-+ # case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
-- sed '=' <$as_myself |
-+ # scripts with optimization help from Paolo Bonzini. Blame Lee
-+ # E. McMahon (1931-1989) for sed's syntax. :-)
-+ sed -n '
-+ p
-+ /[$]LINENO/=
-+ ' <$as_myself |
- sed '
-+ s/[$]LINENO.*/&-/
-+ t lineno
-+ b
-+ :lineno
- N
-- s,$,-,
-- : loop
-- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-+ :loop
-+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
- t loop
-- s,-$,,
-- s,^['$as_cr_digits']*\n,,
-+ s/-\n.*//
- ' >$as_me.lineno &&
-- chmod +x $as_me.lineno ||
-- { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
--echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-+ chmod +x "$as_me.lineno" ||
-+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
- { (exit 1); exit 1; }; }
-
- # Don't try to exec as it changes $[0], causing all sort of problems
- # (the dirname of $[0] is not the place where we might find the
-- # original and so on. Autoconf is especially sensible to this).
-- . ./$as_me.lineno
-+ # original and so on. Autoconf is especially sensitive to this).
-+ . "./$as_me.lineno"
- # Exit status is that of the last command.
- exit
- }
-
-
--case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-- *c*,-n*) ECHO_N= ECHO_C='
--' ECHO_T=' ' ;;
-- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
-+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-+ as_dirname=dirname
-+else
-+ as_dirname=false
-+fi
-+
-+ECHO_C= ECHO_N= ECHO_T=
-+case `echo -n x` in
-+-n*)
-+ case `echo 'x\c'` in
-+ *c*) ECHO_T=' ';; # ECHO_T is single tab character.
-+ *) ECHO_C='\c';;
-+ esac;;
-+*)
-+ ECHO_N='-n';;
- esac
-
--if expr a : '\(a\)' >/dev/null 2>&1; then
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+ test "X`expr 00001 : '.*\(...\)'`" = X001; then
- as_expr=expr
- else
- as_expr=false
- fi
-
- rm -f conf$$ conf$$.exe conf$$.file
-+if test -d conf$$.dir; then
-+ rm -f conf$$.dir/conf$$.file
-+else
-+ rm -f conf$$.dir
-+ mkdir conf$$.dir
-+fi
- echo >conf$$.file
- if ln -s conf$$.file conf$$ 2>/dev/null; then
-- # We could just check for DJGPP; but this test a) works b) is more generic
-- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-- if test -f conf$$.exe; then
-- # Don't use ln at all; we don't have any links
-+ as_ln_s='ln -s'
-+ # ... but there are two gotchas:
-+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-+ # In both cases, we have to default to `cp -p'.
-+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
- as_ln_s='cp -p'
-- else
-- as_ln_s='ln -s'
-- fi
- elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
- else
- as_ln_s='cp -p'
- fi
--rm -f conf$$ conf$$.exe conf$$.file
-+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-+rmdir conf$$.dir 2>/dev/null
-
- if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
-@@ -18439,7 +20771,19 @@
- as_mkdir_p=false
- fi
-
--as_executable_p="test -f"
-+# Find out whether ``test -x'' works. Don't use a zero-byte file, as
-+# systems may use methods other than mode bits to determine executability.
-+cat >conf$$.file <<_ASEOF
-+#! /bin/sh
-+exit 0
-+_ASEOF
-+chmod +x conf$$.file
-+if test -x conf$$.file >/dev/null 2>&1; then
-+ as_executable_p="test -x"
-+else
-+ as_executable_p=:
-+fi
-+rm -f conf$$.file
-
- # Sed expression to map a string onto a valid CPP name.
- as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -18448,31 +20792,14 @@
- as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
--# IFS
--# We need space, tab and new line, in precisely that order.
--as_nl='
--'
--IFS=" $as_nl"
--
--# CDPATH.
--$as_unset CDPATH
--
- exec 6>&1
-
--# Open the log real soon, to keep \$[0] and so on meaningful, and to
-+# Save the log message, to keep $[0] and so on meaningful, and to
- # report actual input values of CONFIG_FILES etc. instead of their
--# values after options handling. Logging --version etc. is OK.
--exec 5>>config.log
--{
-- echo
-- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
--## Running $as_me. ##
--_ASBOX
--} >&5
--cat >&5 <<_CSEOF
--
-+# values after options handling.
-+ac_log="
- This file was extended by $as_me, which was
--generated by GNU Autoconf 2.59. Invocation command line was
-+generated by GNU Autoconf 2.60a. Invocation command line was
-
- CONFIG_FILES = $CONFIG_FILES
- CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -18480,30 +20807,19 @@
- CONFIG_COMMANDS = $CONFIG_COMMANDS
- $ $0 $@
-
--_CSEOF
--echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
--echo >&5
-+on `(hostname || uname -n) 2>/dev/null | sed 1q`
-+"
-+
- _ACEOF
-
-+cat >>$CONFIG_STATUS <<_ACEOF
- # Files that config.status was made for.
--if test -n "$ac_config_files"; then
-- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
--fi
--
--if test -n "$ac_config_headers"; then
-- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
--fi
--
--if test -n "$ac_config_links"; then
-- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
--fi
-+config_files="$ac_config_files"
-+config_headers="$ac_config_headers"
-
--if test -n "$ac_config_commands"; then
-- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
--fi
-+_ACEOF
-
- cat >>$CONFIG_STATUS <<\_ACEOF
--
- ac_cs_usage="\
- \`$as_me' instantiates files from templates according to the
- current configuration.
-@@ -18511,7 +20827,7 @@
- Usage: $0 [OPTIONS] [FILE]...
-
- -h, --help print this help, then exit
-- -V, --version print version number, then exit
-+ -V, --version print version number and configuration settings, then exit
- -q, --quiet do not print progress messages
- -d, --debug don't remove temporary files
- --recheck update $as_me by reconfiguring in the same conditions
-@@ -18527,19 +20843,21 @@
- $config_headers
-
- Report bugs to <bug-autoconf at gnu.org>."
--_ACEOF
-
-+_ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
- ac_cs_version="\\
- config.status
--configured by $0, generated by GNU Autoconf 2.59,
-- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-+configured by $0, generated by GNU Autoconf 2.60a,
-+ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-
--Copyright (C) 2003 Free Software Foundation, Inc.
-+Copyright (C) 2006 Free Software Foundation, Inc.
- This config.status script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it."
--srcdir=$srcdir
--INSTALL="$INSTALL"
-+
-+ac_pwd='$ac_pwd'
-+srcdir='$srcdir'
-+INSTALL='$INSTALL'
- _ACEOF
-
- cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -18550,39 +20868,24 @@
- do
- case $1 in
- --*=*)
-- ac_option=`expr "x$1" : 'x\([^=]*\)='`
-- ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-+ ac_option=`expr "X$1" : 'X\([^=]*\)='`
-+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
- ac_shift=:
- ;;
-- -*)
-+ *)
- ac_option=$1
- ac_optarg=$2
- ac_shift=shift
- ;;
-- *) # This is not an option, so the user has probably given explicit
-- # arguments.
-- ac_option=$1
-- ac_need_defaults=false;;
+@@ -17400,8 +17093,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -17458,8 +17150,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -17628,8 +17319,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -17796,8 +17486,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -17854,8 +17543,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -18024,8 +17712,7 @@
+ 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'
++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+@@ -18736,6 +18423,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
+@@ -18982,11 +18670,6 @@
+ *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
esac
-
- case $ac_option in
- # Handling of the options.
--_ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
- -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
- ac_cs_recheck=: ;;
-- --version | --vers* | -V )
-- echo "$ac_cs_version"; exit 0 ;;
-- --he | --h)
-- # Conflict between --help and --header
-- { { echo "$as_me:$LINENO: error: ambiguous option: $1
--Try \`$0 --help' for more information." >&5
--echo "$as_me: error: ambiguous option: $1
--Try \`$0 --help' for more information." >&2;}
-- { (exit 1); exit 1; }; };;
-- --help | --hel | -h )
-- echo "$ac_cs_usage"; exit 0 ;;
-- --debug | --d* | -d )
-+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-+ echo "$ac_cs_version"; exit ;;
-+ --debug | --debu | --deb | --de | --d | -d )
- debug=: ;;
- --file | --fil | --fi | --f )
- $ac_shift
-@@ -18592,18 +20895,24 @@
- $ac_shift
- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
- ac_need_defaults=false;;
-+ --he | --h)
-+ # Conflict between --help and --header
-+ { echo "$as_me: error: ambiguous option: $1
-+Try \`$0 --help' for more information." >&2
-+ { (exit 1); exit 1; }; };;
-+ --help | --hel | -h )
-+ echo "$ac_cs_usage"; exit ;;
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil | --si | --s)
- ac_cs_silent=: ;;
-
- # This is an error.
-- -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
--Try \`$0 --help' for more information." >&5
--echo "$as_me: error: unrecognized option: $1
--Try \`$0 --help' for more information." >&2;}
-+ -*) { echo "$as_me: error: unrecognized option: $1
-+Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; } ;;
-
-- *) ac_config_targets="$ac_config_targets $1" ;;
-+ *) ac_config_targets="$ac_config_targets $1"
-+ ac_need_defaults=false ;;
-
- esac
- shift
-@@ -18619,37 +20928,51 @@
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
- if \$ac_cs_recheck; then
-- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-+ CONFIG_SHELL=$SHELL
-+ export CONFIG_SHELL
-+ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
- fi
-
- _ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+exec 5>>config.log
-+{
-+ echo
-+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-+## Running $as_me. ##
-+_ASBOX
-+ echo "$ac_log"
-+} >&5
-
--
--
--
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
-+_ACEOF
-
- cat >>$CONFIG_STATUS <<\_ACEOF
-+
-+# Handling of arguments.
- for ac_config_target in $ac_config_targets
- do
-- case "$ac_config_target" in
-- # Handling of arguments.
-- "man/Makefile" ) CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
-- "master/Makefile" ) CONFIG_FILES="$CONFIG_FILES master/Makefile" ;;
-- "lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
-- "imap/Makefile" ) CONFIG_FILES="$CONFIG_FILES imap/Makefile" ;;
-- "imtest/Makefile" ) CONFIG_FILES="$CONFIG_FILES imtest/Makefile" ;;
-- "netnews/Makefile" ) CONFIG_FILES="$CONFIG_FILES netnews/Makefile" ;;
-- "perl/Makefile" ) CONFIG_FILES="$CONFIG_FILES perl/Makefile" ;;
-- "$EXTRA_OUTPUT" ) CONFIG_FILES="$CONFIG_FILES $EXTRA_OUTPUT" ;;
-- "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-- "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-+ case $ac_config_target in
-+ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-+ "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
-+ "master/Makefile") CONFIG_FILES="$CONFIG_FILES master/Makefile" ;;
-+ "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
-+ "imap/Makefile") CONFIG_FILES="$CONFIG_FILES imap/Makefile" ;;
-+ "imtest/Makefile") CONFIG_FILES="$CONFIG_FILES imtest/Makefile" ;;
-+ "netnews/Makefile") CONFIG_FILES="$CONFIG_FILES netnews/Makefile" ;;
-+ "perl/Makefile") CONFIG_FILES="$CONFIG_FILES perl/Makefile" ;;
-+ "$EXTRA_OUTPUT") CONFIG_FILES="$CONFIG_FILES $EXTRA_OUTPUT" ;;
-+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-+
- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
- echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
- { (exit 1); exit 1; }; };;
- esac
- done
-
-+
- # If the user did not use the arguments to specify the items to instantiate,
- # then the envvar interface is used. Set only those that are not.
- # We use the long form for the default assignment because of an extremely
-@@ -18660,625 +20983,620 @@
- fi
-
- # Have a temporary directory for convenience. Make it in the build tree
--# simply because there is no reason to put it here, and in addition,
-+# simply because there is no reason against having it here, and in addition,
- # creating and moving files from /tmp can sometimes cause problems.
--# Create a temporary directory, and hook for its removal unless debugging.
-+# Hook for its removal unless debugging.
-+# Note that there is a small window in which the directory will not be cleaned:
-+# after its creation but before its name has been assigned to `$tmp'.
- $debug ||
- {
-- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-+ tmp=
-+ trap 'exit_status=$?
-+ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-+' 0
- trap '{ (exit 1); exit 1; }' 1 2 13 15
- }
--
- # Create a (secure) tmp directory for tmp files.
-
- {
-- tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
- test -n "$tmp" && test -d "$tmp"
- } ||
- {
-- tmp=./confstat$$-$RANDOM
-- (umask 077 && mkdir $tmp)
-+ tmp=./conf$$-$RANDOM
-+ (umask 077 && mkdir "$tmp")
- } ||
- {
- echo "$me: cannot create a temporary directory in ." >&2
- { (exit 1); exit 1; }
- }
-
--_ACEOF
--
--cat >>$CONFIG_STATUS <<_ACEOF
--
- #
--# CONFIG_FILES section.
-+# Set up the sed scripts for CONFIG_FILES section.
- #
-
- # No need to generate the scripts if there are no CONFIG_FILES.
- # This happens for instance when ./config.status config.h
--if test -n "\$CONFIG_FILES"; then
-- # Protect against being on the right side of a sed subst in config.status.
-- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
--s, at SHELL@,$SHELL,;t t
--s, at PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
--s, at PACKAGE_NAME@,$PACKAGE_NAME,;t t
--s, at PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
--s, at PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
--s, at PACKAGE_STRING@,$PACKAGE_STRING,;t t
--s, at PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
--s, at exec_prefix@,$exec_prefix,;t t
--s, at prefix@,$prefix,;t t
--s, at program_transform_name@,$program_transform_name,;t t
--s, at bindir@,$bindir,;t t
--s, at sbindir@,$sbindir,;t t
--s, at libexecdir@,$libexecdir,;t t
--s, at datadir@,$datadir,;t t
--s, at sysconfdir@,$sysconfdir,;t t
--s, at sharedstatedir@,$sharedstatedir,;t t
--s, at localstatedir@,$localstatedir,;t t
--s, at libdir@,$libdir,;t t
--s, at includedir@,$includedir,;t t
--s, at oldincludedir@,$oldincludedir,;t t
--s, at infodir@,$infodir,;t t
--s, at mandir@,$mandir,;t t
--s, at build_alias@,$build_alias,;t t
--s, at host_alias@,$host_alias,;t t
--s, at target_alias@,$target_alias,;t t
--s, at DEFS@,$DEFS,;t t
--s, at ECHO_C@,$ECHO_C,;t t
--s, at ECHO_N@,$ECHO_N,;t t
--s, at ECHO_T@,$ECHO_T,;t t
--s, at LIBS@,$LIBS,;t t
--s, at build@,$build,;t t
--s, at build_cpu@,$build_cpu,;t t
--s, at build_vendor@,$build_vendor,;t t
--s, at build_os@,$build_os,;t t
--s, at host@,$host,;t t
--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 MAKEDEPEND@,$MAKEDEPEND,;t t
--s, at cyrus_prefix@,$cyrus_prefix,;t t
--s, at service_path@,$service_path,;t t
--s, at cyrus_user@,$cyrus_user,;t t
--s, at cyrus_group@,$cyrus_group,;t t
--s, at CC@,$CC,;t t
--s, at CFLAGS@,$CFLAGS,;t t
--s, at LDFLAGS@,$LDFLAGS,;t t
--s, at CPPFLAGS@,$CPPFLAGS,;t t
--s, at ac_ct_CC@,$ac_ct_CC,;t t
--s, at EXEEXT@,$EXEEXT,;t t
--s, at OBJEXT@,$OBJEXT,;t t
--s, at RANLIB@,$RANLIB,;t t
--s, at ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
--s, at SET_MAKE@,$SET_MAKE,;t t
--s, at INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
--s, at INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
--s, at INSTALL_DATA@,$INSTALL_DATA,;t t
--s, at CPP@,$CPP,;t t
--s, at EGREP@,$EGREP,;t t
--s, at AWK@,$AWK,;t t
--s, at LIBOBJS@,$LIBOBJS,;t t
--s, at LIB_SOCKET@,$LIB_SOCKET,;t t
--s, at IPV6_OBJS@,$IPV6_OBJS,;t t
--s, at PRE_SUBDIRS@,$PRE_SUBDIRS,;t t
--s, at EXTRA_SUBDIRS@,$EXTRA_SUBDIRS,;t t
--s, at DEPLIBS@,$DEPLIBS,;t t
--s, at LOCALDEFS@,$LOCALDEFS,;t t
--s, at BDB_INC@,$BDB_INC,;t t
--s, at BDB_LIB@,$BDB_LIB,;t t
--s, at CYRUSDB_OBJS@,$CYRUSDB_OBJS,;t t
--s, at SIEVE_OBJS@,$SIEVE_OBJS,;t t
--s, at SIEVE_LIBS@,$SIEVE_LIBS,;t t
--s, at SIEVE_CPPFLAGS@,$SIEVE_CPPFLAGS,;t t
--s, at YACC@,$YACC,;t t
--s, at LEX@,$LEX,;t t
--s, at LEXLIB@,$LEXLIB,;t t
--s, at LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t
--s, at SIEVE_SUBDIRS@,$SIEVE_SUBDIRS,;t t
--s, at WITH_NONBLOCK@,$WITH_NONBLOCK,;t t
--s, at WITH_GMTOFF@,$WITH_GMTOFF,;t t
--s, at WITH_MAP@,$WITH_MAP,;t t
--s, at WITH_LOCK@,$WITH_LOCK,;t t
--s, at cyrus_sigveclib@,$cyrus_sigveclib,;t t
--s, at AFS_LIBS@,$AFS_LIBS,;t t
--s, at AFS_LDFLAGS@,$AFS_LDFLAGS,;t t
--s, at LDAP_CPPFLAGS@,$LDAP_CPPFLAGS,;t t
--s, at LDAP_LDFLAGS@,$LDAP_LDFLAGS,;t t
--s, at LDAP_LIBS@,$LDAP_LIBS,;t t
--s, at SERVER_SUBDIRS@,$SERVER_SUBDIRS,;t t
--s, at OPENSSL_INC@,$OPENSSL_INC,;t t
--s, at OPENSSL_LIB@,$OPENSSL_LIB,;t t
--s, at ZEPHYR_LIBS@,$ZEPHYR_LIBS,;t t
--s, at ZEPHYR_CPPFLAGS@,$ZEPHYR_CPPFLAGS,;t t
--s, at IMAP_PROGS@,$IMAP_PROGS,;t t
--s, at COMPILE_ET@,$COMPILE_ET,;t t
--s, at COM_ERR_LIBS@,$COM_ERR_LIBS,;t t
--s, at COM_ERR_LDFLAGS@,$COM_ERR_LDFLAGS,;t t
--s, at COM_ERR_CPPFLAGS@,$COM_ERR_CPPFLAGS,;t t
--s, at LIB_CRYPT@,$LIB_CRYPT,;t t
--s, at GSSAPI_LIBS@,$GSSAPI_LIBS,;t t
--s, at GSSAPIBASE_LIBS@,$GSSAPIBASE_LIBS,;t t
--s, at LIB_DYN_SASL@,$LIB_DYN_SASL,;t t
--s, at DYNSASLFLAGS@,$DYNSASLFLAGS,;t t
--s, at LIB_SASL@,$LIB_SASL,;t t
--s, at SASLFLAGS@,$SASLFLAGS,;t t
--s, at PERL@,$PERL,;t t
--s, at PERL_CCCDLFLAGS@,$PERL_CCCDLFLAGS,;t t
--s, at MD5OBJ@,$MD5OBJ,;t t
--s, at SNMP_SUBDIRS@,$SNMP_SUBDIRS,;t t
--s, at CMU_LIB_SUBDIR@,$CMU_LIB_SUBDIR,;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
--s, at LIB_RT@,$LIB_RT,;t t
--s, at IMAP_COM_ERR_LIBS@,$IMAP_COM_ERR_LIBS,;t t
--s, at IMAP_LIBS@,$IMAP_LIBS,;t t
--s, at PERL_SUBDIRS@,$PERL_SUBDIRS,;t t
--s, at PERL_DEPSUBDIRS@,$PERL_DEPSUBDIRS,;t t
--s, at LTLIBOBJS@,$LTLIBOBJS,;t t
--CEOF
-+if test -n "$CONFIG_FILES"; then
-
- _ACEOF
-
-- cat >>$CONFIG_STATUS <<\_ACEOF
-- # Split the substitutions into bite-sized pieces for seds with
-- # small command number limits, like on Digital OSF/1 and HP-UX.
-- ac_max_sed_lines=48
-- ac_sed_frag=1 # Number of current file.
-- ac_beg=1 # First line for current file.
-- ac_end=$ac_max_sed_lines # Line after last line for current file.
-- ac_more_lines=:
-- ac_sed_cmds=
-- while $ac_more_lines; do
-- if test $ac_beg -gt 1; then
-- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-- else
-- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-- fi
-- if test ! -s $tmp/subs.frag; then
-- ac_more_lines=false
-- else
-- # The purpose of the label and of the branching condition is to
-- # speed up the sed processing (if there are no `@' at all, there
-- # is no need to browse any of the substitutions).
-- # These are the two extra sed commands mentioned above.
-- (echo ':t
-- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-- if test -z "$ac_sed_cmds"; then
-- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-- else
-- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-- fi
-- ac_sed_frag=`expr $ac_sed_frag + 1`
-- ac_beg=$ac_end
-- ac_end=`expr $ac_end + $ac_max_sed_lines`
-- fi
-- done
-- if test -z "$ac_sed_cmds"; then
-- ac_sed_cmds=cat
-+
-+
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+ cat >conf$$subs.sed <<_ACEOF
-+SHELL!$SHELL$ac_delim
-+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-+PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-+PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-+exec_prefix!$exec_prefix$ac_delim
-+prefix!$prefix$ac_delim
-+program_transform_name!$program_transform_name$ac_delim
-+bindir!$bindir$ac_delim
-+sbindir!$sbindir$ac_delim
-+libexecdir!$libexecdir$ac_delim
-+datarootdir!$datarootdir$ac_delim
-+datadir!$datadir$ac_delim
-+sysconfdir!$sysconfdir$ac_delim
-+sharedstatedir!$sharedstatedir$ac_delim
-+localstatedir!$localstatedir$ac_delim
-+includedir!$includedir$ac_delim
-+oldincludedir!$oldincludedir$ac_delim
-+docdir!$docdir$ac_delim
-+infodir!$infodir$ac_delim
-+htmldir!$htmldir$ac_delim
-+dvidir!$dvidir$ac_delim
-+pdfdir!$pdfdir$ac_delim
-+psdir!$psdir$ac_delim
-+libdir!$libdir$ac_delim
-+localedir!$localedir$ac_delim
-+mandir!$mandir$ac_delim
-+DEFS!$DEFS$ac_delim
-+ECHO_C!$ECHO_C$ac_delim
-+ECHO_N!$ECHO_N$ac_delim
-+ECHO_T!$ECHO_T$ac_delim
-+LIBS!$LIBS$ac_delim
-+build_alias!$build_alias$ac_delim
-+host_alias!$host_alias$ac_delim
-+target_alias!$target_alias$ac_delim
-+build!$build$ac_delim
-+build_cpu!$build_cpu$ac_delim
-+build_vendor!$build_vendor$ac_delim
-+build_os!$build_os$ac_delim
-+host!$host$ac_delim
-+host_cpu!$host_cpu$ac_delim
-+host_vendor!$host_vendor$ac_delim
-+host_os!$host_os$ac_delim
-+WARNERROR!$WARNERROR$ac_delim
-+MAKEDEPEND!$MAKEDEPEND$ac_delim
-+cyrus_prefix!$cyrus_prefix$ac_delim
-+service_path!$service_path$ac_delim
-+cyrus_user!$cyrus_user$ac_delim
-+cyrus_group!$cyrus_group$ac_delim
-+CC!$CC$ac_delim
-+CFLAGS!$CFLAGS$ac_delim
-+LDFLAGS!$LDFLAGS$ac_delim
-+CPPFLAGS!$CPPFLAGS$ac_delim
-+ac_ct_CC!$ac_ct_CC$ac_delim
-+EXEEXT!$EXEEXT$ac_delim
-+OBJEXT!$OBJEXT$ac_delim
-+RANLIB!$RANLIB$ac_delim
-+SET_MAKE!$SET_MAKE$ac_delim
-+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-+INSTALL_DATA!$INSTALL_DATA$ac_delim
-+CPP!$CPP$ac_delim
-+GREP!$GREP$ac_delim
-+EGREP!$EGREP$ac_delim
-+AWK!$AWK$ac_delim
-+LIBOBJS!$LIBOBJS$ac_delim
-+LIB_SOCKET!$LIB_SOCKET$ac_delim
-+IPV6_OBJS!$IPV6_OBJS$ac_delim
-+PRE_SUBDIRS!$PRE_SUBDIRS$ac_delim
-+EXTRA_SUBDIRS!$EXTRA_SUBDIRS$ac_delim
-+DEPLIBS!$DEPLIBS$ac_delim
-+LOCALDEFS!$LOCALDEFS$ac_delim
-+BDB_INC!$BDB_INC$ac_delim
-+BDB_LIB!$BDB_LIB$ac_delim
-+CYRUSDB_OBJS!$CYRUSDB_OBJS$ac_delim
-+SIEVE_OBJS!$SIEVE_OBJS$ac_delim
-+SIEVE_LIBS!$SIEVE_LIBS$ac_delim
-+SIEVE_CPPFLAGS!$SIEVE_CPPFLAGS$ac_delim
-+YACC!$YACC$ac_delim
-+YFLAGS!$YFLAGS$ac_delim
-+LEX!$LEX$ac_delim
-+LEX_OUTPUT_ROOT!$LEX_OUTPUT_ROOT$ac_delim
-+LEXLIB!$LEXLIB$ac_delim
-+SIEVE_SUBDIRS!$SIEVE_SUBDIRS$ac_delim
-+WITH_NONBLOCK!$WITH_NONBLOCK$ac_delim
-+WITH_GMTOFF!$WITH_GMTOFF$ac_delim
-+WITH_MAP!$WITH_MAP$ac_delim
-+WITH_LOCK!$WITH_LOCK$ac_delim
-+cyrus_sigveclib!$cyrus_sigveclib$ac_delim
-+AFS_LIBS!$AFS_LIBS$ac_delim
-+AFS_LDFLAGS!$AFS_LDFLAGS$ac_delim
-+LDAP_CPPFLAGS!$LDAP_CPPFLAGS$ac_delim
-+LDAP_LDFLAGS!$LDAP_LDFLAGS$ac_delim
-+LDAP_LIBS!$LDAP_LIBS$ac_delim
-+SERVER_SUBDIRS!$SERVER_SUBDIRS$ac_delim
-+_ACEOF
-+
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-+ break
-+ elif $ac_last_try; then
-+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+ { (exit 1); exit 1; }; }
-+ else
-+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
- fi
--fi # test -n "$CONFIG_FILES"
-+done
-+
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+ ac_eof=`expr $ac_eof + 1`
-+fi
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-+_ACEOF
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+CEOF$ac_eof
-+_ACEOF
-
-+
-+ac_delim='%!_!# '
-+for ac_last_try in false false false false false :; do
-+ cat >conf$$subs.sed <<_ACEOF
-+OPENSSL_INC!$OPENSSL_INC$ac_delim
-+OPENSSL_LIB!$OPENSSL_LIB$ac_delim
-+ZEPHYR_LIBS!$ZEPHYR_LIBS$ac_delim
-+ZEPHYR_CPPFLAGS!$ZEPHYR_CPPFLAGS$ac_delim
-+IMAP_PROGS!$IMAP_PROGS$ac_delim
-+COMPILE_ET!$COMPILE_ET$ac_delim
-+COM_ERR_LIBS!$COM_ERR_LIBS$ac_delim
-+COM_ERR_LDFLAGS!$COM_ERR_LDFLAGS$ac_delim
-+COM_ERR_CPPFLAGS!$COM_ERR_CPPFLAGS$ac_delim
-+LIB_CRYPT!$LIB_CRYPT$ac_delim
-+GSSAPI_LIBS!$GSSAPI_LIBS$ac_delim
-+GSSAPIBASE_LIBS!$GSSAPIBASE_LIBS$ac_delim
-+LIB_DYN_SASL!$LIB_DYN_SASL$ac_delim
-+DYNSASLFLAGS!$DYNSASLFLAGS$ac_delim
-+LIB_SASL!$LIB_SASL$ac_delim
-+SASLFLAGS!$SASLFLAGS$ac_delim
-+PERL!$PERL$ac_delim
-+PERL_CCCDLFLAGS!$PERL_CCCDLFLAGS$ac_delim
-+MD5OBJ!$MD5OBJ$ac_delim
-+SNMP_SUBDIRS!$SNMP_SUBDIRS$ac_delim
-+CMU_LIB_SUBDIR!$CMU_LIB_SUBDIR$ac_delim
-+LIB_WRAP!$LIB_WRAP$ac_delim
-+SNMP_CONFIG!$SNMP_CONFIG$ac_delim
-+LIB_UCDSNMP!$LIB_UCDSNMP$ac_delim
-+LIB_RT!$LIB_RT$ac_delim
-+IMAP_COM_ERR_LIBS!$IMAP_COM_ERR_LIBS$ac_delim
-+IMAP_LIBS!$IMAP_LIBS$ac_delim
-+PERL_SUBDIRS!$PERL_SUBDIRS$ac_delim
-+PERL_DEPSUBDIRS!$PERL_DEPSUBDIRS$ac_delim
-+LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
-+
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 30; then
-+ break
-+ elif $ac_last_try; then
-+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-+ { (exit 1); exit 1; }; }
-+ else
-+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+ fi
-+done
-+
-+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-+if test -n "$ac_eof"; then
-+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-+ ac_eof=`expr $ac_eof + 1`
-+fi
-+
-+cat >>$CONFIG_STATUS <<_ACEOF
-+cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-+_ACEOF
-+sed '
-+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-+s/^/s,@/; s/!/@,|#_!!_#|/
-+:n
-+t n
-+s/'"$ac_delim"'$/,g/; t
-+s/$/\\/; p
-+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-+' >>$CONFIG_STATUS <conf$$subs.sed
-+rm -f conf$$subs.sed
-+cat >>$CONFIG_STATUS <<_ACEOF
-+:end
-+s/|#_!!_#|//g
-+CEOF$ac_eof
-+_ACEOF
-+
-+
-+# VPATH may cause trouble with some makes, so we remove $(srcdir),
-+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-+# trailing colons and then remove the whole line if VPATH becomes empty
-+# (actually we leave an empty line to preserve line numbers).
-+if test "x$srcdir" = x.; then
-+ ac_vpsub='/^[ ]*VPATH[ ]*=/{
-+s/:*\$(srcdir):*/:/
-+s/:*\${srcdir}:*/:/
-+s/:*@srcdir@:*/:/
-+s/^\([^=]*=[ ]*\):*/\1/
-+s/:*$//
-+s/^[^=]*=[ ]*$//
-+}'
-+fi
-+
- cat >>$CONFIG_STATUS <<\_ACEOF
--for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-- case $ac_file in
-- - | *:- | *:-:* ) # input from stdin
-- cat >$tmp/stdin
-- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-- * ) ac_file_in=$ac_file.in ;;
-+fi # test -n "$CONFIG_FILES"
-+
-+
-+for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS
-+do
-+ case $ac_tag in
-+ :[FHLC]) ac_mode=$ac_tag; continue;;
- esac
-+ case $ac_mode$ac_tag in
-+ :[FHL]*:*);;
-+ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-+echo "$as_me: error: Invalid tag $ac_tag." >&2;}
-+ { (exit 1); exit 1; }; };;
-+ :[FH]-) ac_tag=-:-;;
-+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-+ esac
-+ ac_save_IFS=$IFS
-+ IFS=:
-+ set x $ac_tag
-+ IFS=$ac_save_IFS
-+ shift
-+ ac_file=$1
-+ shift
-
-- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-- ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-+ case $ac_mode in
-+ :L) ac_source=$1;;
-+ :[FH])
-+ ac_file_inputs=
-+ for ac_f
-+ do
-+ case $ac_f in
-+ -) ac_f="$tmp/stdin";;
-+ *) # Look for the file first in the build tree, then in the source tree
-+ # (if the path is not absolute). The absolute path cannot be DOS-style,
-+ # because $ac_f cannot contain `:'.
-+ test -f "$ac_f" ||
-+ case $ac_f in
-+ [\\/$]*) false;;
-+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-+ esac ||
-+ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-+echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-+ { (exit 1); exit 1; }; };;
-+ esac
-+ ac_file_inputs="$ac_file_inputs $ac_f"
-+ done
-+
-+ # Let's still pretend it is `configure' which instantiates (i.e., don't
-+ # use $as_me), people would be surprised to read:
-+ # /* config.h. Generated by config.status. */
-+ configure_input="Generated from "`IFS=:
-+ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
-+ if test x"$ac_file" != x-; then
-+ configure_input="$ac_file. $configure_input"
-+ { echo "$as_me:$LINENO: creating $ac_file" >&5
-+echo "$as_me: creating $ac_file" >&6;}
-+ fi
-+
-+ case $ac_tag in
-+ *:-:* | *:-) cat >"$tmp/stdin";;
-+ esac
-+ ;;
-+ esac
-+
-+ ac_dir=`$as_dirname -- "$ac_file" ||
- $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$ac_file" : 'X\(//\)[^/]' \| \
- X"$ac_file" : 'X\(//\)$' \| \
-- X"$ac_file" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$ac_file" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-- { if $as_mkdir_p; then
-- mkdir -p "$ac_dir"
-- else
-- as_dir="$ac_dir"
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)[^/].*/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'`
-+ { as_dir="$ac_dir"
-+ case $as_dir in #(
-+ -*) as_dir=./$as_dir;;
-+ esac
-+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
- as_dirs=
-- while test ! -d "$as_dir"; do
-- as_dirs="$as_dir $as_dirs"
-- as_dir=`(dirname "$as_dir") 2>/dev/null ||
-+ while :; do
-+ case $as_dir in #(
-+ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-+ *) as_qdir=$as_dir;;
-+ esac
-+ as_dirs="'$as_qdir' $as_dirs"
-+ as_dir=`$as_dirname -- "$as_dir" ||
- $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$as_dir" : 'X\(//\)[^/]' \| \
- X"$as_dir" : 'X\(//\)$' \| \
-- X"$as_dir" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
-+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$as_dir" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)[^/].*/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\/\)$/{
-+ s//\1/
-+ q
-+ }
-+ /^X\(\/\).*/{
-+ s//\1/
-+ q
-+ }
-+ s/.*/./; q'`
-+ test -d "$as_dir" && break
- done
-- test ! -n "$as_dirs" || mkdir $as_dirs
-- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
--echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-+ test -z "$as_dirs" || eval "mkdir $as_dirs"
-+ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-+echo "$as_me: error: cannot create directory $as_dir" >&2;}
- { (exit 1); exit 1; }; }; }
--
- ac_builddir=.
-
--if test "$ac_dir" != .; then
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-- # A "../" for each directory in $ac_dir_suffix.
-- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
--else
-- ac_dir_suffix= ac_top_builddir=
--fi
-+ # A ".." for each directory in $ac_dir_suffix.
-+ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-+ case $ac_top_builddir_sub in
-+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-+ esac ;;
-+esac
-+ac_abs_top_builddir=$ac_pwd
-+ac_abs_builddir=$ac_pwd$ac_dir_suffix
-+# for backward compatibility:
-+ac_top_builddir=$ac_top_build_prefix
-
- case $srcdir in
-- .) # No --srcdir option. We are building in place.
-+ .) # We are building in place.
- ac_srcdir=.
-- if test -z "$ac_top_builddir"; then
-- ac_top_srcdir=.
-- else
-- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-- fi ;;
-- [\\/]* | ?:[\\/]* ) # Absolute path.
-+ ac_top_srcdir=$ac_top_builddir_sub
-+ ac_abs_top_srcdir=$ac_pwd ;;
-+ [\\/]* | ?:[\\/]* ) # Absolute name.
- ac_srcdir=$srcdir$ac_dir_suffix;
-- ac_top_srcdir=$srcdir ;;
-- *) # Relative path.
-- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-- ac_top_srcdir=$ac_top_builddir$srcdir ;;
-+ ac_top_srcdir=$srcdir
-+ ac_abs_top_srcdir=$srcdir ;;
-+ *) # Relative name.
-+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-+ ac_top_srcdir=$ac_top_build_prefix$srcdir
-+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
- esac
-+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
--# Do not use `cd foo && pwd` to compute absolute paths, because
--# the directories may not exist.
--case `pwd` in
--.) ac_abs_builddir="$ac_dir";;
--*)
-- case "$ac_dir" in
-- .) ac_abs_builddir=`pwd`;;
-- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-- *) ac_abs_builddir=`pwd`/"$ac_dir";;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_builddir=${ac_top_builddir}.;;
--*)
-- case ${ac_top_builddir}. in
-- .) ac_abs_top_builddir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_srcdir=$ac_srcdir;;
--*)
-- case $ac_srcdir in
-- .) ac_abs_srcdir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-- esac;;
--esac
--case $ac_abs_builddir in
--.) ac_abs_top_srcdir=$ac_top_srcdir;;
--*)
-- case $ac_top_srcdir in
-- .) ac_abs_top_srcdir=$ac_abs_builddir;;
-- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-- esac;;
--esac
-
-+ case $ac_mode in
-+ :F)
-+ #
-+ # CONFIG_FILE
-+ #
-
- case $INSTALL in
- [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-- *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
-+ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
- esac
-+_ACEOF
- if test x"$ac_file" != x-; then
- { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
- rm -f "$ac_file"
- fi
-- # Let's still pretend it is `configure' which instantiates (i.e., don't
-- # use $as_me), people would be surprised to read:
-- # /* config.h. Generated by config.status. */
-- if test x"$ac_file" = x-; then
-- configure_input=
-- else
-- configure_input="$ac_file. "
-- fi
-- configure_input=$configure_input"Generated from `echo $ac_file_in |
-- sed 's,.*/,,'` by configure."
-+cat >>$CONFIG_STATUS <<\_ACEOF
-+# If the template does not know about datarootdir, expand it.
-+# FIXME: This hack should be removed a few years after 2.60.
-+ac_datarootdir_hack=; ac_datarootdir_seen=
-
-- # First look for the input files in the build tree, otherwise in the
-- # src tree.
-- ac_file_inputs=`IFS=:
-- for f in $ac_file_in; do
-- case $f in
-- -) echo $tmp/stdin ;;
-- [\\/$]*)
-- # Absolute (can't be DOS-style, as IFS=:)
-- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
-- { (exit 1); exit 1; }; }
-- echo "$f";;
-- *) # Relative
-- if test -f "$f"; then
-- # Build tree
-- echo "$f"
-- elif test -f "$srcdir/$f"; then
-- # Source tree
-- echo "$srcdir/$f"
-- else
-- # /dev/null tree
-- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
-- { (exit 1); exit 1; }; }
-- fi;;
-- esac
-- done` || { (exit 1); exit 1; }
-+case `sed -n '/datarootdir/ {
-+ p
-+ q
-+}
-+/@datadir@/p
-+/@docdir@/p
-+/@infodir@/p
-+/@localedir@/p
-+/@mandir@/p
-+' $ac_file_inputs` in
-+*datarootdir*) ac_datarootdir_seen=yes;;
-+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-+ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+ # 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. */
+@@ -19025,6 +18708,12 @@
+ 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
-+ ac_datarootdir_hack='
-+ s&@datadir@&$datadir&g
-+ s&@docdir@&$docdir&g
-+ s&@infodir@&$infodir&g
-+ s&@localedir@&$localedir&g
-+ s&@mandir@&$mandir&g
-+ s&\\\${datarootdir}&$datarootdir&g' ;;
-+esac
-+_ACEOF
-+
-+# Neutralize VPATH when `$srcdir' = `.'.
-+# Shell code in configure.ac might set extrasub.
-+# FIXME: do we really want to maintain this feature?
-+cat >>$CONFIG_STATUS <<_ACEOF
sed "$ac_vpsub
- $extrasub
- _ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF
- :t
- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
--s, at configure_input@,$configure_input,;t t
--s, at srcdir@,$ac_srcdir,;t t
--s, at abs_srcdir@,$ac_abs_srcdir,;t t
--s, at top_srcdir@,$ac_top_srcdir,;t t
--s, at abs_top_srcdir@,$ac_abs_top_srcdir,;t t
--s, at builddir@,$ac_builddir,;t t
--s, at abs_builddir@,$ac_abs_builddir,;t t
--s, at top_builddir@,$ac_top_builddir,;t t
--s, at abs_top_builddir@,$ac_abs_top_builddir,;t t
--s, at INSTALL@,$ac_INSTALL,;t t
--" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-- rm -f $tmp/stdin
-- if test x"$ac_file" != x-; then
-- mv $tmp/out $ac_file
-- else
-- cat $tmp/out
-- rm -f $tmp/out
-- fi
--
--done
--_ACEOF
--cat >>$CONFIG_STATUS <<\_ACEOF
--
--#
--# CONFIG_HEADER section.
--#
-+s&@configure_input@&$configure_input&;t t
-+s&@top_builddir@&$ac_top_builddir_sub&;t t
-+s&@srcdir@&$ac_srcdir&;t t
-+s&@abs_srcdir@&$ac_abs_srcdir&;t t
-+s&@top_srcdir@&$ac_top_srcdir&;t t
-+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-+s&@builddir@&$ac_builddir&;t t
-+s&@abs_builddir@&$ac_abs_builddir&;t t
-+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-+s&@INSTALL@&$ac_INSTALL&;t t
-+$ac_datarootdir_hack
-+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
-
--# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
--# NAME is the cpp macro being defined and VALUE is the value it is being given.
--#
--# ac_d sets the value in "#define NAME VALUE" lines.
--ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)'
--ac_dB='[ ].*$,\1#\2'
--ac_dC=' '
--ac_dD=',;t'
--# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
--ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)'
--ac_uB='$,\1#\2define\3'
--ac_uC=' '
--ac_uD=',;t'
-+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-+ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+which seems to be undefined. Please make sure it is defined." >&5
-+echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+which seems to be undefined. Please make sure it is defined." >&2;}
-
--for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
-- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-+ rm -f "$tmp/stdin"
- case $ac_file in
-- - | *:- | *:-:* ) # input from stdin
-- cat >$tmp/stdin
-- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-- * ) ac_file_in=$ac_file.in ;;
-+ -) cat "$tmp/out"; rm -f "$tmp/out";;
-+ *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
- esac
--
-- test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
--echo "$as_me: creating $ac_file" >&6;}
--
-- # First look for the input files in the build tree, otherwise in the
-- # src tree.
-- ac_file_inputs=`IFS=:
-- for f in $ac_file_in; do
-- case $f in
-- -) echo $tmp/stdin ;;
-- [\\/$]*)
-- # Absolute (can't be DOS-style, as IFS=:)
-- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
-- { (exit 1); exit 1; }; }
-- # Do quote $f, to prevent DOS paths from being IFS'd.
-- echo "$f";;
-- *) # Relative
-- if test -f "$f"; then
-- # Build tree
-- echo "$f"
-- elif test -f "$srcdir/$f"; then
-- # Source tree
-- echo "$srcdir/$f"
-- else
-- # /dev/null tree
-- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
--echo "$as_me: error: cannot find input file: $f" >&2;}
-- { (exit 1); exit 1; }; }
-- fi;;
-- esac
-- done` || { (exit 1); exit 1; }
-- # Remove the trailing spaces.
-- sed 's/[ ]*$//' $ac_file_inputs >$tmp/in
--
-+ ;;
-+ :H)
-+ #
-+ # CONFIG_HEADER
-+ #
- _ACEOF
-
--# Transform confdefs.h into two sed scripts, `conftest.defines' and
--# `conftest.undefs', that substitutes the proper values into
--# config.h.in to produce config.h. The first handles `#define'
--# templates, and the second `#undef' templates.
--# And first: Protect against being on the right side of a sed subst in
--# config.status. Protect against being in an unquoted here document
--# in config.status.
--rm -f conftest.defines conftest.undefs
--# Using a here document instead of a string reduces the quoting nightmare.
--# Putting comments in sed scripts is not portable.
--#
--# `end' is used to avoid that the second main sed command (meant for
--# 0-ary CPP macros) applies to n-ary macro definitions.
--# See the Autoconf documentation for `clear'.
--cat >confdef2sed.sed <<\_ACEOF
--s/[\\&,]/\\&/g
--s,[\\$`],\\&,g
--t clear
--: clear
--s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
--t end
--s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
--: end
--_ACEOF
--# If some macros were called several times there might be several times
--# the same #defines, which is useless. Nevertheless, we may not want to
--# sort them, since we want the *last* AC-DEFINE to be honored.
--uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
--sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
--rm -f confdef2sed.sed
-+# Transform confdefs.h into a sed script `conftest.defines', that
-+# substitutes the proper values into config.h.in to produce config.h.
-+rm -f conftest.defines conftest.tail
-+# First, append a space to every undef/define line, to ease matching.
-+echo 's/$/ /' >conftest.defines
-+# Then, protect against being on the right side of a sed subst, or in
-+# an unquoted here document, in config.status. If some macros were
-+# called several times there might be several #defines for the same
-+# symbol, which is useless. But do not sort them, since the last
-+# AC_DEFINE must be honored.
-+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-+# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where
-+# NAME is the cpp macro being defined, VALUE is the value it is being given.
-+# PARAMS is the parameter list in the macro definition--in most cases, it's
-+# just an empty string.
-+ac_dA='s,^\\([ #]*\\)[^ ]*\\([ ]*'
-+ac_dB='\\)[ (].*,\\1define\\2'
-+ac_dC=' '
-+ac_dD=' ,'
-
--# This sed command replaces #undef with comments. This is necessary, for
-+uniq confdefs.h |
-+ sed -n '
-+ t rset
-+ :rset
-+ s/^[ ]*#[ ]*define[ ][ ]*//
-+ t ok
-+ d
-+ :ok
-+ s/[\\&,]/\\&/g
-+ s/^\('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p
-+ s/^\('"$ac_word_re"'\)[ ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p
-+ ' >>conftest.defines
-+
-+# Remove the space that was appended to ease matching.
-+# Then replace #undef with comments. This is necessary, for
- # example, in the case of _POSIX_SOURCE, which is predefined and required
- # on some systems where configure will not decide to define it.
--cat >>conftest.undefs <<\_ACEOF
--s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
--_ACEOF
-+# (The regexp can be short, since the line contains either #define or #undef.)
-+echo 's/ $//
-+s,^[ #]*u.*,/* & */,' >>conftest.defines
-
--# Break up conftest.defines because some shells have a limit on the size
--# of here documents, and old seds have small limits too (100 cmds).
--echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
--echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
--echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
--echo ' :' >>$CONFIG_STATUS
--rm -f conftest.tail
--while grep . conftest.defines >/dev/null
-+# Break up conftest.defines:
-+ac_max_sed_lines=50
-+
-+# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-+# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-+# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-+# et cetera.
-+ac_in='$ac_file_inputs'
-+ac_out='"$tmp/out1"'
-+ac_nxt='"$tmp/out2"'
-+
-+while :
- do
-- # Write a limited-size here document to $tmp/defines.sed.
-- echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
-- # Speed up: don't consider the non `#define' lines.
-- echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS
-- # Work around the forget-to-reset-the-flag bug.
-- echo 't clr' >>$CONFIG_STATUS
-- echo ': clr' >>$CONFIG_STATUS
-- sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
-+ # Write a here document:
-+ cat >>$CONFIG_STATUS <<_ACEOF
-+ # First, check the format of the line:
-+ cat >"\$tmp/defines.sed" <<\\CEOF
-+/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def
-+/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def
-+b
-+:def
-+_ACEOF
-+ sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
- echo 'CEOF
-- sed -f $tmp/defines.sed $tmp/in >$tmp/out
-- rm -f $tmp/in
-- mv $tmp/out $tmp/in
--' >>$CONFIG_STATUS
-- sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
-+ sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
-+ ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
-+ sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
-+ grep . conftest.tail >/dev/null || break
- rm -f conftest.defines
- mv conftest.tail conftest.defines
- done
--rm -f conftest.defines
--echo ' fi # grep' >>$CONFIG_STATUS
--echo >>$CONFIG_STATUS
--
--# Break up conftest.undefs because some shells have a limit on the size
--# of here documents, and old seds have small limits too (100 cmds).
--echo ' # Handle all the #undef templates' >>$CONFIG_STATUS
--rm -f conftest.tail
--while grep . conftest.undefs >/dev/null
--do
-- # Write a limited-size here document to $tmp/undefs.sed.
-- echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
-- # Speed up: don't consider the non `#undef'
-- echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS
-- # Work around the forget-to-reset-the-flag bug.
-- echo 't clr' >>$CONFIG_STATUS
-- echo ': clr' >>$CONFIG_STATUS
-- sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
-- echo 'CEOF
-- sed -f $tmp/undefs.sed $tmp/in >$tmp/out
-- rm -f $tmp/in
-- mv $tmp/out $tmp/in
--' >>$CONFIG_STATUS
-- sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
-- rm -f conftest.undefs
-- mv conftest.tail conftest.undefs
--done
--rm -f conftest.undefs
-+rm -f conftest.defines conftest.tail
-
-+echo "ac_result=$ac_in" >>$CONFIG_STATUS
- cat >>$CONFIG_STATUS <<\_ACEOF
-- # Let's still pretend it is `configure' which instantiates (i.e., don't
-- # use $as_me), people would be surprised to read:
-- # /* config.h. Generated by config.status. */
-- if test x"$ac_file" = x-; then
-- echo "/* Generated by configure. */" >$tmp/config.h
-- else
-- echo "/* $ac_file. Generated by configure. */" >$tmp/config.h
-- fi
-- cat $tmp/in >>$tmp/config.h
-- rm -f $tmp/in
- if test x"$ac_file" != x-; then
-- if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
-+ echo "/* $configure_input */" >"$tmp/config.h"
-+ cat "$ac_result" >>"$tmp/config.h"
-+ if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
- { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
- echo "$as_me: $ac_file is unchanged" >&6;}
- else
-- ac_dir=`(dirname "$ac_file") 2>/dev/null ||
--$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X"$ac_file" : 'X\(//\)[^/]' \| \
-- X"$ac_file" : 'X\(//\)$' \| \
-- X"$ac_file" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
--echo X"$ac_file" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-- { if $as_mkdir_p; then
-- mkdir -p "$ac_dir"
-- else
-- as_dir="$ac_dir"
-- as_dirs=
-- while test ! -d "$as_dir"; do
-- as_dirs="$as_dir $as_dirs"
-- as_dir=`(dirname "$as_dir") 2>/dev/null ||
--$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-- X"$as_dir" : 'X\(//\)[^/]' \| \
-- X"$as_dir" : 'X\(//\)$' \| \
-- X"$as_dir" : 'X\(/\)' \| \
-- . : '\(.\)' 2>/dev/null ||
--echo X"$as_dir" |
-- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-- /^X\(\/\/\)$/{ s//\1/; q; }
-- /^X\(\/\).*/{ s//\1/; q; }
-- s/.*/./; q'`
-- done
-- test ! -n "$as_dirs" || mkdir $as_dirs
-- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
--echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-- { (exit 1); exit 1; }; }; }
--
- rm -f $ac_file
-- mv $tmp/config.h $ac_file
-+ mv "$tmp/config.h" $ac_file
- fi
- else
-- cat $tmp/config.h
-- rm -f $tmp/config.h
-+ echo "/* $configure_input */"
-+ cat "$ac_result"
- fi
--done
--_ACEOF
-+ rm -f "$tmp/out12"
-+ ;;
-+
-+
-+ esac
-+
-+done # for ac_tag
-
--cat >>$CONFIG_STATUS <<\_ACEOF
-
- { (exit 0); exit 0; }
- _ACEOF
-diff -urNad cyrus-imapd-2.3-2.3.7~/install-sh cyrus-imapd-2.3-2.3.7/install-sh
---- cyrus-imapd-2.3-2.3.7~/install-sh 2006-10-10 16:55:35.000000000 +0000
-+++ cyrus-imapd-2.3-2.3.7/install-sh 2006-10-10 16:55:47.000000000 +0000
-@@ -1,7 +1,7 @@
- #!/bin/sh
- # install - install a program, script, or datafile
-
--scriptversion=2005-02-02.21
-+scriptversion=2005-05-14.22
-
- # This originates from X11R5 (mit/util/scripts/install.sh), which was
- # later released in X11R6 (xc/config/util/install.sh) with the
-diff -urNad cyrus-imapd-2.3-2.3.7~/mkinstalldirs cyrus-imapd-2.3-2.3.7/mkinstalldirs
---- cyrus-imapd-2.3-2.3.7~/mkinstalldirs 2006-10-10 16:55:34.000000000 +0000
-+++ cyrus-imapd-2.3-2.3.7/mkinstalldirs 2006-10-10 16:55:47.000000000 +0000
-@@ -1,7 +1,7 @@
- #! /bin/sh
- # mkinstalldirs --- make directory hierarchy
-
--scriptversion=2005-02-02.21
-+scriptversion=2005-06-29.22
-
- # Original author: Noah Friedman <friedman at prep.ai.mit.edu>
- # Created: 1993-05-16
-@@ -12,7 +12,7 @@
- # <automake-patches at gnu.org>.
-
- errstatus=0
--dirmode=""
-+dirmode=
-
- usage="\
- Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
-@@ -103,13 +103,21 @@
-
- for file
- do
-- set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-+ case $file in
-+ /*) pathcomp=/ ;;
-+ *) pathcomp= ;;
-+ esac
-+ oIFS=$IFS
-+ IFS=/
-+ set fnord $file
- shift
-+ IFS=$oIFS
-
-- pathcomp=
- for d
- do
-- pathcomp="$pathcomp$d"
-+ test "x$d" = x && continue
-+
-+ pathcomp=$pathcomp$d
- case $pathcomp in
- -*) pathcomp=./$pathcomp ;;
- esac
-@@ -124,7 +132,7 @@
- else
- if test ! -z "$dirmode"; then
- echo "chmod $dirmode $pathcomp"
-- lasterr=""
-+ lasterr=
- chmod "$dirmode" "$pathcomp" || lasterr=$?
-
- if test ! -z "$lasterr"; then
-@@ -134,7 +142,7 @@
- fi
- fi
-
-- pathcomp="$pathcomp/"
-+ pathcomp=$pathcomp/
- done
- done
-
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/depot/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/depot/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/depot/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/depot/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,6 +1,6 @@
-/.cvsignore/1.1/Sun Jan 6 20:23:54 2002//Tcyrus-release-2-3-7
-/Makefile.in/1.6.2.1/Mon May 31 18:22:47 2004//Tcyrus-release-2-3-7
-/depot.conf/1.4/Fri Mar 15 22:50:00 2002//Tcyrus-release-2-3-7
-/rc.local.imap/1.2/Thu Aug 2 19:20:41 2001//Tcyrus-release-2-3-7
-/rc.local.ptclient/1.2/Tue Dec 26 19:30:48 2000//Tcyrus-release-2-3-7
+/.cvsignore/1.1/Sun Jan 6 20:23:54 2002//
+/Makefile.in/1.7/Fri May 28 13:39:38 2004//
+/depot.conf/1.5/Thu Oct 13 19:57:05 2005//
+/rc.local.imap/1.2/Thu Aug 2 19:20:41 2001//
+/rc.local.ptclient/1.2/Tue Dec 26 19:30:48 2000//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/depot/depot.conf
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/depot/depot.conf?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/depot/depot.conf (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/depot/depot.conf Tue Feb 27 04:17:11 2007
@@ -2,3 +2,7 @@
usr/cyrus root.server/usr/cyrus
etc root.server/etc
~delete lib/perl5/5.6.1/perllocal.pod
+~delete lib/perl5/5.8.6/i686-linux-thread-multi-64int-ld/perllocal.pod
+~delete lib/perl5/5.8.6/i686-linux/perllocal.pod
+~delete lib/perl5/5.8.6/sparc-solaris-thread-multi-64int-ld/perllocal.pod
+~delete lib/perl5/5.8.6/sparc-solaris/perllocal.pod
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,39 +1,38 @@
-/.cvsignore/1.3/Wed Oct 22 18:02:52 2003//Tcyrus-release-2-3-7
-/Makefile.dist/1.11/Wed Oct 22 18:50:04 2003//Tcyrus-release-2-3-7
-/altnamespace.html/1.2/Tue Oct 23 20:15:18 2001//Tcyrus-release-2-3-7
-/anoncvs.html/1.3/Sat May 25 19:57:43 2002//Tcyrus-release-2-3-7
-/bugs.html/1.27.2.1/Wed Mar 24 19:52:57 2004//Tcyrus-release-2-3-7
-/changes.html/1.71.2.50/Tue Jun 27 15:58:40 2006//Tcyrus-release-2-3-7
-/cyrusv2.mc/1.4/Thu Aug 23 23:26:56 2001//Tcyrus-release-2-3-7
-/faq.html/1.35.2.1/Wed Mar 24 19:52:58 2004//Tcyrus-release-2-3-7
-/feedback.html/1.6/Fri Aug 15 17:37:04 2003//Tcyrus-release-2-3-7
-/index.html/1.12.2.1/Sat Apr 3 19:08:11 2004//Tcyrus-release-2-3-7
-/install-admin-mb.html/1.3.10.1/Thu Jun 24 15:16:22 2004//Tcyrus-release-2-3-7
-/install-auth.html/1.12/Mon Jul 28 02:47:09 2003//Tcyrus-release-2-3-7
-/install-compile.html/1.16.2.1/Tue Jan 27 23:13:36 2004//Tcyrus-release-2-3-7
-/install-configure.html/1.30.2.3/Thu Feb 12 05:32:32 2004//Tcyrus-release-2-3-7
-/install-murder.html/1.19.2.1/Wed Nov 5 00:54:03 2003//Tcyrus-release-2-3-7
-/install-netnews.html/1.2.2.3/Fri Feb 6 18:48:12 2004//Tcyrus-release-2-3-7
-/install-perf.html/1.10/Thu Jan 2 19:23:11 2003//Tcyrus-release-2-3-7
-/install-prereq.html/1.12/Wed Oct 22 18:50:04 2003//Tcyrus-release-2-3-7
-/install-replication.html/1.1.2.4/Mon Jul 10 14:04:22 2006//Tcyrus-release-2-3-7
-/install-sieve.html/1.4/Tue Oct 23 18:14:48 2001//Tcyrus-release-2-3-7
-/install-snmpmon.html/1.1/Tue Apr 25 02:56:42 2000//Tcyrus-release-2-3-7
-/install-testing.html/1.3/Thu Aug 22 13:49:30 2002//Tcyrus-release-2-3-7
-/install-upgrade.html/1.32.2.7/Mon Jul 10 13:46:20 2006//Tcyrus-release-2-3-7
-/install-virtdomains.html/1.2.2.1/Thu Jan 15 20:24:25 2004//Tcyrus-release-2-3-7
-/install.html/1.9.2.1/Thu Apr 14 17:03:57 2005//Tcyrus-release-2-3-7
-/mailing-list.html/1.5/Mon Feb 24 23:56:23 2003//Tcyrus-release-2-3-7
-/man.html/1.15.2.3/Wed Mar 30 21:44:25 2005//Tcyrus-release-2-3-7
-/murder.fig/1.4.8.1/Wed Feb 4 20:26:27 2004//Tcyrus-release-2-3-7
-/netnews.fig/1.2/Wed Oct 22 18:02:53 2003//Tcyrus-release-2-3-7
-/notes.html/1.2/Sat May 25 19:57:43 2002//Tcyrus-release-2-3-7
-/os.html/1.4/Sun Nov 18 19:50:43 2001//Tcyrus-release-2-3-7
-/overview.html/1.21.2.3/Tue Jul 27 13:13:42 2004//Tcyrus-release-2-3-7
-/questions.html/1.3/Thu Oct 16 15:33:31 2003//Tcyrus-release-2-3-7
-/readme.html/1.19.2.1/Mon Jul 10 14:04:22 2006//Tcyrus-release-2-3-7
-/sieve-protocol.html/1.3/Fri May 2 17:01:57 2003//Tcyrus-release-2-3-7
-/sieve.html/1.1/Tue Apr 25 02:56:46 2000//Tcyrus-release-2-3-7
-/specs.html/1.50.2.32/Fri Jun 16 15:10:28 2006//Tcyrus-release-2-3-7
-D/internal////
-D/text////
+/.cvsignore/1.3/Wed Oct 22 18:02:52 2003//
+/Makefile.dist/1.11/Wed Oct 22 18:50:04 2003//
+/altnamespace.html/1.2/Tue Oct 23 20:15:18 2001//
+/anoncvs.html/1.3/Sat May 25 19:57:43 2002//
+/bugs.html/1.29/Thu Nov 30 17:11:16 2006//
+/changes.html/1.107/Tue Feb 6 15:32:43 2007//
+/cyrusv2.mc/1.4/Thu Aug 23 23:26:56 2001//
+/faq.html/1.37/Thu Nov 30 17:11:16 2006//
+/feedback.html/1.6/Fri Aug 15 17:37:04 2003//
+/index.html/1.14/Wed Feb 7 18:58:07 2007//
+/install-admin-mb.html/1.5/Thu Nov 30 17:11:16 2006//
+/install-auth.html/1.12/Mon Jul 28 02:47:09 2003//
+/install-compile.html/1.18/Thu Nov 30 17:11:16 2006//
+/install-configure.html/1.34/Thu Nov 30 17:11:16 2006//
+/install-murder.html/1.22/Wed Feb 7 18:58:07 2007//
+/install-netnews.html/1.7/Thu Nov 30 17:11:16 2006//
+/install-perf.html/1.10/Thu Jan 2 19:23:11 2003//
+/install-prereq.html/1.12/Wed Oct 22 18:50:04 2003//
+/install-replication.html/1.3/Tue Feb 6 18:49:19 2007//
+/install-sieve.html/1.4/Tue Oct 23 18:14:48 2001//
+/install-snmpmon.html/1.1/Tue Apr 25 02:56:42 2000//
+/install-testing.html/1.4/Wed Feb 7 18:58:07 2007//
+/install-upgrade.html/1.36/Wed Feb 7 18:58:07 2007//
+/install-virtdomains.html/1.4/Thu Nov 30 17:11:16 2006//
+/install.html/1.10/Thu Nov 30 17:11:16 2006//
+/mailing-list.html/1.6/Wed Feb 7 18:58:07 2007//
+/man.html/1.18/Thu Nov 30 17:11:16 2006//
+/murder.fig/1.5/Sun Feb 1 03:31:49 2004//
+/netnews.fig/1.2/Wed Oct 22 18:02:53 2003//
+/notes.html/1.2/Sat May 25 19:57:43 2002//
+/os.html/1.4/Sun Nov 18 19:50:43 2001//
+/overview.html/1.25/Thu Nov 30 17:11:16 2006//
+/questions.html/1.3/Thu Oct 16 15:33:31 2003//
+/readme.html/1.22/Tue Feb 6 18:51:29 2007//
+/sieve-protocol.html/1.3/Fri May 2 17:01:57 2003//
+/sieve.html/1.1/Tue Apr 25 02:56:46 2000//
+/specs.html/1.66/Thu Nov 30 17:11:16 2006//
+D
Added: branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/CVS/Entries.Log
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/CVS/Entries.Log?rev=702&root=cyrus22&view=auto
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/CVS/Entries.Log (added)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/CVS/Entries.Log Tue Feb 27 04:17:11 2007
@@ -1,0 +1,3 @@
+A D/html////
+A D/internal////
+A D/text////
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/bugs.html
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/bugs.html?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/bugs.html (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/bugs.html Tue Feb 27 04:17:11 2007
@@ -3,7 +3,7 @@
<!-- Changed by: Larry Greenfield 15-Aug-1999 -->
<!-- Changed by: Larry Greenfield 01-Jul-1999 -->
<!-- Changed by: Tim Showalter 16-Jun-1997 -->
-<!-- $Id: bugs.html,v 1.27.2.1 2004/03/24 19:52:57 ken3 Exp $ -->
+<!-- $Id: bugs.html,v 1.29 2006/11/30 17:11:16 murch Exp $ -->
</HEAD><BODY>
<h1> Known bugs in the Cyrus IMAP Server</h1>
@@ -127,7 +127,7 @@
would like to submit a bug, feature request or (best of all) patch.
<P><HR>
-Last update: $Date: 2004/03/24 19:52:57 $
+Last update: $Date: 2006/11/30 17:11:16 $
<br>
<A HREF="index.html">Return</A> to the Cyrus IMAP Server Home Page
</BODY></HTML>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/changes.html
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/changes.html?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/changes.html (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/changes.html Tue Feb 27 04:17:11 2007
@@ -1,12 +1,33 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- $Id: changes.html,v 1.71.2.50 2006/06/27 15:58:40 murch Exp $ -->
+<!-- $Id: changes.html,v 1.107 2007/02/06 15:32:43 murch Exp $ -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta name="generator" content="HTML Tidy, see www.w3.org" />
<title>Changes to the Cyrus IMAP Server</title>
</head>
<body>
+
+<h1>Changes to the Cyrus IMAP Server since 2.3.7</h1>
+<ul>
+<li>Added <tt>improved_mboxlist_sort</tt> option which fixes LIST/LSUB
+problem with characters like <tt>'-'</tt> and <tt>' '</tt> in mailbox
+names. See <tt>imapd.conf.5</tt> for details</li>
+<li>Fixed problem with mupdate randomly spinning.</li>
+<li>Fixed problem with DELETEing mailboxes with split metadata
+directories.</li>
+<li>Fixed compatibility problem with RFC 4314 ACLs and mixed 2.2/2.3
+environments.</li>
+<li>Fixed problem with replication and COPYing \Seen messages.</li>
+<li>Fixed problem with replication and XFER.</li>
+<li>Added options to reconstruct to preserve cyrus.expunge and to
+synchronize changes to a replica server.</li>
+<li>Removed (broken) support for proxying of pipelined IMAP commands.</li>
+<li>Added new <tt>cyr_dbtool</tt> utility for manipulating Cyrus
+databases (courtesy of Fastmail.fm).</li>
+<li>Better sanity checking of IMAP URLs.</li>
+<li>Fixed miscellaneous bugs and build issues.</li>
+</ul>
<h1>Changes to the Cyrus IMAP Server since 2.3.6</h1>
<ul>
@@ -143,6 +164,37 @@
/vendor/cmu/cyrus-imapd/sieve annotation.</li>
</ul>
+<h1>Changes to the Cyrus IMAP Server since 2.2.13</h1>
+<ul>
+<li><tt>ctl_mboxlist</tt> now dumps/undumps the mailbox type flags,
+making it useful for remote mailboxes.</li>
+<li>Added <tt>sieve_allowreferrals</tt> option to control whether
+<tt>timsieved</tt> issues referrals or proxys traffic to backends.</li>
+</ul>
+
+<h1>Changes to the Cyrus IMAP Server since 2.2.12</h1>
+<ul>
+<li>Allow sieve scripts to be run on shared mailboxes (via <tt>sieve</tt>
+annotation).</li>
+<li>Updated <tt>nntpd</tt> to be compliant with latest draft (soon to be
+RFC3977).</li>
+<li>Updated IMAP UIDPLUS extension to be compliant with latest
+specification (RFC4315).</li>
+<li>Performance improvements to <tt>quota</tt> utility.<li>
+<li>Fixed possible race condition in IMAP IDLE.</li>
+<li>Made <tt>ptloader</tt> runtime configurable.</li>
+<li>Added more extensive output to <tt>arbitron</tt>.</li>
+<li>Allow responses of any length from backend when proxing
+IMAP/POP3/NNTP traffic.</li>
+<li>Added <tt>plaintextloginalert</tt> option.</li>
+<li>Only allow <tt>mbpath</tt> to be run as Cyrus user.</li>
+<li>Added <tt>berkeley_hash</tt> and <tt>berkeley_hash_nosync</tt>
+cyrusdb backends (seem to perform better under heavy loads).</li>
+<li>Added <tt>lastpop</tt> mailbox annotation.</li>
+<li>Added subscribe/unsubscribe support to <tt>cyradm</tt>.</li>
+<li>Fixed miscellaneous bugs and build issues.</li>
+</ul>
+
<h1>Changes to the Cyrus IMAP Server since 2.2.11</h1>
<ul>
<li>Revert index change which wasn't supposed to make it into 2.2.11</li>
@@ -2140,7 +2192,7 @@
</ul>
<hr />
-last modified: $Date: 2006/06/27 15:58:40 $ <br />
+last modified: $Date: 2007/02/06 15:32:43 $ <br />
<a href="index.html">Return</a> to the Cyrus IMAP Server Home Page
</body>
</html>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/faq.html
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/faq.html?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/faq.html (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/faq.html Tue Feb 27 04:17:11 2007
@@ -4,7 +4,7 @@
<head>
<meta name="generator" content="HTML Tidy, see www.w3.org" />
<title>Cyrus IMAP Server FAQ</title>
-<!-- $Id: faq.html,v 1.35.2.1 2004/03/24 19:52:58 ken3 Exp $ -->
+<!-- $Id: faq.html,v 1.37 2006/11/30 17:11:16 murch Exp $ -->
</head>
<body>
<h1>Cyrus IMAP Server FAQ</h1>
@@ -272,7 +272,7 @@
</dl>
<hr />
-last modified: $Date: 2004/03/24 19:52:58 $ <br />
+last modified: $Date: 2006/11/30 17:11:16 $ <br />
<a href="index.html">Return</a> to the Cyrus IMAP Server Home Page
</body>
</html>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/index.html
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/index.html?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/index.html (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/index.html Tue Feb 27 04:17:11 2007
@@ -7,7 +7,7 @@
<!-- Changed by: Larry Greenfield, processed by tidy, 18-Nov-2001 -->
<!-- Changed by: Larry Greenfield, 13-Aug-1999 -->
<!-- Changed by: John Gardiner Myers, 16-May-1996 -->
-<!-- $Id: index.html,v 1.12.2.1 2004/04/03 19:08:11 ken3 Exp $ -->
+<!-- $Id: index.html,v 1.14 2007/02/07 18:58:07 murch Exp $ -->
</head>
<body>
<h1>Cyrus IMAP Server, version 2.3</h1>
@@ -35,7 +35,7 @@
<h2>The Cyrus IMAP Server Distribution</h2>
-<p><a href="http://asg.web.cmu.edu/cyrus/download/"><b>Cyrus IMAP
+<p><a href="http://cyrusimap.web.cmu.edu/downloads.html#imap"><b>Cyrus IMAP
Server distribution</b></a></p>
<p><b>Documentation</b></p>
@@ -58,13 +58,13 @@
</ul>
<hr />
-<a href="http://asg.web.cmu.edu/cyrus">Go</a> to the Project Cyrus
+<a href="http://cyrusimap.web.cmu.edu">Go</a> to the Project Cyrus
homepage.<br />
<a href="http://asg.web.cmu.edu">Go</a> to the Andrew Systems Group
homepage.
<hr />
-last modified: $Date: 2004/04/03 19:08:11 $
+last modified: $Date: 2007/02/07 18:58:07 $
</body>
</html>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-admin-mb.html
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-admin-mb.html?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-admin-mb.html (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-admin-mb.html Tue Feb 27 04:17:11 2007
@@ -1,4 +1,4 @@
-<!-- $Id: install-admin-mb.html,v 1.3.10.1 2004/06/24 15:16:22 ken3 Exp $ -->
+<!-- $Id: install-admin-mb.html,v 1.5 2006/11/30 17:11:16 murch Exp $ -->
<HTML>
<HEAD>
<TITLE>Administering Mailboxes
@@ -83,7 +83,7 @@
IMAP server.
<P><HR>
-last modified: $Date: 2004/06/24 15:16:22 $
+last modified: $Date: 2006/11/30 17:11:16 $
</BODY></HTML>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-compile.html
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-compile.html?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-compile.html (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-compile.html Tue Feb 27 04:17:11 2007
@@ -1,4 +1,4 @@
-<!-- $Id: install-compile.html,v 1.16.2.1 2004/01/27 23:13:36 ken3 Exp $ -->
+<!-- $Id: install-compile.html,v 1.18 2006/11/30 17:11:16 murch Exp $ -->
<HTML>
<HEAD>
<TITLE>Compiling the IMAP Server
@@ -289,5 +289,5 @@
</kbd></pre>
<P><HR>
-last modified: $Date: 2004/01/27 23:13:36 $
+last modified: $Date: 2006/11/30 17:11:16 $
</BODY></HTML>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-configure.html
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-configure.html?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-configure.html (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-configure.html Tue Feb 27 04:17:11 2007
@@ -1,4 +1,4 @@
-<!-- $Id: install-configure.html,v 1.30.2.3 2004/02/12 05:32:32 ken3 Exp $ -->
+<!-- $Id: install-configure.html,v 1.34 2006/11/30 17:11:16 murch Exp $ -->
<HTML>
<HEAD>
<TITLE>Installing and configuring the IMAP Server
@@ -537,5 +537,5 @@
href=altnamespace.html#altnameconfig>altnamespace.html</a>.
<P><HR>
-last modified: $Date: 2004/02/12 05:32:32 $
+last modified: $Date: 2006/11/30 17:11:16 $
</BODY></HTML>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-murder.html
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-murder.html?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-murder.html (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-murder.html Tue Feb 27 04:17:11 2007
@@ -1,4 +1,4 @@
-<!-- $Id: install-murder.html,v 1.19.2.1 2003/11/05 00:54:03 ken3 Exp $ -->
+<!-- $Id: install-murder.html,v 1.22 2007/02/07 18:58:07 murch Exp $ -->
<HTML>
<HEAD>
<TITLE>Installing The Cyrus Murder
@@ -23,7 +23,7 @@
<h3>Introduction & Assumptions</h3>
This document is intended to be a guide to the configuration of a Cyrus
IMAP Aggregator, aka Cyrus Murder. It is recommended that you review
-<A HREF=http://asg.web.cmu.edu/cyrus/ag.html>this document</A> to be familliar
+<A HREF=http://cyrusimap.web.cmu.edu/ag.html>this document</A> to be familliar
with the concepts at work. This document is a work in progress and is at this
point incomplete.<p>
This document assumes that you have successfully been able to setup atleast
@@ -344,12 +344,12 @@
</ul>
<p><h3>References</h3><ul>
-<li><A HREF=http://asg.web.cmu.edu/cyrus/ag.html>Aggregator Overview</A></li>
-<li><A HREF=http://asg.web.cmu.edu/cyrus/mupdate.html>MUPDATE Protocol Reference</A></li>
+<li><A HREF=http://cyrusimap.web.cmu.edu/ag.html>Aggregator Overview</A></li>
+<li><A HREF=http://cyrusimap.web.cmu.edu/archives/mupdate.html>MUPDATE Protocol Reference</A></li>
</ul>
<P><HR>
-last modified: $Date: 2003/11/05 00:54:03 $
+last modified: $Date: 2007/02/07 18:58:07 $
</BODY></HTML>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-netnews.html
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-netnews.html?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-netnews.html (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-netnews.html Tue Feb 27 04:17:11 2007
@@ -1,4 +1,4 @@
-<!-- $Id: install-netnews.html,v 1.2.2.3 2004/02/06 18:48:12 ken3 Exp $ -->
+<!-- $Id: install-netnews.html,v 1.7 2006/11/30 17:11:16 murch Exp $ -->
<HTML>
<HEAD>
<TITLE>Cyrus and Netnews
@@ -201,5 +201,5 @@
(independently from <tt>comp</tt>).
<P><HR>
-last modified: $Date: 2004/02/06 18:48:12 $
+last modified: $Date: 2006/11/30 17:11:16 $
</BODY></HTML>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-replication.html
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-replication.html?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-replication.html (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-replication.html Tue Feb 27 04:17:11 2007
@@ -1,4 +1,4 @@
-<!-- $Id: install-replication.html,v 1.1.2.4 2006/07/10 14:04:22 murch Exp $ -->
+<!-- $Id: install-replication.html,v 1.3 2007/02/06 18:49:19 murch Exp $ -->
<HTML>
<HEAD>
<TITLE>Cyrus replication
@@ -20,7 +20,7 @@
the facility to support the IMAP CONDSTORE extension (modification
sequences). It is recommended that you do not try to use both
CONDSTORE and replication at this time. The deficiencies in the
-replication protocol will be fixed in version 2.3.8.
+replication protocol will be fixed in version 2.3.9.
</i></b><br>
<h3>Introduction & Assumptions</h3>
@@ -180,7 +180,7 @@
<h3>Failover</h3>
<P><HR>
-last modified: $Date: 2006/07/10 14:04:22 $
+last modified: $Date: 2007/02/06 18:49:19 $
</BODY></HTML>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-testing.html
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-testing.html?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-testing.html (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-testing.html Tue Feb 27 04:17:11 2007
@@ -1,4 +1,4 @@
-<!-- $Id: install-testing.html,v 1.3 2002/08/22 13:49:30 ken3 Exp $ -->
+<!-- $Id: install-testing.html,v 1.4 2007/02/07 18:58:07 murch Exp $ -->
<HTML>
<HEAD>
<TITLE>Testing the IMAP Server
@@ -11,7 +11,7 @@
To test the IMAP server, reboot and perform the following steps (all
of these samples use "<tt>foobar</tt>" as the IMAP server name). A
list of answers to common installation problems is maintained in <A
-HREF="http://asg.web.cmu.edu/cyrus/imapd/install-FAQ.html">http://asg.web.cmu.edu/cyrus/imapd/install-FAQ</A>.
+HREF="http://cyrusimap.web.cmu.edu/twiki">http://cyrusimap.web.cmu.edu/twiki</A>.
<ol>
<li>From your normal account, telnet to the IMAP port on the
@@ -135,5 +135,5 @@
</ol>
<P><HR>
-last modified: $Date: 2002/08/22 13:49:30 $
+last modified: $Date: 2007/02/07 18:58:07 $
</BODY></HTML>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-upgrade.html
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-upgrade.html?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-upgrade.html (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-upgrade.html Tue Feb 27 04:17:11 2007
@@ -1,4 +1,4 @@
-<!-- $Id: install-upgrade.html,v 1.32.2.7 2006/07/10 13:46:20 murch Exp $ -->
+<!-- $Id: install-upgrade.html,v 1.36 2007/02/07 18:58:07 murch Exp $ -->
<HTML>
<HEAD>
<TITLE>Upgrading From Previous Versions
@@ -267,7 +267,8 @@
<ul>
<li> You must install and configure Cyrus SASL version 2 to use Cyrus
IMAP 2.1 and later. You can download SASL at <a
-href="http://asg.web.cmu.edu/cyrus/download/">http://asg.web.cmu.edu/cyrus/download/</a>.
+href="http://cyrusimap.web.cmu.edu/downloads.html#sasl">
+http://cyrusimap.web.cmu.edu/downloads.html#sasl</a>.
<li> If you use <tt>timsieved</tt> to manage Sieve scripts, and have
enabled the alternate namespace and/or the Unix hierarchy separator,
@@ -461,7 +462,7 @@
</ul>
<HR><P>
-last modified: $Date: 2006/07/10 13:46:20 $
+last modified: $Date: 2007/02/07 18:58:07 $
</BODY></HTML>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-virtdomains.html
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-virtdomains.html?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-virtdomains.html (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install-virtdomains.html Tue Feb 27 04:17:11 2007
@@ -1,4 +1,4 @@
-<!-- $Id: install-virtdomains.html,v 1.2.2.1 2004/01/15 20:24:25 ken3 Exp $ -->
+<!-- $Id: install-virtdomains.html,v 1.4 2006/11/30 17:11:16 murch Exp $ -->
<HTML>
<HEAD>
<TITLE>Configuring Virtual Domains
@@ -220,5 +220,5 @@
</kbd></pre>
<P><HR>
-last modified: $Date: 2004/01/15 20:24:25 $
+last modified: $Date: 2006/11/30 17:11:16 $
</BODY></HTML>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install.html
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install.html?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install.html (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/install.html Tue Feb 27 04:17:11 2007
@@ -1,4 +1,4 @@
-<!-- $Id: install.html,v 1.9.2.1 2005/04/14 17:03:57 ken3 Exp $ -->
+<!-- $Id: install.html,v 1.10 2006/11/30 17:11:16 murch Exp $ -->
<HTML>
<HEAD>
<TITLE>Installing and Configuring the Cyrus IMAP Server</TITLE>
@@ -58,7 +58,7 @@
</ul>
<P><HR>
-last modified: $Date: 2005/04/14 17:03:57 $
+last modified: $Date: 2006/11/30 17:11:16 $
<br>
<A HREF="index.html">Return</A> to the Cyrus IMAP Server Home Page
</BODY></HTML>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/internal/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/internal/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/internal/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/internal/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,15 +1,15 @@
-/bytecode/1.2/Wed Oct 22 18:02:54 2003//Tcyrus-release-2-3-7
-/database-formats.html/1.1.2.2/Mon Apr 19 00:43:52 2004//Tcyrus-release-2-3-7
-/hacking/1.2/Wed Oct 22 18:02:54 2003//Tcyrus-release-2-3-7
-/internationalization.html/1.7/Wed Oct 22 18:50:05 2003//Tcyrus-release-2-3-7
-/locking/1.2/Sat May 25 19:57:43 2002//Tcyrus-release-2-3-7
-/mailbox-format.html/1.3.2.7/Fri Mar 31 19:22:10 2006//Tcyrus-release-2-3-7
-/master-state-machine.fig/1.2/Wed Oct 22 18:02:54 2003//Tcyrus-release-2-3-7
-/prot-events/1.1/Sun Feb 3 15:47:54 2002//Tcyrus-release-2-3-7
-/prot.html/1.3/Wed Aug 6 21:28:05 2003//Tcyrus-release-2-3-7
-/replication_examples/1.1.2.1/Mon Feb 21 19:25:15 2005//Tcyrus-release-2-3-7
-/replication_protocol/1.1.2.1/Mon Feb 21 19:25:15 2005//Tcyrus-release-2-3-7
-/specials/1.1.2.2/Thu May 6 19:41:44 2004//Tcyrus-release-2-3-7
-/uuid/1.1.2.1/Mon Feb 21 19:25:15 2005//Tcyrus-release-2-3-7
-/var_directory_structure/1.1.2.1/Mon Feb 21 19:25:16 2005//Tcyrus-release-2-3-7
+/bytecode/1.2/Wed Oct 22 18:02:54 2003//
+/database-formats.html/1.3/Thu Nov 30 17:11:16 2006//
+/hacking/1.2/Wed Oct 22 18:02:54 2003//
+/internationalization.html/1.7/Wed Oct 22 18:50:05 2003//
+/locking/1.2/Sat May 25 19:57:43 2002//
+/mailbox-format.html/1.5/Thu Nov 30 17:11:16 2006//
+/master-state-machine.fig/1.2/Wed Oct 22 18:02:54 2003//
+/prot-events/1.1/Sun Feb 3 15:47:54 2002//
+/prot.html/1.3/Wed Aug 6 21:28:05 2003//
+/replication_examples/1.2/Thu Nov 30 17:11:16 2006//
+/replication_protocol/1.2/Thu Nov 30 17:11:16 2006//
+/specials/1.2/Thu Nov 30 17:11:16 2006//
+/uuid/1.2/Thu Nov 30 17:11:16 2006//
+/var_directory_structure/1.2/Thu Nov 30 17:11:16 2006//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/internal/database-formats.html
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/internal/database-formats.html?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/internal/database-formats.html (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/internal/database-formats.html Tue Feb 27 04:17:11 2007
@@ -4,7 +4,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="revision" content="$Id: database-formats.html,v 1.1.2.2 2004/04/19 00:43:52 ken3 Exp $" />
+<meta name="revision" content="$Id: database-formats.html,v 1.3 2006/11/30 17:11:16 murch Exp $" />
<meta name="author" content="Ken Murchison" />
<title>Database Formats</title>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/internal/mailbox-format.html
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/internal/mailbox-format.html?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/internal/mailbox-format.html (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/internal/mailbox-format.html Tue Feb 27 04:17:11 2007
@@ -4,7 +4,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="revision" content="$Id: mailbox-format.html,v 1.3.2.7 2006/03/31 19:22:10 murch Exp $" />
+<meta name="revision" content="$Id: mailbox-format.html,v 1.5 2006/11/30 17:11:16 murch Exp $" />
<meta name="author" content="Rob Siemborski" />
<title>mailbox format</title>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/mailing-list.html
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/mailing-list.html?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/mailing-list.html (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/mailing-list.html Tue Feb 27 04:17:11 2007
@@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
<html> <head>
<title>info-cyrus mailing list</title>
-<!-- $Id: mailing-list.html,v 1.5 2003/02/24 23:56:23 ken3 Exp $ -->
+<!-- $Id: mailing-list.html,v 1.6 2007/02/07 18:58:07 murch Exp $ -->
</head>
<body>
@@ -16,10 +16,10 @@
<p> <b>To subscribe</b>: Send mail to <a
href=
-"mailto:majordomo at lists.andrew.cmu.edu?subject=subscribe info-cyrus">
-<TT>majordomo at lists.andrew.cmu.edu</TT></a>
+"mailto:info-cyrus-subscribe at lists.andrew.cmu.edu">
+<TT>info-cyrus-subscribe at lists.andrew.cmu.edu</TT></a>
-to subscribe with the body of 'subscribe info-cyrus' (or just click
+to subscribe (or just click
the link above and that should just work).
<p>An archive is availible via anonymous IMAP at <a
@@ -27,8 +27,8 @@
imap://cyrus.andrew.cmu.edu/archive.info-cyrus</a>.
<p>A web archive is also available at
-<a href="http://asg.web.cmu.edu/archive/mailbox.php3?mailbox=archive.info-cyrus">
-http://asg.web.cmu.edu/archive/mailbox.php3?mailbox=archive.info-cyrus</a>
+<a href="http://cyrusimap.web.cmu.edu/archive/index.php?mailbox=archive.info-cyrus">
+http://cyrusimap.web.cmu.edu/archive/index.php?mailbox=archive.info-cyrus</a>
<p>If you are not subscribed to the list (or you are sending the
message from a different address than the one which you are subscribed
@@ -37,16 +37,16 @@
the message.
<p>There is also a developers list available at <tt>cyrus-devel at lists.andrew.cmu.edu</tt>.
-with similar <a href="mailto:majordomo at lists.andrew.cmu.edu?subject=subscribe cyrus-devel">subscription</a>
-methods and <a href="http://asg.web.cmu.edu/archive/mailbox.php3?mailbox=archive.cyrus-devel">
+with similar <a href="mailto:cyrus-devel-subscribe at lists.andrew.cmu.edu">subscription</a>
+methods and <a href="http://cyrusimap.web.cmu.edu/archive/index.php?mailbox=archive.cyrus-devel">
archive location</a>
<p>Detailed contact information can be found at <a
-href="http://asg.web.cmu.edu/cyrus/contacts.html">
-http://asg.web.cmu.edu/cyrus/contacts.html</a>
+href="http://cyrusimap.web.cmu.edu/lists.html">
+http://cyrusimap.web.cmu.edu/lists.html</a>
<P><HR>
-last modified: $Date: 2003/02/24 23:56:23 $
+last modified: $Date: 2007/02/07 18:58:07 $
<br>
<A HREF="index.html">Return</A> to the Cyrus IMAP Server Home Page
</BODY></HTML>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/man.html
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/man.html?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/man.html (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/man.html Tue Feb 27 04:17:11 2007
@@ -1,4 +1,4 @@
-<!-- $Id: man.html,v 1.15.2.3 2005/03/30 21:44:25 ken3 Exp $ -->
+<!-- $Id: man.html,v 1.18 2006/11/30 17:11:16 murch Exp $ -->
<HTML>
<HEAD>
<TITLE>Cyrus IMAP Server Man Pages</TITLE>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/overview.html
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/overview.html?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/overview.html (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/overview.html Tue Feb 27 04:17:11 2007
@@ -1,6 +1,6 @@
<HTML><HEAD>
<title>Cyrus IMAP Server: Overview and Concepts</title>
-<!-- $Id: overview.html,v 1.21.2.3 2004/07/27 13:13:42 ken3 Exp $ -->
+<!-- $Id: overview.html,v 1.25 2006/11/30 17:11:16 murch Exp $ -->
</HEAD><BODY>
<H1>Cyrus IMAP Server: Overview and Concepts</H1>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/readme.html
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/readme.html?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/readme.html (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/readme.html Tue Feb 27 04:17:11 2007
@@ -1,6 +1,6 @@
<HTML><HEAD>
<TITLE>Cyrus IMAP Server Release Information</TITLE>
- <!-- $Id: readme.html,v 1.19.2.1 2006/07/10 14:04:22 murch Exp $ -->
+ <!-- $Id: readme.html,v 1.22 2007/02/06 18:51:29 murch Exp $ -->
</HEAD><BODY>
<H1> Cyrus IMAP Server Release Information</H1>
@@ -56,7 +56,7 @@
the facility to support the IMAP CONDSTORE extension (modification
sequences). It is recommended that you do not try to use both
CONDSTORE and replication at this time. The deficiencies in the
-replication protocol will be fixed in version 2.3.8.
+replication protocol will be fixed in version 2.3.9.
</i></b>
@@ -78,7 +78,7 @@
href="overview.html">overview.html</a>.
<P> This server has been successfully installed on a number of Unix
-systems. We run the software under SPARC Solaris 2.7. Please refer
+systems. We run the software under SPARC Solaris 8. Please refer
to <a href="os.html">os.html</a> for operating system specific issues.
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/specs.html
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/specs.html?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/specs.html (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/specs.html Tue Feb 27 04:17:11 2007
@@ -1,4 +1,4 @@
-<!-- $Id: specs.html,v 1.50.2.32 2006/06/16 15:10:28 murch Exp $ -->
+<!-- $Id: specs.html,v 1.66 2006/11/30 17:11:16 murch Exp $ -->
<HTML>
<HEAD>
<TITLE>Cyrus IMAP Server Protocol Specifications</TITLE>
@@ -80,52 +80,42 @@
RFC 3206</A></TD><TD>The SYS and AUTH POP Response Codes</TD></TR>
<TR><TD COLSPAN=2><br><h2>NNTP</h2></TD></TR>
-<TR><TD><A HREF="http://www.ietf.org/rfc/rfc0977.txt">RFC 977</A></TD>
-<TD>Network News Transfer Protocol
-<BR><I>being updated by</I> <A HREF="http://www.ietf.org/internet-drafts/draft-ietf-nntpext-base-27.txt">
-draft-ietf-nntpext-base</A></TD></TR>
+<TR><TD><A HREF="http://www.ietf.org/rfc/rfc3977.txt">RFC 3977</A></TD>
+<TD>Network News Transfer Protocol (NNTP)</TD></TR>
+<TR><TD><A HREF="http://www.ietf.org/rfc/rfc4642.txt">RFC 4642</A></TD>
+<TD>Using Transport Layer Security (TLS) with
+Network News Transfer Protocol (NNTP)</TD></TR>
+<TR><TD><A HREF="http://www.ietf.org/rfc/rfc4643.txt">RFC 4643</A></TD>
+<TD>Network News Transfer Protocol (NNTP) Extension for Authentication</TD></TR>
+<TR><TD><A HREF="http://www.ietf.org/rfc/rfc4644.txt">RFC 4644</A></TD>
+<TD>Network News Transfer Protocol (NNTP) Extension for Streaming Feeds</TD></TR>
<TR><TD><A HREF="http://www.ietf.org/rfc/rfc2980.txt">RFC 2980</A></TD>
<TD>Common NNTP Extensions</TD></TR>
-<TR><TD><A HREF="http://www.ietf.org/internet-drafts/draft-ietf-nntpext-streaming-06.txt">
-draft-ietf-nntpext-streaming</A></TD>
-<TD>NNTP Extension for Streaming Feeds</TD></TR>
-<TR><TD><A HREF="http://www.ietf.org/internet-drafts/draft-ietf-nntpext-authinfo-09.txt">
-draft-ietf-nntpext-authinfo</A></TD>
-<TD>NNTP Extension for Authentication</TD></TR>
-<TR><TD><A HREF="http://www.ietf.org/internet-drafts/draft-ietf-nntpext-tls-nntp-07.txt">
-draft-ietf-nntpext-tls-nntp</A></TD>
-<TD>Using TLS with NNTP</TD></TR>
<TR><TD COLSPAN=2><br><h2>SASL</h2></TD></TR>
-<TR><TD><A HREF="http://www.ietf.org/rfc/rfc2222.txt">RFC 2222</A></TD>
-<TD>Simple Authentication and Security Layer (SASL)
-<BR><I>being revised by</I> <A HREF="http://www.ietf.org/internet-drafts/draft-ietf-sasl-rfc2222bis-11.txt">
-draft-ietf-sasl-rfc2222bis</A></TD></TR>
+<TR><TD><A HREF="http://www.ietf.org/rfc/rfc4422.txt">RFC 4422</A></TD>
+<TD>Simple Authentication and Security Layer (SASL)</TD></TR>
+<TR><TD><A HREF="http://www.ietf.org/rfc/rfc4505.txt">RFC 4505</A></TD>
+<TD>Anonymous Simple Authentication and Security Layer (SASL) Mechanism</TD></TR>
+<TR><TD><A HREF="http://www.ietf.org/rfc/rfc4616.txt">RFC 4616</A></TD>
+<TD>The PLAIN Simple Authentication and Security Layer (SASL) Mechanism</TD></TR>
<TR><TD><A HREF="http://www.ietf.org/rfc/rfc2195.txt">RFC 2195</A></TD>
<TD>IMAP/POP AUTHorize Extension for Simple Challenge/Response
<BR><I>being revised by</I>
-<A HREF="http://www.ietf.org/internet-drafts/draft-ietf-sasl-crammd5-04.txt">
+<A HREF="http://www.ietf.org/internet-drafts/draft-ietf-sasl-crammd5-07.txt">
draft-ietf-sasl-crammd5</A></TD></TR>
-<TR><TD><A HREF="http://www.ietf.org/rfc/rfc2245.txt">RFC 2245</A></TD>
-<TD>Anonymous SASL Mechanism
-<BR><I>being revised by</I> <A HREF="http://www.ietf.org/internet-drafts/draft-ietf-sasl-anon-05.txt">
-draft-ietf-sasl-anon</A></TD></TR>
<TR><TD><A HREF="http://www.ietf.org/rfc/rfc2444.txt">RFC 2444</A></TD>
<TD>The One-Time-Password SASL Mechanism</TD></TR>
-<TR><TD><A HREF="http://www.ietf.org/rfc/rfc2595.txt">RFC 2595</A></TD>
-<TD>Using TLS with IMAP, POP3 and ACAP
-<BR><I>being revised by</I> <A HREF="http://www.ietf.org/internet-drafts/draft-ietf-sasl-plain-08.txt">
-draft-ietf-sasl-plain</a></TD></TR>
<TR><TD><A HREF="http://www.ietf.org/rfc/rfc2831.txt">RFC 2831</A></TD>
<TD>Using Digest Authentication as a SASL Mechanism
-<BR><I>being revised by</I> <A HREF="http://www.ietf.org/internet-drafts/draft-ietf-sasl-rfc2831bis-06.txt">
+<BR><I>being revised by</I> <A HREF="http://www.ietf.org/internet-drafts/draft-ietf-sasl-rfc2831bis-10.txt">
draft-ietf-sasl-rfc2831bis</a></TD></TR>
<TR><TD COLSPAN=2><br><h2>TLS/SSL</h2></TD></TR>
+<TR><TD><A HREF="http://www.ietf.org/rfc/rfc4346.txt">RFC 4346</A></TD>
+<TD>The Transport Layer Security (TLS) Protocol Version 1.1</TD></TR>
<TR><TD><A HREF="http://www.ietf.org/rfc/rfc2246.txt">RFC 2246</A></TD>
-<TD>The TLS Protocol Version 1.0
-<BR><I>being revised by</I> <A HREF="http://www.ietf.org/internet-drafts/draft-ietf-tls-rfc2246-bis-13.txt">
-draft-ietf-tls-rfc2246-bis</a></TD></TR>
+<TD>The TLS Protocol Version 1.0</TD></TR>
<TR><TD><A HREF="http://www.netscape.com/eng/ssl3/draft302.txt">
draft-freier-ssl-version3</A></TD>
<TD>The SSL Protocol Version 3.0</TD></TR>
@@ -206,7 +196,7 @@
<TR><TD><A HREF="http://www.ietf.org/rfc/rfc1036.txt">RFC 1036</A></TD>
<TD>Standard for Interchange of USENET Messages
<BR><I>being updated by</I>
-<A HREF="http://www.ietf.org/internet-drafts/draft-ietf-usefor-usefor-08.txt">
+<A HREF="http://www.ietf.org/internet-drafts/draft-ietf-usefor-usefor-10.txt">
draft-ietf-usefor-usefor</A> <I>and</I>
<A HREF="http://www.ietf.org/internet-drafts/draft-ietf-usefor-usepro-05.txt">
draft-ietf-usefor-usepro</A></TD></TR>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/text/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/text/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/text/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/doc/text/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,4 +1,4 @@
-/.cvsignore/1.2.2.1/Mon Dec 5 15:58:06 2005//Tcyrus-release-2-3-7
-/Makefile/1.4/Thu Nov 14 15:27:35 2002//Tcyrus-release-2-3-7
-/htmlstrip.c/1.9/Wed Oct 22 18:50:06 2003//Tcyrus-release-2-3-7
+/.cvsignore/1.3/Thu Nov 30 17:11:17 2006//
+/Makefile/1.4/Thu Nov 14 15:27:35 2002//
+/htmlstrip.c/1.9/Wed Oct 22 18:50:06 2003//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/et/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/et/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/et/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/et/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,22 +1,22 @@
-/.cvsignore/1.1/Sun Jan 6 02:03:30 2002//Tcyrus-release-2-3-7
-/Makefile.in/1.13/Tue Nov 27 02:24:56 2001//Tcyrus-release-2-3-7
-/com_err.3/1.2/Tue May 23 20:52:06 2000//Tcyrus-release-2-3-7
-/com_err.c/1.5.4.1/Tue May 25 01:28:00 2004//Tcyrus-release-2-3-7
-/com_err.h/1.3/Thu Feb 13 20:15:21 2003//Tcyrus-release-2-3-7
-/com_err.texinfo/1.1/Wed Jul 5 18:34:05 1995//Tcyrus-release-2-3-7
-/compile_et.1/1.2/Tue May 23 20:52:06 2000//Tcyrus-release-2-3-7
-/compile_et.sh/1.2/Tue May 23 20:52:06 2000//Tcyrus-release-2-3-7
-/config_script/1.2/Tue May 23 20:52:06 2000//Tcyrus-release-2-3-7
-/error_message.c/1.5.4.1/Tue May 25 01:28:00 2004//Tcyrus-release-2-3-7
-/error_table.h/1.3/Thu Feb 13 20:15:21 2003//Tcyrus-release-2-3-7
-/et_c.awk/1.1/Wed Jul 5 18:34:05 1995//Tcyrus-release-2-3-7
-/et_h.awk/1.1/Wed Jul 5 18:34:05 1995//Tcyrus-release-2-3-7
-/et_name.c/1.3/Thu Feb 13 20:15:21 2003//Tcyrus-release-2-3-7
-/init_et.c/1.3/Thu Feb 13 20:15:21 2003//Tcyrus-release-2-3-7
-/internal.h/1.3/Thu Feb 13 20:15:21 2003//Tcyrus-release-2-3-7
-/mit-sipb-copyright.h/1.1/Wed Jul 5 18:34:05 1995//Tcyrus-release-2-3-7
-/test1.et/1.1/Wed Jul 5 18:34:05 1995//Tcyrus-release-2-3-7
-/test2.et/1.1/Wed Jul 5 18:34:05 1995//Tcyrus-release-2-3-7
-/test_et.c/1.1/Wed Jul 5 18:34:05 1995//Tcyrus-release-2-3-7
-/texinfo.tex/1.1/Wed Jul 5 18:34:05 1995//Tcyrus-release-2-3-7
+/.cvsignore/1.1/Sun Jan 6 02:03:30 2002//
+/Makefile.in/1.13/Tue Nov 27 02:24:56 2001//
+/com_err.3/1.2/Tue May 23 20:52:06 2000//
+/com_err.c/1.6/Sat May 22 03:45:47 2004//
+/com_err.h/1.3/Thu Feb 13 20:15:21 2003//
+/com_err.texinfo/1.1/Wed Jul 5 18:34:05 1995//
+/compile_et.1/1.2/Tue May 23 20:52:06 2000//
+/compile_et.sh/1.2/Tue May 23 20:52:06 2000//
+/config_script/1.2/Tue May 23 20:52:06 2000//
+/error_message.c/1.6/Sat May 22 03:45:47 2004//
+/error_table.h/1.3/Thu Feb 13 20:15:21 2003//
+/et_c.awk/1.1/Wed Jul 5 18:34:05 1995//
+/et_h.awk/1.1/Wed Jul 5 18:34:05 1995//
+/et_name.c/1.3/Thu Feb 13 20:15:21 2003//
+/init_et.c/1.3/Thu Feb 13 20:15:21 2003//
+/internal.h/1.3/Thu Feb 13 20:15:21 2003//
+/mit-sipb-copyright.h/1.1/Wed Jul 5 18:34:05 1995//
+/test1.et/1.1/Wed Jul 5 18:34:05 1995//
+/test2.et/1.1/Wed Jul 5 18:34:05 1995//
+/test_et.c/1.1/Wed Jul 5 18:34:05 1995//
+/texinfo.tex/1.1/Wed Jul 5 18:34:05 1995//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/.cvsignore
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/.cvsignore?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/.cvsignore (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/.cvsignore Tue Feb 27 04:17:11 2007
@@ -7,6 +7,7 @@
ctl_mboxlist
cvt_cyrusdb
cyrdump
+cyr_dbtool
cyr_expire
deliver
fetchnews
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,132 +1,133 @@
-/.cvsignore/1.9.2.3/Wed Mar 30 03:16:04 2005//Tcyrus-release-2-3-7
-/Makefile.dist/1.7.2.1/Tue Nov 18 16:22:51 2003//Tcyrus-release-2-3-7
-/Makefile.in/1.175.2.20/Wed Mar 15 18:56:29 2006//Tcyrus-release-2-3-7
-/annotate.c/1.16.2.16/Thu Jun 1 13:23:23 2006//Tcyrus-release-2-3-7
-/annotate.h/1.5.2.3/Thu Aug 5 16:23:30 2004//Tcyrus-release-2-3-7
-/append.c/1.102.2.16/Thu May 25 12:57:31 2006//Tcyrus-release-2-3-7
-/append.h/1.24.2.4/Thu Jun 2 16:16:02 2005//Tcyrus-release-2-3-7
-/arbitron.c/1.31.2.5/Mon Jan 16 15:43:07 2006//Tcyrus-release-2-3-7
-/backend.c/1.16.2.18/Tue Jun 27 15:58:42 2006//Tcyrus-release-2-3-7
-/backend.h/1.7.2.7/Tue Jan 17 20:15:20 2006//Tcyrus-release-2-3-7
-/chk_cyrus.c/1.11.2.6/Thu Aug 5 16:23:30 2004//Tcyrus-release-2-3-7
-/cli_fatal.c/1.2.2.1/Sat Jan 31 18:56:54 2004//Tcyrus-release-2-3-7
-/convert_code.c/1.7/Thu Feb 13 20:15:23 2003//Tcyrus-release-2-3-7
-/convert_code.h/1.6/Wed Oct 22 18:50:07 2003//Tcyrus-release-2-3-7
-/ctl_cyrusdb.c/1.18.2.7/Wed Feb 16 21:06:18 2005//Tcyrus-release-2-3-7
-/ctl_deliver.c/1.18.2.2/Tue May 25 01:28:02 2004//Tcyrus-release-2-3-7
-/ctl_mboxlist.c/1.43.2.7/Thu Apr 6 15:42:10 2006//Tcyrus-release-2-3-7
-/cvt_cyrusdb.c/1.12.2.3/Tue May 25 01:28:03 2004//Tcyrus-release-2-3-7
-/cyr_expire.c/1.2.2.11/Thu Dec 15 13:21:16 2005//Tcyrus-release-2-3-7
-/cyrdump.c/1.14.2.5/Fri Mar 31 19:22:12 2006//Tcyrus-release-2-3-7
-/deliver.c/1.169.2.10/Wed May 4 19:26:16 2005//Tcyrus-release-2-3-7
-/delivered_prune.c/1.1.2.1/Fri Apr 8 16:48:30 2005//Tcyrus-release-2-3-7
-/duplicate.c/1.35.2.5/Wed Mar 24 19:53:00 2004//Tcyrus-release-2-3-7
-/duplicate.h/1.14.2.1/Thu Feb 12 05:32:34 2004//Tcyrus-release-2-3-7
-/fetchnews.c/1.2.2.13/Mon Apr 10 16:20:56 2006//Tcyrus-release-2-3-7
-/fud.c/1.48.2.6/Wed Apr 13 15:43:36 2005//Tcyrus-release-2-3-7
-/global.c/1.2.2.15/Tue Dec 13 19:35:50 2005//Tcyrus-release-2-3-7
-/global.h/1.2.2.6/Thu Nov 17 15:46:15 2005//Tcyrus-release-2-3-7
-/idle.c/1.2.2.3/Mon Dec 12 21:23:58 2005//Tcyrus-release-2-3-7
-/idle.h/1.4.4.3/Mon Dec 12 21:23:58 2005//Tcyrus-release-2-3-7
-/idled.c/1.17.2.6/Mon Dec 12 21:23:58 2005//Tcyrus-release-2-3-7
-/idled.h/1.4.4.1/Mon Dec 12 21:23:59 2005//Tcyrus-release-2-3-7
-/imap_err.et/1.50.2.3/Fri May 27 17:40:38 2005//Tcyrus-release-2-3-7
-/imap_proxy.c/1.1.2.17/Fri Feb 10 21:10:45 2006//Tcyrus-release-2-3-7
-/imap_proxy.h/1.1.2.7/Tue May 31 18:09:20 2005//Tcyrus-release-2-3-7
-/imapd.c/1.443.2.84/Mon Jul 3 13:22:41 2006//Tcyrus-release-2-3-7
-/imapd.h/1.55.2.4/Fri Mar 31 19:22:21 2006//Tcyrus-release-2-3-7
-/imapparse.c/1.13.2.2/Fri Mar 17 14:25:45 2006//Tcyrus-release-2-3-7
-/index.c/1.199.2.28/Wed Jul 5 19:51:30 2006//Tcyrus-release-2-3-7
-/index.h/1.9.2.6/Fri Mar 31 19:22:24 2006//Tcyrus-release-2-3-7
-/ipurge.c/1.20.2.7/Mon May 31 18:22:53 2004//Tcyrus-release-2-3-7
-/lmtp_sieve.c/1.1.2.15/Tue May 23 13:09:35 2006//Tcyrus-release-2-3-7
-/lmtp_sieve.h/1.1.2.5/Wed Oct 19 14:50:06 2005//Tcyrus-release-2-3-7
-/lmtpd.c/1.121.2.35/Tue May 23 13:09:36 2006//Tcyrus-release-2-3-7
-/lmtpd.h/1.1.2.1/Wed Oct 19 14:50:07 2005//Tcyrus-release-2-3-7
-/lmtpengine.c/1.93.2.17/Tue Nov 1 20:14:20 2005//Tcyrus-release-2-3-7
-/lmtpengine.h/1.18.2.5/Sat Apr 17 18:47:30 2004//Tcyrus-release-2-3-7
-/lmtpstats.snmp/1.6/Thu Oct 12 19:13:57 2000//Tcyrus-release-2-3-7
-/mailbox.c/1.147.2.36/Fri Jun 2 18:55:06 2006//Tcyrus-release-2-3-7
-/mailbox.h/1.77.2.14/Fri Jun 2 16:41:57 2006//Tcyrus-release-2-3-7
-/make_md5.c/1.1.2.4/Wed Jan 18 19:41:56 2006//Tcyrus-release-2-3-7
-/mbdump.c/1.26.2.10/Mon May 22 20:52:27 2006//Tcyrus-release-2-3-7
-/mbdump.h/1.4.4.1/Thu Apr 8 21:13:05 2004//Tcyrus-release-2-3-7
-/mbexamine.c/1.5.2.10/Fri Jun 2 16:41:57 2006//Tcyrus-release-2-3-7
-/mboxkey.c/1.1.2.1/Thu Nov 17 15:46:28 2005//Tcyrus-release-2-3-7
-/mboxkey.h/1.1.2.1/Thu Nov 17 15:46:28 2005//Tcyrus-release-2-3-7
-/mboxlist.c/1.221.2.22/Mon May 22 20:37:25 2006//Tcyrus-release-2-3-7
-/mboxlist.h/1.38.2.3/Mon Feb 21 19:25:40 2005//Tcyrus-release-2-3-7
-/mboxname.c/1.31.2.4/Mon Feb 14 06:43:17 2005//Tcyrus-release-2-3-7
-/mboxname.h/1.12.2.1/Wed Mar 24 19:53:08 2004//Tcyrus-release-2-3-7
-/mbpath.c/1.14.2.5/Sat Feb 25 18:32:35 2006//Tcyrus-release-2-3-7
-/message.c/1.97.2.11/Fri May 26 16:27:18 2006//Tcyrus-release-2-3-7
-/message.h/1.6.4.6/Thu Mar 9 22:39:36 2006//Tcyrus-release-2-3-7
-/mupdate-client.c/1.38.2.12/Wed Mar 15 18:56:30 2006//Tcyrus-release-2-3-7
-/mupdate-client.h/1.13.4.2/Wed Nov 23 13:41:26 2005//Tcyrus-release-2-3-7
-/mupdate-slave.c/1.24.2.4/Wed Mar 15 18:56:31 2006//Tcyrus-release-2-3-7
-/mupdate.c/1.77.2.19/Wed Mar 15 18:56:31 2006//Tcyrus-release-2-3-7
-/mupdate.h/1.15.2.2/Wed Mar 15 18:56:32 2006//Tcyrus-release-2-3-7
-/mupdate_err.et/1.5/Wed Mar 20 23:03:06 2002//Tcyrus-release-2-3-7
-/mutex.h/1.2/Wed Oct 22 18:02:58 2003//Tcyrus-release-2-3-7
-/mutex_fake.c/1.2/Wed Oct 22 18:02:58 2003//Tcyrus-release-2-3-7
-/mutex_pthread.c/1.2/Wed Oct 22 18:02:58 2003//Tcyrus-release-2-3-7
-/nntp_err.et/1.2/Wed Oct 22 18:02:58 2003//Tcyrus-release-2-3-7
-/nntpd.c/1.2.2.50/Fri May 26 15:50:07 2006//Tcyrus-release-2-3-7
-/notify.c/1.13.2.1/Fri Mar 17 14:14:54 2006//Tcyrus-release-2-3-7
-/notify.h/1.7/Wed Oct 22 18:50:08 2003//Tcyrus-release-2-3-7
-/pop3d.c/1.144.2.43/Fri May 26 15:50:09 2006//Tcyrus-release-2-3-7
-/proc.c/1.25/Wed Oct 22 18:50:08 2003//Tcyrus-release-2-3-7
-/protocol.c/1.2.2.13/Tue Jun 27 15:58:42 2006//Tcyrus-release-2-3-7
-/protocol.h/1.2.2.6/Tue Jun 27 15:58:42 2006//Tcyrus-release-2-3-7
-/proxy.c/1.1.2.8/Fri Feb 10 21:10:58 2006//Tcyrus-release-2-3-7
-/proxy.h/1.1.2.7/Fri Feb 10 21:10:58 2006//Tcyrus-release-2-3-7
-/pushstats.snmp/1.10/Wed Mar 6 20:49:03 2002//Tcyrus-release-2-3-7
-/quota.c/1.48.2.17/Fri May 27 16:49:44 2005//Tcyrus-release-2-3-7
-/quota.h/1.1.2.3/Mon Aug 9 18:51:21 2004//Tcyrus-release-2-3-7
-/quota_db.c/1.1.2.3/Mon Aug 9 18:51:21 2004//Tcyrus-release-2-3-7
-/reconstruct.c/1.81.2.21/Fri Jun 2 16:41:57 2006//Tcyrus-release-2-3-7
-/saslclient.c/1.12.2.2/Tue Jun 27 15:58:42 2006//Tcyrus-release-2-3-7
-/saslclient.h/1.2/Wed Oct 22 18:02:59 2003//Tcyrus-release-2-3-7
-/saslserver.c/1.5.2.4/Mon Feb 21 19:25:45 2005//Tcyrus-release-2-3-7
-/search_engines.c/1.5.4.1/Thu Apr 8 21:13:08 2004//Tcyrus-release-2-3-7
-/search_engines.h/1.2/Thu Feb 13 20:15:30 2003//Tcyrus-release-2-3-7
-/seen.h/1.14/Wed Oct 22 18:50:08 2003//Tcyrus-release-2-3-7
-/seen_bigdb.c/1.9.2.1/Fri Dec 19 18:33:38 2003//Tcyrus-release-2-3-7
-/seen_db.c/1.42.2.5/Thu Jun 24 15:16:29 2004//Tcyrus-release-2-3-7
-/seen_local.c/1.41.2.2/Mon Feb 14 06:43:17 2005//Tcyrus-release-2-3-7
-/setproctitle.c/1.16/Thu Feb 13 20:15:30 2003//Tcyrus-release-2-3-7
-/signals.c/1.11.2.2/Mon Feb 14 16:27:42 2005//Tcyrus-release-2-3-7
-/signals.h/1.1.2.1/Fri Dec 17 18:15:17 2004//Tcyrus-release-2-3-7
-/smmapd.c/1.1.2.14/Fri Jul 1 22:13:45 2005//Tcyrus-release-2-3-7
-/smtpclient.c/1.2/Wed Oct 22 18:02:59 2003//Tcyrus-release-2-3-7
-/smtpclient.h/1.2/Wed Oct 22 18:02:59 2003//Tcyrus-release-2-3-7
-/spool.c/1.2.2.7/Fri May 26 16:27:19 2006//Tcyrus-release-2-3-7
-/spool.h/1.2.2.2/Wed Mar 24 19:53:11 2004//Tcyrus-release-2-3-7
-/squat.c/1.6.4.1/Fri Feb 27 21:17:36 2004//Tcyrus-release-2-3-7
-/squat.h/1.2/Thu Feb 13 20:15:31 2003//Tcyrus-release-2-3-7
-/squat_build.c/1.9.4.1/Wed Dec 15 16:42:50 2004//Tcyrus-release-2-3-7
-/squat_internal.c/1.2/Thu Feb 13 20:15:31 2003//Tcyrus-release-2-3-7
-/squat_internal.h/1.2/Thu Feb 13 20:15:31 2003//Tcyrus-release-2-3-7
-/squatter.c/1.12.2.5/Fri Mar 31 19:22:28 2006//Tcyrus-release-2-3-7
-/sync_client.c/1.1.2.35/Wed Jun 14 18:03:24 2006//Tcyrus-release-2-3-7
-/sync_commit.c/1.1.2.10/Tue Jun 13 17:24:40 2006//Tcyrus-release-2-3-7
-/sync_commit.h/1.1.2.2/Tue May 17 18:29:46 2005//Tcyrus-release-2-3-7
-/sync_log.c/1.1.2.7/Thu May 12 19:56:17 2005//Tcyrus-release-2-3-7
-/sync_log.h/1.1.2.6/Wed Jun 14 14:16:12 2006//Tcyrus-release-2-3-7
-/sync_reset.c/1.1.2.4/Tue Dec 13 15:31:10 2005//Tcyrus-release-2-3-7
-/sync_server.c/1.1.2.23/Mon Jun 12 18:56:42 2006//Tcyrus-release-2-3-7
-/sync_support.c/1.1.2.19/Wed Jun 14 18:03:24 2006//Tcyrus-release-2-3-7
-/sync_support.h/1.1.2.9/Thu Jun 16 00:02:10 2005//Tcyrus-release-2-3-7
-/syncnews.c/1.24.2.2/Tue May 25 01:28:13 2004//Tcyrus-release-2-3-7
-/telemetry.c/1.8/Wed Oct 22 18:50:08 2003//Tcyrus-release-2-3-7
-/telemetry.h/1.3/Tue Jul 22 19:17:20 2003//Tcyrus-release-2-3-7
-/tls.c/1.47.2.3/Fri Oct 28 14:51:18 2005//Tcyrus-release-2-3-7
-/tls.h/1.18/Wed Oct 22 18:50:09 2003//Tcyrus-release-2-3-7
-/tls_prune.c/1.5.2.1/Tue Jan 27 23:13:51 2004//Tcyrus-release-2-3-7
-/unexpunge.c/1.1.2.5/Fri Mar 31 19:22:28 2006//Tcyrus-release-2-3-7
-/user.c/1.17.2.5/Thu Nov 17 15:46:28 2005//Tcyrus-release-2-3-7
-/user.h/1.6/Wed Oct 22 18:50:09 2003//Tcyrus-release-2-3-7
-/version.c/1.14.2.5/Wed Feb 16 21:06:19 2005//Tcyrus-release-2-3-7
-/version.h/1.128.2.17/Mon Jul 10 13:46:20 2006//Tcyrus-release-2-3-7
-/xversion.sh/1.7/Wed Oct 22 18:03:00 2003//Tcyrus-release-2-3-7
+/.cvsignore/1.12/Tue Jan 9 17:41:35 2007//
+/Makefile.dist/1.9/Thu Nov 30 17:11:17 2006//
+/Makefile.in/1.186/Tue Jan 9 17:41:35 2007//
+/annotate.c/1.35/Mon Feb 5 18:41:45 2007//
+/annotate.h/1.10/Thu Nov 30 17:11:17 2006//
+/append.c/1.110/Mon Feb 5 18:41:45 2007//
+/append.h/1.28/Thu Nov 30 17:11:17 2006//
+/arbitron.c/1.42/Mon Feb 5 18:49:55 2007//
+/backend.c/1.44/Mon Feb 5 18:41:46 2007//
+/backend.h/1.13/Thu Nov 30 17:11:17 2006//
+/chk_cyrus.c/1.18/Mon Feb 5 18:41:46 2007//
+/cli_fatal.c/1.4/Thu Nov 30 17:11:17 2006//
+/convert_code.c/1.7/Thu Feb 13 20:15:23 2003//
+/convert_code.h/1.6/Wed Oct 22 18:50:07 2003//
+/ctl_cyrusdb.c/1.28/Thu Nov 30 17:11:17 2006//
+/ctl_deliver.c/1.21/Thu Nov 30 17:11:17 2006//
+/ctl_mboxlist.c/1.53/Mon Feb 5 18:41:46 2007//
+/cvt_cyrusdb.c/1.16/Thu Nov 30 17:11:17 2006//
+/cyr_dbtool.c/1.1/Tue Jan 9 17:41:35 2007//
+/cyr_expire.c/1.10/Mon Feb 5 18:41:46 2007//
+/cyrdump.c/1.18/Mon Feb 5 18:41:46 2007//
+/deliver.c/1.176/Mon Feb 5 18:41:46 2007//
+/delivered_prune.c/1.2/Thu Nov 30 17:11:17 2006//
+/duplicate.c/1.42/Thu Nov 30 17:11:17 2006//
+/duplicate.h/1.16/Thu Nov 30 17:11:17 2006//
+/fetchnews.c/1.16/Thu Nov 30 17:11:17 2006//
+/fud.c/1.55/Mon Feb 5 18:41:46 2007//
+/global.c/1.21/Mon Feb 5 18:41:46 2007//
+/global.h/1.8/Thu Nov 30 17:11:17 2006//
+/idle.c/1.3/Thu Nov 30 17:11:17 2006//
+/idle.h/1.8/Thu Nov 30 17:11:17 2006//
+/idled.c/1.25/Mon Feb 5 18:41:46 2007//
+/idled.h/1.5/Thu Nov 30 17:11:18 2006//
+/imap_err.et/1.53/Thu Nov 30 17:11:18 2006//
+/imap_proxy.c/1.2/Thu Nov 30 17:11:18 2006//
+/imap_proxy.h/1.2/Thu Nov 30 17:11:18 2006//
+/imapd.c/1.509/Mon Feb 5 18:49:55 2007//
+/imapd.h/1.63/Thu Nov 30 17:11:18 2006//
+/imapparse.c/1.16/Thu Nov 30 17:11:18 2006//
+/index.c/1.223/Mon Feb 5 18:41:46 2007//
+/index.h/1.11/Thu Nov 30 17:11:18 2006//
+/ipurge.c/1.26/Thu Nov 30 17:11:18 2006//
+/lmtp_sieve.c/1.14/Mon Feb 5 18:41:47 2007//
+/lmtp_sieve.h/1.4/Thu Nov 30 17:11:18 2006//
+/lmtpd.c/1.147/Mon Feb 5 18:41:47 2007//
+/lmtpd.h/1.4/Thu Nov 30 17:11:18 2006//
+/lmtpengine.c/1.118/Mon Feb 5 18:41:47 2007//
+/lmtpengine.h/1.23/Thu Nov 30 17:11:18 2006//
+/lmtpstats.snmp/1.6/Thu Oct 12 19:13:57 2000//
+/mailbox.c/1.164/Mon Feb 5 18:41:47 2007//
+/mailbox.h/1.82/Thu Nov 30 17:11:19 2006//
+/make_md5.c/1.2/Thu Nov 30 17:11:19 2006//
+/mbdump.c/1.33/Mon Feb 5 18:41:47 2007//
+/mbdump.h/1.5/Thu Nov 30 17:11:19 2006//
+/mbexamine.c/1.13/Mon Feb 5 18:41:47 2007//
+/mboxkey.c/1.2/Thu Nov 30 17:11:19 2006//
+/mboxkey.h/1.2/Thu Nov 30 17:11:19 2006//
+/mboxlist.c/1.245/Mon Feb 5 18:41:47 2007//
+/mboxlist.h/1.40/Thu Nov 30 17:11:19 2006//
+/mboxname.c/1.37/Thu Nov 30 17:11:19 2006//
+/mboxname.h/1.14/Thu Nov 30 17:11:19 2006//
+/mbpath.c/1.20/Thu Nov 30 17:11:19 2006//
+/message.c/1.102/Mon Feb 5 18:41:47 2007//
+/message.h/1.8/Tue Dec 19 18:56:27 2006//
+/mupdate-client.c/1.49/Mon Feb 5 18:41:47 2007//
+/mupdate-client.h/1.16/Thu Nov 30 17:11:19 2006//
+/mupdate-slave.c/1.29/Mon Feb 5 18:41:47 2007//
+/mupdate.c/1.94/Wed Jan 31 14:10:05 2007//
+/mupdate.h/1.17/Thu Nov 30 17:11:19 2006//
+/mupdate_err.et/1.5/Wed Mar 20 23:03:06 2002//
+/mutex.h/1.2/Wed Oct 22 18:02:58 2003//
+/mutex_fake.c/1.2/Wed Oct 22 18:02:58 2003//
+/mutex_pthread.c/1.2/Wed Oct 22 18:02:58 2003//
+/nntp_err.et/1.2/Wed Oct 22 18:02:58 2003//
+/nntpd.c/1.54/Mon Feb 5 18:49:56 2007//
+/notify.c/1.15/Mon Feb 5 18:41:47 2007//
+/notify.h/1.7/Wed Oct 22 18:50:08 2003//
+/pop3d.c/1.171/Mon Feb 5 18:41:48 2007//
+/proc.c/1.25/Wed Oct 22 18:50:08 2003//
+/protocol.c/1.15/Thu Nov 30 17:11:19 2006//
+/protocol.h/1.7/Thu Nov 30 17:11:19 2006//
+/proxy.c/1.5/Mon Feb 5 18:41:48 2007//
+/proxy.h/1.2/Thu Nov 30 17:11:19 2006//
+/pushstats.snmp/1.10/Wed Mar 6 20:49:03 2002//
+/quota.c/1.67/Mon Feb 5 18:41:48 2007//
+/quota.h/1.3/Thu Nov 30 17:11:20 2006//
+/quota_db.c/1.4/Mon Feb 5 18:41:48 2007//
+/reconstruct.c/1.90/Mon Feb 5 18:41:48 2007//
+/saslclient.c/1.15/Thu Nov 30 17:11:20 2006//
+/saslclient.h/1.2/Wed Oct 22 18:02:59 2003//
+/saslserver.c/1.10/Thu Nov 30 17:11:20 2006//
+/search_engines.c/1.7/Mon Feb 5 18:41:48 2007//
+/search_engines.h/1.2/Thu Feb 13 20:15:30 2003//
+/seen.h/1.14/Wed Oct 22 18:50:08 2003//
+/seen_bigdb.c/1.11/Thu Nov 30 17:11:20 2006//
+/seen_db.c/1.51/Mon Feb 5 18:41:48 2007//
+/seen_local.c/1.44/Thu Nov 30 17:11:20 2006//
+/setproctitle.c/1.16/Thu Feb 13 20:15:30 2003//
+/signals.c/1.14/Thu Nov 30 17:11:20 2006//
+/signals.h/1.2/Thu Nov 30 17:11:20 2006//
+/smmapd.c/1.15/Mon Feb 5 18:41:48 2007//
+/smtpclient.c/1.2/Wed Oct 22 18:02:59 2003//
+/smtpclient.h/1.2/Wed Oct 22 18:02:59 2003//
+/spool.c/1.9/Thu Nov 30 17:11:20 2006//
+/spool.h/1.5/Thu Nov 30 17:11:20 2006//
+/squat.c/1.8/Thu Nov 30 17:11:20 2006//
+/squat.h/1.2/Thu Feb 13 20:15:31 2003//
+/squat_build.c/1.11/Thu Nov 30 17:11:20 2006//
+/squat_internal.c/1.2/Thu Feb 13 20:15:31 2003//
+/squat_internal.h/1.2/Thu Feb 13 20:15:31 2003//
+/squatter.c/1.17/Mon Feb 5 18:41:48 2007//
+/sync_client.c/1.4/Tue Jan 9 17:29:30 2007//
+/sync_commit.c/1.2/Thu Nov 30 17:11:20 2006//
+/sync_commit.h/1.2/Thu Nov 30 17:11:20 2006//
+/sync_log.c/1.3/Mon Feb 5 18:41:48 2007//
+/sync_log.h/1.2/Thu Nov 30 17:11:20 2006//
+/sync_reset.c/1.2/Thu Nov 30 17:11:20 2006//
+/sync_server.c/1.2/Thu Nov 30 17:11:20 2006//
+/sync_support.c/1.2/Thu Nov 30 17:11:20 2006//
+/sync_support.h/1.2/Thu Nov 30 17:11:20 2006//
+/syncnews.c/1.27/Thu Nov 30 17:11:20 2006//
+/telemetry.c/1.8/Wed Oct 22 18:50:08 2003//
+/telemetry.h/1.3/Tue Jul 22 19:17:20 2003//
+/tls.c/1.53/Mon Feb 5 18:49:56 2007//
+/tls.h/1.18/Wed Oct 22 18:50:09 2003//
+/tls_prune.c/1.7/Thu Nov 30 17:11:20 2006//
+/unexpunge.c/1.4/Wed Feb 7 14:27:52 2007//
+/user.c/1.21/Thu Nov 30 17:11:20 2006//
+/user.h/1.6/Wed Oct 22 18:50:09 2003//
+/version.c/1.21/Wed Feb 7 18:58:07 2007//
+/version.h/1.144/Tue Feb 6 18:07:42 2007//
+/xversion.sh/1.7/Wed Oct 22 18:03:00 2003//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/Makefile.dist
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/Makefile.dist?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/Makefile.dist (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/Makefile.dist Tue Feb 27 04:17:11 2007
@@ -1,4 +1,4 @@
-# $Id: Makefile.dist,v 1.7.2.1 2003/11/18 16:22:51 ken3 Exp $
+# $Id: Makefile.dist,v 1.9 2006/11/30 17:11:17 murch Exp $
# it would be nice to figure out how to make "Makefile" do an
# 'include' of this file.
# we'd have to make this use srcdir and only define COMPILE_ET if it wasn't
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/Makefile.in
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/Makefile.in?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/Makefile.in (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/Makefile.in Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
# Makefile for cyrus imap server and associated programs
-# $Id: Makefile.in,v 1.175.2.20 2006/03/15 18:56:29 murch Exp $
+# $Id: Makefile.in,v 1.186 2007/01/09 17:41:35 murch Exp $
#
# @configure_input@
#
@@ -114,7 +114,7 @@
SERVICETHREAD=../master/service-thread.o
PROGS = imapd lmtpd pop3d \
- fud smmapd reconstruct quota mbpath ipurge \
+ fud smmapd reconstruct quota mbpath ipurge cyr_dbtool \
cyrdump chk_cyrus cvt_cyrusdb deliver ctl_mboxlist \
ctl_deliver ctl_cyrusdb squatter mbexamine cyr_expire arbitron \
unexpunge @IMAP_PROGS@
@@ -258,6 +258,10 @@
$(CC) $(LDFLAGS) -o arbitron arbitron.o $(CLIOBJS) \
libimap.a $(DEPLIBS) $(LIBS)
+cyr_dbtool: cyr_dbtool.o mutex_fake.o libimap.a $(DEPLIBS)
+ $(CC) $(LDFLAGS) -o cyr_dbtool cyr_dbtool.o $(CLIOBJS) \
+ libimap.a $(DEPLIBS) $(LIBS)
+
cvt_cyrusdb: cvt_cyrusdb.o mutex_fake.o libimap.a $(DEPLIBS)
$(CC) $(LDFLAGS) -o cvt_cyrusdb cvt_cyrusdb.o $(CLIOBJS) \
libimap.a $(DEPLIBS) $(LIBS)
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/annotate.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/annotate.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/annotate.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/annotate.c Tue Feb 27 04:17:11 2007
@@ -40,7 +40,7 @@
*
*/
/*
- * $Id: annotate.c,v 1.16.2.16 2006/06/01 13:23:23 murch Exp $
+ * $Id: annotate.c,v 1.35 2007/02/05 18:41:45 jeaton Exp $
*/
#include <config.h>
@@ -71,6 +71,8 @@
#include "mboxlist.h"
#include "util.h"
#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
#include "annotate.h"
#include "sync_log.h"
@@ -1706,7 +1708,7 @@
(!mbrock->acl ||
!(cyrus_acl_myrights(sdata->auth_state, mbrock->acl) & ACL_LOOKUP) ||
!(cyrus_acl_myrights(sdata->auth_state, mbrock->acl) & ACL_WRITE))) {
- return;
+ return IMAP_PERMISSION_DENIED;
}
r = mailbox_open_header(int_mboxname, 0, &mailbox);
@@ -1724,6 +1726,8 @@
}
mailbox_close(&mailbox);
+
+ if (!r) sync_log_mailbox(int_mboxname);
return r;
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/annotate.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/annotate.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/annotate.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/annotate.h Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: annotate.h,v 1.5.2.3 2004/08/05 16:23:30 ken3 Exp $
+ * $Id: annotate.h,v 1.10 2006/11/30 17:11:17 murch Exp $
*/
#ifndef ANNOTATE_H
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/append.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/append.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/append.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/append.c Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
/* append.c -- Routines for appending messages to a mailbox
- * $Id: append.c,v 1.102.2.16 2006/05/25 12:57:31 murch Exp $
+ * $Id: append.c,v 1.110 2007/02/05 18:41:45 jeaton Exp $
*
* Copyright (c)1998, 2000 Carnegie Mellon University. All rights reserved.
*
@@ -61,6 +61,8 @@
#include "global.h"
#include "prot.h"
#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
#include "mboxlist.h"
#include "seen.h"
#include "retry.h"
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/append.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/append.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/append.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/append.h Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
/* append.h -- Description of messages to be copied
- * $Id: append.h,v 1.24.2.4 2005/06/02 16:16:02 ken3 Exp $
+ * $Id: append.h,v 1.28 2006/11/30 17:11:17 murch Exp $
*
* Copyright (c) 1998, 2000 Carnegie Mellon University. All rights reserved.
*
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/arbitron.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/arbitron.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/arbitron.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/arbitron.c Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: arbitron.c,v 1.31.2.5 2006/01/16 15:43:07 murch Exp $ */
+/* $Id: arbitron.c,v 1.42 2007/02/05 18:49:55 jeaton Exp $ */
#include <config.h>
@@ -68,6 +68,8 @@
#include "convert_code.h"
#include "seen.h"
#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
/* config.c stuff */
const int config_need_data = 0;
@@ -268,6 +270,8 @@
d->nreaders = 0;
d->nsubscribers = 0;
+ d->readers = NULL;
+ d->subscribers = NULL;
/* printf("inserting %s (key %s)\n", name, mbox.uniqueid); */
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/backend.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/backend.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/backend.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/backend.c Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: backend.c,v 1.16.2.18 2006/06/27 15:58:42 murch Exp $ */
+/* $Id: backend.c,v 1.44 2007/02/05 18:41:46 jeaton Exp $ */
#include <config.h>
@@ -70,6 +70,8 @@
#include "backend.h"
#include "global.h"
#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
#include "iptostring.h"
#include "util.h"
@@ -276,7 +278,7 @@
int sock = -1;
int r;
int err = -1;
- struct addrinfo hints, *res0 = NULL, *res1 = NULL, *res;
+ struct addrinfo hints, *res0 = NULL, *res;
struct sockaddr_un sunsock;
char buf[2048], *mechlist = NULL;
struct sigaction action;
@@ -322,12 +324,6 @@
if (!ret_backend) free(ret);
return NULL;
}
- /* Get addrinfo struct for local interface. */
- err = getaddrinfo(config_servername, NULL, &hints, &res1);
- if(err) {
- syslog(LOG_ERR, "getaddrinfo(%s) failed: %s",
- config_servername, gai_strerror(err));
- }
}
/* Setup timeout */
@@ -344,15 +340,6 @@
sock = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
if (sock < 0)
continue;
- /* Bind to local interface. */
- if (!err) {
- if (bind(sock, res1->ai_addr, res1->ai_addrlen) < 0) {
- struct sockaddr_in *local_sockaddr = (struct sockaddr_in *) res1->ai_addr;
- syslog(LOG_ERR, "failed to bind to address %s: %s",
- inet_ntoa(local_sockaddr->sin_addr), strerror(errno));
- }
- freeaddrinfo(res1);
- }
alarm(config_getint(IMAPOPT_CLIENT_TIMEOUT));
if (connect(sock, res->ai_addr, res->ai_addrlen) >= 0)
break;
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/backend.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/backend.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/backend.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/backend.h Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: backend.h,v 1.7.2.7 2006/01/17 20:15:20 murch Exp $ */
+/* $Id: backend.h,v 1.13 2006/11/30 17:11:17 murch Exp $ */
#ifndef _INCLUDED_BACKEND_H
#define _INCLUDED_BACKEND_H
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/chk_cyrus.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/chk_cyrus.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/chk_cyrus.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/chk_cyrus.c Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*
- * $Id: chk_cyrus.c,v 1.11.2.6 2004/08/05 16:23:30 ken3 Exp $
+ * $Id: chk_cyrus.c,v 1.18 2007/02/05 18:41:46 jeaton Exp $
*/
#include <config.h>
@@ -67,6 +67,8 @@
#include "mailbox.h"
#include "map.h"
#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
/* config.c stuff */
const int config_need_data = CONFIG_NEED_PARTITION_DATA;
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/cli_fatal.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/cli_fatal.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/cli_fatal.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/cli_fatal.c Tue Feb 27 04:17:11 2007
@@ -38,7 +38,7 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: cli_fatal.c,v 1.2.2.1 2004/01/31 18:56:54 ken3 Exp $
+ * $Id: cli_fatal.c,v 1.4 2006/11/30 17:11:17 murch Exp $
*/
#include <config.h>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/ctl_cyrusdb.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/ctl_cyrusdb.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/ctl_cyrusdb.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/ctl_cyrusdb.c Tue Feb 27 04:17:11 2007
@@ -38,7 +38,7 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: ctl_cyrusdb.c,v 1.18.2.7 2005/02/16 21:06:18 shadow Exp $
+ * $Id: ctl_cyrusdb.c,v 1.28 2006/11/30 17:11:17 murch Exp $
*/
#include <config.h>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/ctl_deliver.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/ctl_deliver.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/ctl_deliver.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/ctl_deliver.c Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
/* ctl_deliver.c -- Program to perform operations on duplicate delivery db
- * $Id: ctl_deliver.c,v 1.18.2.2 2004/05/25 01:28:02 ken3 Exp $
+ * $Id: ctl_deliver.c,v 1.21 2006/11/30 17:11:17 murch Exp $
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/ctl_mboxlist.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/ctl_mboxlist.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/ctl_mboxlist.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/ctl_mboxlist.c Tue Feb 27 04:17:11 2007
@@ -40,7 +40,7 @@
*
*/
-/* $Id: ctl_mboxlist.c,v 1.43.2.7 2006/04/06 15:42:10 murch Exp $ */
+/* $Id: ctl_mboxlist.c,v 1.53 2007/02/05 18:41:46 jeaton Exp $ */
/* currently doesn't catch signals; probably SHOULD */
@@ -63,6 +63,10 @@
#include "mboxlist.h"
#include "mupdate.h"
#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
+
+#include "sync_log.h"
/* config.c stuff */
const int config_need_data = 0;
@@ -458,6 +462,7 @@
wipe_head = wipe_head->next;
ret = mboxlist_deletemailbox(me->mailbox, 1, "", NULL, 0, 1, 1);
+ if(!ret) sync_log_mailbox(me->mailbox);
if(ret) {
fprintf(stderr, "couldn't delete defunct mailbox %s\n",
me->mailbox);
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/cvt_cyrusdb.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/cvt_cyrusdb.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/cvt_cyrusdb.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/cvt_cyrusdb.c Tue Feb 27 04:17:11 2007
@@ -40,7 +40,7 @@
*
*/
/*
- * $Id: cvt_cyrusdb.c,v 1.12.2.3 2004/05/25 01:28:03 ken3 Exp $
+ * $Id: cvt_cyrusdb.c,v 1.16 2006/11/30 17:11:17 murch Exp $
*/
#include <config.h>
Added: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/cyr_dbtool.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/cyr_dbtool.c?rev=702&root=cyrus22&view=auto
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/cyr_dbtool.c (added)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/cyr_dbtool.c Tue Feb 27 04:17:11 2007
@@ -1,0 +1,258 @@
+/* cyr_dbtool.c -- manage Cyrus databases
+ *
+ * Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The name "Carnegie Mellon University" must not be used to
+ * endorse or promote products derived from this software without
+ * prior written permission. For permission or any other legal
+ * details, please contact
+ * Office of Technology Transfer
+ * Carnegie Mellon University
+ * 5000 Forbes Avenue
+ * Pittsburgh, PA 15213-3890
+ * (412) 268-4387, fax: (412) 268-7395
+ * tech-transfer 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: cyr_dbtool.c,v 1.1 2007/01/09 17:41:35 murch Exp $
+ */
+
+#include <config.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/uio.h>
+#include <fcntl.h>
+#include <ctype.h>
+#include <syslog.h>
+
+#include <sys/ipc.h>
+#include <sys/msg.h>
+
+#include "acl.h"
+#include "assert.h"
+#include "auth.h"
+#include "cyrusdb.h"
+#include "exitcodes.h"
+#include "glob.h"
+#include "imap_err.h"
+#include "global.h"
+#include "mailbox.h"
+#include "util.h"
+#include "xmalloc.h"
+
+#define STACKSIZE 64000
+char stack[STACKSIZE+1];
+
+/* config.c stuff */
+const int config_need_data = 0;
+
+struct cyrusdb_backend *DB_OLD = NULL;
+
+struct db *odb = NULL;
+
+int read_key_value(char **keyptr, int *keylen, char **valptr, int *vallen) {
+ int c,res,inkey;
+ res = 0;
+ inkey = 1;
+ *keyptr = stack;
+ *keylen = 0;
+ *vallen = 0;
+ while( (c = getchar()) != EOF ) {
+ if (c == '\n') break;
+ if ((c == '\t') && inkey) {
+ inkey = 0;
+ *valptr = stack + *keylen + 1;
+ } else {
+ if (inkey) {
+ (*keyptr)[(*keylen)++] = c;
+ res = 1;
+ } else {
+ (*valptr)[(*vallen)++] = c;
+ }
+ }
+ if (*keylen + *vallen >= STACKSIZE - 1) {
+ printf("Error, stack overflow\n");
+ fatal("stack overflow", EC_DATAERR);
+ }
+ }
+ (*keyptr)[*keylen] = '\0';
+ if (inkey) {
+ *valptr = *keyptr + *keylen;
+ } else {
+ (*valptr)[*vallen] = '\0';
+ }
+ return res;
+}
+
+int printer_cb(void *rock __attribute__((unused)),
+ const char *key, int keylen,
+ const char *data, int datalen)
+{
+ fwrite(key, sizeof(char), keylen, stdout);
+ fputc('\t', stdout);
+ fwrite(data, sizeof(char), datalen, stdout);
+ fputc('\n', stdout);
+
+ return 0;
+}
+
+int main(int argc, char *argv[])
+{
+ const char *old_db;
+ const char *action;
+ char *key;
+ char *value;
+ int i,r,keylen,vallen,reslen;
+ int opt,loop;
+ char *alt_config = NULL;
+ const char *res = NULL;
+ int is_get = 0;
+ int is_set = 0;
+ int is_delete = 0;
+ int use_stdin = 0;
+ int db_flags = 0;
+
+ while ((opt = getopt(argc, argv, "C:n")) != EOF) {
+ switch (opt) {
+ case 'C': /* alt config file */
+ alt_config = optarg;
+ break;
+ case 'n': /* create new */
+ db_flags |= CYRUSDB_CREATE;
+ break;
+ }
+ }
+
+ if((argc - optind) < 3) {
+ fprintf(stderr, "Usage: %s [-C altconfig] <old db> <old db backend> <action> [<key>] [<value>]\n", argv[0]);
+ fprintf(stderr, "Usable Backends: ");
+
+ if(!cyrusdb_backends || !cyrusdb_backends[0])
+ fatal("we don't seem to have any db backends available", EC_OSERR);
+
+ fprintf(stderr, "%s", cyrusdb_backends[0]->name);
+ for(i=1; cyrusdb_backends[i]; i++)
+ fprintf(stderr, ", %s", cyrusdb_backends[i]->name);
+
+ fprintf(stderr, "\n");
+ fprintf(stderr, "\n");
+ fprintf(stderr, "Actions:\n");
+ fprintf(stderr, "* show [<prefix>]\n");
+ fprintf(stderr, "* get <key>\n");
+ fprintf(stderr, "* set <key> <value>\n");
+ fprintf(stderr, "* delete <key>\n");
+ fprintf(stderr, "You may omit key or key/value and specify one per line on stdin\n");
+ fprintf(stderr, "keys are terminated by tab or newline, values are terminated by newline\n");
+ exit(-1);
+ }
+
+ old_db = argv[optind];
+ action = argv[optind+2];
+
+ if(old_db[0] != '/') {
+ printf("\nSorry, you cannot use this tool with relative path names.\n"
+ "This is because some database backends (mainly berkeley) do not\n"
+ "always do what you would expect with them.\n"
+ "\nPlease use absolute pathnames instead.\n\n");
+ exit(EC_OSERR);
+ }
+
+ for(i=0; cyrusdb_backends[i]; i++) {
+ if(!strcmp(cyrusdb_backends[i]->name, argv[optind+1])) {
+ DB_OLD = cyrusdb_backends[i]; break;
+ }
+ }
+ if(!cyrusdb_backends[i]) {
+ fatal("unknown backend", EC_TEMPFAIL);
+ }
+
+ cyrus_init(alt_config, "cyr_dbtool", 0);
+
+
+ r = DB_OLD->open(old_db, db_flags, &odb);
+ if(r != CYRUSDB_OK)
+ fatal("can't open database", EC_TEMPFAIL);
+
+ if (( is_get = !strcmp(action, "get")) ||
+ (is_delete = !strcmp(action, "delete")) ||
+ (is_set = !strcmp(action, "set")) ) {
+ use_stdin = ( (argc - optind) < 4 );
+ if (use_stdin) {
+ loop = read_key_value( &key, &keylen, &value, &vallen );
+ } else {
+ key = argv[optind+3];
+ keylen = strlen(key);
+ if (is_set) {
+ value = argv[optind+4];
+ vallen = strlen(value);
+ }
+ loop = 1;
+ }
+ while ( loop ) {
+ if (is_get) {
+ int i;
+ DB_OLD->fetch(odb, key, keylen, &res, &reslen, NULL);
+ fwrite(res, sizeof(char), reslen, stdout);
+ printf("\n");
+ } else if (is_set) {
+ DB_OLD->store(odb, key, keylen, value, vallen, NULL);
+ } else if (is_delete) {
+ DB_OLD->delete(odb, key, keylen, NULL, 1);
+ }
+ loop = 0;
+ if ( use_stdin ) {
+ loop = read_key_value( &key, &keylen, &value, &vallen );
+ }
+ }
+ } else if (!strcmp(action, "show")) {
+ if ((argc - optind) < 4) {
+ DB_OLD->foreach(odb, "", 0, NULL, printer_cb, NULL, NULL);
+ } else {
+ key = argv[optind+3];
+ keylen = strlen(key);
+ DB_OLD->foreach(odb, key, keylen, NULL, printer_cb, NULL, NULL);
+ }
+ } else {
+ printf("Unknown action %s\n", action);
+ }
+
+ DB_OLD->close(odb);
+
+ cyrus_done();
+
+ return 0;
+}
Propchange: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/cyr_dbtool.c
------------------------------------------------------------------------------
svn:eol-style = native
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/cyr_expire.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/cyr_expire.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/cyr_expire.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/cyr_expire.c Tue Feb 27 04:17:11 2007
@@ -38,7 +38,7 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: cyr_expire.c,v 1.2.2.11 2005/12/15 13:21:16 murch Exp $
+ * $Id: cyr_expire.c,v 1.10 2007/02/05 18:41:46 jeaton Exp $
*/
#include <config.h>
@@ -66,6 +66,8 @@
#include "mboxlist.h"
#include "util.h"
#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
/* global state */
const int config_need_data = 0;
@@ -133,6 +135,19 @@
struct annotation_data attrib;
int r, domainlen = 0;
+ int mbtype;
+ char *path, *mpath;
+
+ /* Skip remote mailboxes */
+ r = mboxlist_detail(name, &mbtype, &path, &mpath, NULL, NULL, NULL);
+ if (r) {
+ if (erock->verbose) {
+ printf("error looking up %s: %s\n", name, error_message(r));
+ }
+ return 1;
+ }
+ if (mbtype & MBTYPE_REMOTE) return 0;
+
if (config_virtdomains && (p = strchr(name, '!')))
domainlen = p - name + 1;
@@ -171,6 +186,29 @@
int doclose = 0;
int expunge_flags = 0;
+ if (!attrib.value &&
+ erock->expunge_mode != IMAP_ENUM_EXPUNGE_MODE_IMMEDIATE) {
+ /* ONLY cleanup mailbox of expunged messages.
+
+ Try to short circuit additional I/O by checking
+ for presence of cyrus.expunge.
+ */
+ char fnamebuf[MAX_MAILBOX_PATH+1];
+ struct stat sbuf;
+
+ if (mpath &&
+ (config_metapartition_files &
+ IMAP_ENUM_METAPARTITION_FILES_EXPUNGE)) {
+ strlcpy(fnamebuf, mpath, sizeof(fnamebuf));
+ } else {
+ strlcpy(fnamebuf, path, sizeof(fnamebuf));
+ }
+ strlcat(fnamebuf, FNAME_EXPUNGE_INDEX, sizeof(fnamebuf));
+ if (stat(fnamebuf, &sbuf)) return 0;
+
+ expunge_flags |= EXPUNGE_CLEANUP;
+ }
+
/* Open/lock header */
r = mailbox_open_header(name, 0, &mailbox);
if (!r && mailbox.header_fd != -1) {
@@ -216,16 +254,16 @@
expunge_flags |= EXPUNGE_FORCE;
}
- if (erock->expunge_mode != IMAP_ENUM_EXPUNGE_MODE_IMMEDIATE) {
- /* cleanup mailbox of expunged messages */
- expunge_flags |= EXPUNGE_CLEANUP;
- }
-
r = mailbox_expunge(&mailbox, expire_cb, erock, expunge_flags);
mailbox_close(&mailbox);
}
- return r;
+ if (r) {
+ syslog(LOG_WARNING, "failure expiring %s: %s", name, error_message(r));
+ }
+
+ /* Even if we had a problem with one mailbox, continue with the others */
+ return 0;
}
int main(int argc, char *argv[])
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/cyrdump.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/cyrdump.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/cyrdump.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/cyrdump.c Tue Feb 27 04:17:11 2007
@@ -1,4 +1,4 @@
-/* $Id: cyrdump.c,v 1.14.2.5 2006/03/31 19:22:12 murch Exp $
+/* $Id: cyrdump.c,v 1.18 2007/02/05 18:41:46 jeaton Exp $
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -61,6 +61,8 @@
#include "mboxlist.h"
#include "sysexits.h"
#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
/* config.c stuff */
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/deliver.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/deliver.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/deliver.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/deliver.c Tue Feb 27 04:17:11 2007
@@ -41,7 +41,7 @@
*
*/
-/* $Id: deliver.c,v 1.169.2.10 2005/05/04 19:26:16 ken3 Exp $ */
+/* $Id: deliver.c,v 1.176 2007/02/05 18:41:46 jeaton Exp $ */
#include <config.h>
@@ -70,8 +70,11 @@
#include "exitcodes.h"
#include "imap_err.h"
#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
#include "lmtpengine.h"
#include "prot.h"
+#include "proxy.h"
#include "version.h"
/* config.c stuff */
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/delivered_prune.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/delivered_prune.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/delivered_prune.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/delivered_prune.c Tue Feb 27 04:17:11 2007
@@ -38,7 +38,7 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: delivered_prune.c,v 1.1.2.1 2005/04/08 16:48:30 shadow Exp $
+ * $Id: delivered_prune.c,v 1.2 2006/11/30 17:11:17 murch Exp $
*/
#include <config.h>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/duplicate.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/duplicate.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/duplicate.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/duplicate.c Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
*
*/
-/* $Id: duplicate.c,v 1.35.2.5 2004/03/24 19:53:00 ken3 Exp $ */
+/* $Id: duplicate.c,v 1.42 2006/11/30 17:11:17 murch Exp $ */
#include <config.h>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/duplicate.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/duplicate.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/duplicate.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/duplicate.h Tue Feb 27 04:17:11 2007
@@ -38,7 +38,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: duplicate.h,v 1.14.2.1 2004/02/12 05:32:34 ken3 Exp $ */
+/* $Id: duplicate.h,v 1.16 2006/11/30 17:11:17 murch Exp $ */
#ifndef DUPLICATE_H
#define DUPLICATE_H
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/fetchnews.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/fetchnews.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/fetchnews.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/fetchnews.c Tue Feb 27 04:17:11 2007
@@ -38,7 +38,7 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: fetchnews.c,v 1.2.2.13 2006/04/10 16:20:56 murch Exp $
+ * $Id: fetchnews.c,v 1.16 2006/11/30 17:11:17 murch Exp $
*/
#include <config.h>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/fud.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/fud.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/fud.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/fud.c Tue Feb 27 04:17:11 2007
@@ -42,7 +42,7 @@
#include <config.h>
-/* $Id: fud.c,v 1.48.2.6 2005/04/13 15:43:36 shadow Exp $ */
+/* $Id: fud.c,v 1.55 2007/02/05 18:41:46 jeaton Exp $ */
#ifdef HAVE_UNISTD_H
#include <unistd.h>
@@ -70,6 +70,8 @@
#include "imap_err.h"
#include "mailbox.h"
#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
#include "acl.h"
#include "seen.h"
#include "mboxname.h"
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/global.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/global.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/global.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/global.c Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
*
*/
-/* $Id: global.c,v 1.2.2.15 2005/12/13 19:35:50 murch Exp $ */
+/* $Id: global.c,v 1.21 2007/02/05 18:41:46 jeaton Exp $ */
#include <config.h>
@@ -72,6 +72,8 @@
#include "prot.h" /* for PROT_BUFSIZE */
#include "util.h"
#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
static enum {
NOT_RUNNING = 0,
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/global.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/global.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/global.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/global.h Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
/* global.h -- Header for global/shared variables & functions.
- * $Id: global.h,v 1.2.2.6 2005/11/17 15:46:15 murch Exp $
+ * $Id: global.h,v 1.8 2006/11/30 17:11:17 murch Exp $
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/idle.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/idle.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/idle.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/idle.c Tue Feb 27 04:17:11 2007
@@ -38,7 +38,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: idle.c,v 1.2.2.3 2005/12/12 21:23:58 murch Exp $ */
+/* $Id: idle.c,v 1.3 2006/11/30 17:11:17 murch Exp $ */
#include <config.h>
@@ -53,6 +53,7 @@
#include <unistd.h>
#endif
#include <signal.h>
+#include <string.h>
#include "idle.h"
#include "idled.h"
@@ -244,6 +245,9 @@
/* Tell idled that we're done idling */
if (notify_sock != -1) idle_send_msg(IDLE_DONE, mailbox);
+ /* Cancel alarm */
+ alarm(0);
+
/* Remove the signal handlers */
signal(SIGUSR1, SIG_IGN);
signal(SIGUSR2, SIG_IGN);
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/idle.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/idle.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/idle.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/idle.h Tue Feb 27 04:17:11 2007
@@ -38,7 +38,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: idle.h,v 1.4.4.3 2005/12/12 21:23:58 murch Exp $ */
+/* $Id: idle.h,v 1.8 2006/11/30 17:11:17 murch Exp $ */
#ifndef IDLE_H
#define IDLE_H
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/idled.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/idled.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/idled.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/idled.c Tue Feb 27 04:17:11 2007
@@ -38,7 +38,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: idled.c,v 1.17.2.6 2005/12/12 21:23:58 murch Exp $ */
+/* $Id: idled.c,v 1.25 2007/02/05 18:41:46 jeaton Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
@@ -61,6 +61,8 @@
#include "global.h"
#include "mboxlist.h"
#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
#include "hash.h"
#include "exitcodes.h"
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/idled.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/idled.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/idled.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/idled.h Tue Feb 27 04:17:11 2007
@@ -38,7 +38,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: idled.h,v 1.4.4.1 2005/12/12 21:23:59 murch Exp $ */
+/* $Id: idled.h,v 1.5 2006/11/30 17:11:18 murch Exp $ */
#ifndef IDLED_H
#define IDLED_H
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/imap_err.et
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/imap_err.et?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/imap_err.et (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/imap_err.et Tue Feb 27 04:17:11 2007
@@ -24,7 +24,7 @@
# (412) 268-4387, fax: (412) 268-7395
# tech-transfer at andrew.cmu.edu
#
-# $Id: imap_err.et,v 1.50.2.3 2005/05/27 17:40:38 ken3 Exp $
+# $Id: imap_err.et,v 1.53 2006/11/30 17:11:18 murch Exp $
error_table imap
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/imap_proxy.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/imap_proxy.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/imap_proxy.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/imap_proxy.c Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: imap_proxy.c,v 1.1.2.17 2006/02/10 21:10:45 murch Exp $
+ * $Id: imap_proxy.c,v 1.2 2006/11/30 17:11:18 murch Exp $
*/
#include <config.h>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/imap_proxy.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/imap_proxy.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/imap_proxy.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/imap_proxy.h Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: imap_proxy.h,v 1.1.2.7 2005/05/31 18:09:20 ken3 Exp $
+ * $Id: imap_proxy.h,v 1.2 2006/11/30 17:11:18 murch Exp $
*/
#ifndef _IMAP_PROXY_H
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/imapd.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/imapd.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/imapd.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/imapd.c Tue Feb 27 04:17:11 2007
@@ -38,7 +38,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: imapd.c,v 1.443.2.84 2006/07/03 13:22:41 murch Exp $ */
+/* $Id: imapd.c,v 1.509 2007/02/05 18:49:55 jeaton Exp $ */
#include <config.h>
@@ -62,6 +62,11 @@
#include <arpa/inet.h>
#include <sasl/sasl.h>
+
+#ifdef HAVE_SSL
+#include <openssl/hmac.h>
+#include <openssl/rand.h>
+#endif /* HAVE_SSL */
#include "acl.h"
#include "annotate.h"
@@ -96,6 +101,8 @@
#include "util.h"
#include "version.h"
#include "xmalloc.h"
+#include "xstrlcat.h"
+#include "xstrlcpy.h"
#include "pushstats.h" /* SNMP interface */
@@ -135,7 +142,7 @@
/* are we doing virtdomains with multiple IPs? */
static int disable_referrals;
-/* has the client issued an RLIST or RLSUB? */
+/* has the client issued an RLIST, RLSUB, or LIST (REMOTE)? */
static int supports_referrals;
/* end PROXY STUFF */
@@ -1553,7 +1560,6 @@
/* snmp_increment(RECONSTRUCT_COUNT, 1); */
}
else if (!strcmp(cmd.s, "Rlist")) {
- supports_referrals = !disable_referrals;
c = getastring(imapd_in, imapd_out, &arg1);
if (c != ' ') goto missingargs;
c = getastring(imapd_in, imapd_out, &arg2);
@@ -1564,7 +1570,6 @@
/* snmp_increment(LIST_COUNT, 1); */
}
else if (!strcmp(cmd.s, "Rlsub")) {
- supports_referrals = !disable_referrals;
c = getastring(imapd_in, imapd_out, &arg1);
if (c != ' ') goto missingargs;
c = getastring(imapd_in, imapd_out, &arg2);
@@ -1928,6 +1933,7 @@
userbuf, sizeof(userbuf), &userlen);
if (r) {
+ eatline(imapd_in, ' ');
syslog(LOG_NOTICE, "badlogin: %s plaintext %s invalid user",
imapd_clienthost, beautify_string(user));
prot_printf(imapd_out, "%s NO %s\r\n", tag,
@@ -2238,6 +2244,7 @@
if (backend_current) {
/* remote mailbox */
prot_printf(backend_current->out, "%s %s\r\n", tag, cmd);
+ pipe_including_tag(backend_current, tag, 0);
return;
}
@@ -2756,9 +2763,12 @@
int r = 0, doclose = 0;
unsigned long size = 0;
- imapurl_fromURL(&url, s);
-
- if (url.server) {
+ r = imapurl_fromURL(&url, s);
+
+ if (r) {
+ *parseerr = "Improperly specified URL";
+ r = IMAP_BADURL;
+ } else if (url.server) {
*parseerr = "Only relative URLs are supported";
r = IMAP_BADURL;
#if 0
@@ -2998,7 +3008,7 @@
tag, strlen(name), name, 0, "");
}
if (!(r = pipe_command(s, 16384))) {
- if (s != backend_current) pipe_including_tag(s, tag, 0);
+ pipe_including_tag(s, tag, 0);
}
s->context = NULL;
} else {
@@ -3027,7 +3037,7 @@
mboxlist_createmailboxcheck(mailboxname, 0, 0,
imapd_userisadmin,
imapd_userid, imapd_authstate,
- (char **)0, (char **)0) == 0)
+ NULL, NULL, 0) == 0)
? "[TRYCREATE] " : "", error_message(r));
return;
}
@@ -3126,6 +3136,16 @@
r = message_copy_strict(imapd_in, curstage->f, size, curstage->binary);
}
totalsize += size;
+ /* If this is a non-BINARY message, close the stage file.
+ * Otherwise, leave it open so we can encode the binary parts.
+ *
+ * XXX For BINARY MULTIAPPEND, we may have to close the stage files
+ * anyways to avoid too many open files.
+ */
+ if (!curstage->binary) {
+ fclose(curstage->f);
+ curstage->f = NULL;
+ }
/* if we see a SP, we're trying to append more than one message */
@@ -3159,8 +3179,9 @@
for (i = 0; !r && i < numstage; i++) {
if (stage[i]->binary) {
r = message_parse_binary_file(stage[i]->f, &body);
- }
- fclose(stage[i]->f); stage[i]->f = NULL;
+ fclose(stage[i]->f);
+ stage[i]->f = NULL;
+ }
if (!r) {
r = append_fromstage(&mailbox, &body, stage[i]->stage,
stage[i]->internaldate,
@@ -3211,7 +3232,7 @@
mboxlist_createmailboxcheck(mailboxname, 0, 0,
imapd_userisadmin,
imapd_userid, imapd_authstate,
- (char **)0, (char **)0) == 0)
+ NULL, NULL, 0) == 0)
? "[TRYCREATE] " : r == IMAP_MESSAGE_TOO_LARGE
? "[TOOBIG]" : "", error_message(r));
} else if (doappenduid) {
@@ -3293,6 +3314,10 @@
mailbox_close(imapd_mailbox);
imapd_mailbox = 0;
}
+ if (backend_current) {
+ /* remove backend_current from the protgroup */
+ protgroup_delete(protin, backend_current->in);
+ }
if (cmd[0] == 'B') {
/* BBoard namespace is empty */
@@ -3323,9 +3348,6 @@
if (backend_current && backend_current != backend_next) {
char mytag[128];
-
- /* remove backend_current from the protgroup */
- protgroup_delete(protin, backend_current->in);
/* switching servers; flush old server output */
proxy_gentag(mytag, sizeof(mytag));
@@ -3341,8 +3363,9 @@
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 {%d+}\r\n%s%s\r\n", tag, cmd,
+ strlen(name), name,
+ imapd_condstore_client ? " (CONDSTORE)" : "");
switch (pipe_including_tag(backend_current, tag, 0)) {
case PROXY_OK:
proc_register("imapd", imapd_clienthost, imapd_userid, mailboxname);
@@ -3366,9 +3389,6 @@
/* local mailbox */
if (backend_current) {
char mytag[128];
-
- /* remove backend_current from the protgroup */
- protgroup_delete(protin, backend_current->in);
/* switching servers; flush old server output */
proxy_gentag(mytag, sizeof(mytag));
@@ -3443,6 +3463,7 @@
}
}
+ prot_printf(imapd_out, "* OK [URLMECH INTERNAL]\r\n");
prot_printf(imapd_out, "%s OK [READ-%s] %s\r\n", tag,
(imapd_mailbox->myrights & ACL_READ_WRITE) ?
"WRITE" : "ONLY", error_message(IMAP_OK_COMPLETED));
@@ -3509,10 +3530,11 @@
/* xxx do we want this to say OK if the connection is gone?
* saying NO is clearly wrong, hense the fatal request. */
pipe_including_tag(backend_current, tag, 0);
- backend_current = NULL;
/* remove backend_current from the protgroup */
protgroup_delete(protin, backend_current->in);
+
+ backend_current = NULL;
return;
}
@@ -3583,7 +3605,9 @@
if (backend_current) {
/* remote mailbox */
prot_printf(backend_current->out, "%s %s %s ", tag, cmd, sequence);
- pipe_command(backend_current, 65536);
+ if (!pipe_command(backend_current, 65536)) {
+ pipe_including_tag(backend_current, tag, 0);
+ }
return;
}
@@ -4039,6 +4063,7 @@
/* remote mailbox */
prot_printf(backend_current->out, "%s Partial %s %s %s %s\r\n",
tag, msgno, data, start, count);
+ pipe_including_tag(backend_current, tag, 0);
return;
}
@@ -4168,7 +4193,9 @@
/* remote mailbox */
prot_printf(backend_current->out, "%s %s %s ",
tag, cmd, sequence);
- pipe_command(backend_current, 65536);
+ if (!pipe_command(backend_current, 65536)) {
+ pipe_including_tag(backend_current, tag, 0);
+ }
return;
}
@@ -4387,7 +4414,9 @@
const char *cmd = usinguid ? "UID Search" : "Search";
prot_printf(backend_current->out, "%s %s ", tag, cmd);
- pipe_command(backend_current, 65536);
+ if (!pipe_command(backend_current, 65536)) {
+ pipe_including_tag(backend_current, tag, 0);
+ }
return;
}
@@ -4445,7 +4474,9 @@
char *cmd = usinguid ? "UID Sort" : "Sort";
prot_printf(backend_current->out, "%s %s ", tag, cmd);
- pipe_command(backend_current, 65536);
+ if (!pipe_command(backend_current, 65536)) {
+ pipe_including_tag(backend_current, tag, 0);
+ }
return;
}
@@ -4537,7 +4568,9 @@
const char *cmd = usinguid ? "UID Thread" : "Thread";
prot_printf(backend_current->out, "%s %s ", tag, cmd);
- pipe_command(backend_current, 65536);
+ if (!pipe_command(backend_current, 65536)) {
+ pipe_including_tag(backend_current, tag, 0);
+ }
return;
}
@@ -4654,6 +4687,7 @@
prot_printf(backend_current->out, "%s %s %s {%d+}\r\n%s\r\n",
tag, usinguid ? "UID Copy" : "Copy",
sequence, strlen(name), name);
+ pipe_including_tag(backend_current, tag, 0);
return;
}
@@ -4729,7 +4763,7 @@
©uid, !config_getswitch(IMAPOPT_SINGLEINSTANCESTORE));
}
- index_check(imapd_mailbox, usinguid, 0);
+ imapd_check(NULL, usinguid, 0);
done:
if (r && !(usinguid && r == IMAP_NO_NOSUCHMSG)) {
@@ -4738,7 +4772,7 @@
mboxlist_createmailboxcheck(mailboxname, 0, 0,
imapd_userisadmin,
imapd_userid, imapd_authstate,
- (char **)0, (char **)0) == 0)
+ NULL, NULL, 0) == 0)
? "[TRYCREATE] " : "", error_message(r));
}
else if (copyuid) {
@@ -4768,6 +4802,7 @@
} else {
prot_printf(backend_current->out, "%s Expunge\r\n", tag);
}
+ pipe_including_tag(backend_current, tag, 0);
return;
}
@@ -4826,7 +4861,7 @@
r = mboxlist_createmailboxcheck(mailboxname, 0, 0,
imapd_userisadmin,
imapd_userid, imapd_authstate,
- NULL, &partition);
+ NULL, &partition, 0);
}
if (!r && !config_partitiondir(partition)) {
@@ -4883,6 +4918,12 @@
return;
}
+ else if (!r &&
+ (config_mupdate_config == IMAP_ENUM_MUPDATE_CONFIG_STANDARD) &&
+ !config_getstring(IMAPOPT_PROXYSERVERS)) {
+ /* can't create maiilboxes on proxy-only servers */
+ r = IMAP_PERMISSION_DENIED;
+ }
/* local mailbox -- fall through */
if (guessedpart) partition = NULL;
@@ -5109,7 +5150,7 @@
r = mboxlist_renamemailbox(name, text->newmailboxname,
text->partition,
- 1, imapd_userid, imapd_authstate);
+ 1, imapd_userid, imapd_authstate, 0);
(*imapd_namespace.mboxname_toexternal)(&imapd_namespace,
name,
@@ -5350,7 +5391,7 @@
if (!r) {
r = mboxlist_renamemailbox(oldmailboxname, newmailboxname, partition,
imapd_userisadmin,
- imapd_userid, imapd_authstate);
+ imapd_userid, imapd_authstate, 0);
}
/* If we're renaming a user, take care of changing quotaroot, ACL,
@@ -5683,6 +5724,8 @@
const char *pattern, int isadmin, char *userid,
struct auth_state *auth_state, int (*proc)(),
void *rock, int force);
+
+ if (listopts & LIST_REMOTE) supports_referrals = !disable_referrals;
/* Ignore the reference argument?
(the behavior in 1.5.10 & older) */
@@ -5826,8 +5869,7 @@
tag, cmd,
strlen(name), name);
}
- if (backend_inbox != backend_current)
- pipe_including_tag(backend_inbox, tag, 0);
+ pipe_including_tag(backend_inbox, tag, 0);
}
else {
prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
@@ -5885,7 +5927,6 @@
int r, access;
char *acl;
char *rights, *nextid;
- char str[ACL_MAXSTR];
r = (*imapd_namespace.mboxname_tointernal)(&imapd_namespace, name,
imapd_userid, mailboxname);
@@ -5928,7 +5969,6 @@
prot_printf(imapd_out, " ");
printastring(acl);
prot_printf(imapd_out, " ");
- rights = cyrus_acl_masktostr(cyrus_acl_strtomask(rights), str, 1);
printastring(rights);
acl = nextid;
}
@@ -6001,11 +6041,11 @@
/* calculate optional rights */
cyrus_acl_masktostr(implicit ^ (canon_identifier ? ACL_FULL : 0),
- optional, 1);
+ optional);
/* build the rights string */
if (implicit) {
- cyrus_acl_masktostr(implicit, rightsdesc, 1);
+ cyrus_acl_masktostr(implicit, rightsdesc);
}
else {
strcpy(rightsdesc, "\"\"");
@@ -6080,7 +6120,7 @@
prot_printf(imapd_out, "* MYRIGHTS ");
printastring(name);
prot_printf(imapd_out, " ");
- printastring(cyrus_acl_masktostr(rights, str, 1));
+ printastring(cyrus_acl_masktostr(rights, str));
prot_printf(imapd_out, "\r\n%s OK %s\r\n", tag,
error_message(IMAP_OK_COMPLETED));
}
@@ -6315,7 +6355,7 @@
if (!r) {
prot_printf(s->out, "%s Getquotaroot {%d+}\r\n%s\r\n",
tag, strlen(name), name);
- if (s != backend_current) pipe_including_tag(s, tag, 0);
+ pipe_including_tag(s, tag, 0);
} else {
prot_printf(imapd_out, "%s NO %s\r\n", tag, error_message(r));
}
@@ -6645,7 +6685,7 @@
prot_printf(s->out, "%s Status {%d+}\r\n%s ", tag,
strlen(name), name);
if (!pipe_command(s, 65536)) {
- if (s != backend_current) pipe_including_tag(s, tag, 0);
+ pipe_including_tag(s, tag, 0);
}
} else {
eatline(imapd_in, prot_getc(imapd_in));
@@ -7784,7 +7824,7 @@
mboxlist_createmailboxcheck(mailboxname, 0, 0,
imapd_userisadmin,
imapd_userid, imapd_authstate,
- NULL, NULL) == 0)
+ NULL, NULL, 0) == 0)
? "[TRYCREATE] " : "", error_message(r));
} else {
prot_printf(imapd_out, "%s OK %s\r\n", tag,
@@ -8189,6 +8229,7 @@
if (!r) {
/* Delete mailbox annotations */
annotatemore_delete(mailboxname);
+ sync_log_mailbox(mailboxname);
}
}
@@ -8464,6 +8505,7 @@
/* this was a successful user delete, and we need to delete
certain user meta-data (but not seen state!) */
user_deletedata(mailboxname+5, imapd_userid, imapd_authstate, 0);
+ sync_log_user(mailboxname+5);
}
if(!r && mupdate_h) {
@@ -9421,11 +9463,12 @@
printstring(arg.s);
prot_putc(' ', imapd_out);
- r = doclose = 0;
- imapurl_fromURL(&url, arg.s);
+ doclose = 0;
+ r = imapurl_fromURL(&url, arg.s);
/* validate the URL */
- if (!url.user || !url.server || !url.mailbox || !url.uid ||
+ if (r || !url.user || !url.server || !url.mailbox || !url.uid ||
+ (url.section && !*url.section) ||
(url.urlauth.access && !(url.urlauth.mech && url.urlauth.token))) {
/* missing info */
r = IMAP_BADURL;
@@ -9506,9 +9549,13 @@
unsigned int vtoken_len;
r = mboxkey_open(url.user, 0, &mboxkey_db);
+ if (r) break;
+
r = mboxkey_read(mboxkey_db, mailboxname, &key, &keylen);
- HMAC(EVP_sha1(), key, keylen, arg.s, url.urlauth.rump_len,
- vtoken, &vtoken_len);
+ if (r) break;
+
+ HMAC(EVP_sha1(), key, keylen, (unsigned char *) arg.s,
+ url.urlauth.rump_len, vtoken, &vtoken_len);
mboxkey_close(mboxkey_db);
if (memcmp(vtoken, url.urlauth.token+1, vtoken_len)) {
@@ -9654,12 +9701,11 @@
return;
}
- r = 0;
- imapurl_fromURL(&url, arg1.s);
+ r = imapurl_fromURL(&url, arg1.s);
/* validate the URL */
- if (!url.user || !url.server || !url.mailbox || !url.uid ||
- !url.urlauth.access) {
+ if (r || !url.user || !url.server || !url.mailbox || !url.uid ||
+ (url.section && !*url.section) || !url.urlauth.access) {
r = IMAP_BADURL;
} else if (strcmp(url.user, imapd_userid)) {
/* not using currently authorized user's namespace */
@@ -9703,7 +9749,7 @@
}
else if (!key) {
/* create a new key */
- RAND_bytes(newkey, MBOX_KEY_LEN);
+ RAND_bytes((unsigned char *) newkey, MBOX_KEY_LEN);
key = newkey;
keylen = MBOX_KEY_LEN;
r = mboxkey_write(mboxkey_db, mailboxname, key, keylen);
@@ -9723,7 +9769,7 @@
/* first byte is the algorithm used to create token */
token[0] = URLAUTH_ALG_HMAC_SHA1;
- HMAC(EVP_sha1(), key, keylen, arg1.s, strlen(arg1.s),
+ HMAC(EVP_sha1(), key, keylen, (unsigned char *) arg1.s, strlen(arg1.s),
token+1, &token_len);
token_len++;
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/imapd.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/imapd.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/imapd.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/imapd.h Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
/* imapd.h -- Common state for IMAP daemon
- * $Id: imapd.h,v 1.55.2.4 2006/03/31 19:22:21 murch Exp $
+ * $Id: imapd.h,v 1.63 2006/11/30 17:11:18 murch Exp $
*
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/imapparse.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/imapparse.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/imapparse.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/imapparse.c Tue Feb 27 04:17:11 2007
@@ -38,7 +38,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: imapparse.c,v 1.13.2.2 2006/03/17 14:25:45 murch Exp $ */
+/* $Id: imapparse.c,v 1.16 2006/11/30 17:11:18 murch Exp $ */
#include <config.h>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/index.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/index.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/index.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/index.c Tue Feb 27 04:17:11 2007
@@ -41,7 +41,7 @@
*
*/
/*
- * $Id: index.c,v 1.199.2.28 2006/07/05 19:51:30 murch Exp $
+ * $Id: index.c,v 1.223 2007/02/05 18:41:46 jeaton Exp $
*/
#include <config.h>
@@ -76,6 +76,8 @@
#include "stristr.h"
#include "util.h"
#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
#include "index.h"
#include "sync_log.h"
@@ -1251,6 +1253,7 @@
unsigned long uidvalidity;
unsigned long startuid, num;
long docopyuid;
+ int haveseen = 0;
*copyuidp = NULL;
@@ -1262,6 +1265,7 @@
for (i = 0; i < copyargs.nummsg; i++) {
totalsize += copyargs.copymsg[i].size;
+ haveseen |= copyargs.copymsg[i].seen;
}
r = append_setup(&append_mailbox, name, MAILBOX_FORMAT_NORMAL,
@@ -1275,7 +1279,11 @@
if (!r) append_commit(&append_mailbox, totalsize,
&uidvalidity, &startuid, &num);
- if (!r) sync_log_mailbox_double(mailbox->name, name);
+ if (!r) {
+ sync_log_mailbox_double(mailbox->name, name);
+ /* if any messages are seen then we need to sync the seen state */
+ if (haveseen) sync_log_seen(imapd_userid, name);
+ }
if (!r && docopyuid) {
copyuid_size = 1024;
@@ -1808,6 +1816,12 @@
{
int n;
+ /* If no data, output NIL */
+ if (!msg_base) {
+ prot_printf(pout, "NIL");
+ return;
+ }
+
/* partial fetch: adjust 'size' */
if (octet_count) {
if (size <= start_octet) {
@@ -1819,8 +1833,8 @@
if (size > octet_count) size = octet_count;
}
- /* If no data, output null quoted string */
- if (!msg_base || size == 0) {
+ /* If zero-length data, output empty quoted string */
+ if (size == 0) {
prot_printf(pout, "\"\"");
return;
}
@@ -1943,12 +1957,12 @@
offset = CACHE_ITEM_BIT32(cacheitem);
size = CACHE_ITEM_BIT32(cacheitem + CACHE_ITEM_SIZE_SKIP);
- if ((p = strstr(resp, "BINARY"))) {
+ if (msg_base && (p = strstr(resp, "BINARY"))) {
/* BINARY or BINARY.SIZE */
int encoding = CACHE_ITEM_BIT32(cacheitem + 2 * 4) & 0xff;
msg_base = charset_decode_mimebody(msg_base + offset, size, encoding,
- &decbuf, 0, &size);
+ &decbuf, 0, (int *) &size);
if (!msg_base) {
/* failed to decode */
@@ -2720,7 +2734,7 @@
while (*p && *p != 'M') {
/* Generate the actual part number */
skip = 0;
- while (isdigit((int) *p)) {
+ while (cyrus_isdigit((int) *p)) {
skip = skip * 10 + *p++ - '0';
/* xxx overflow */
}
@@ -3658,7 +3672,8 @@
break;
case SORT_DATE:
cur->date = message_parse_date(envtokens[ENV_DATE],
- PARSE_TIME | PARSE_ZONE);
+ PARSE_TIME | PARSE_ZONE
+ | PARSE_NOCREATE);
break;
case SORT_FROM:
cur->from = get_localpart_addr(from + CACHE_ITEM_SIZE_SKIP);
@@ -4153,10 +4168,12 @@
case SORT_CC:
ret = strcmp(md1->cc, md2->cc);
break;
- case SORT_DATE:
- ret = (md1->date && md2->date) ?
- numcmp(md1->date, md2->date) : numcmp(md1->msgno, md2->msgno);
+ case SORT_DATE: {
+ time_t d1 = md1->date ? md1->date : INTERNALDATE(md1->msgno);
+ time_t d2 = md2->date ? md2->date : INTERNALDATE(md2->msgno);
+ ret = numcmp(d1, d2);
break;
+ }
case SORT_FROM:
ret = strcmp(md1->from, md2->from);
break;
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/index.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/index.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/index.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/index.h Tue Feb 27 04:17:11 2007
@@ -41,7 +41,7 @@
*
*/
/*
- * $Id: index.h,v 1.9.2.6 2006/03/31 19:22:24 murch Exp $
+ * $Id: index.h,v 1.11 2006/11/30 17:11:18 murch Exp $
*/
/* Header for internal usage of index.c + programs that make raw access
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/ipurge.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/ipurge.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/ipurge.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/ipurge.c Tue Feb 27 04:17:11 2007
@@ -6,7 +6,7 @@
*
* includes support for ISPN virtual host extensions
*
- * $Id: ipurge.c,v 1.20.2.7 2004/05/31 18:22:53 ken3 Exp $
+ * $Id: ipurge.c,v 1.26 2006/11/30 17:11:18 murch Exp $
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/lmtp_sieve.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/lmtp_sieve.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/lmtp_sieve.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/lmtp_sieve.c Tue Feb 27 04:17:11 2007
@@ -1,6 +1,6 @@
/* lmtp_sieve.c -- Sieve implementation for lmtpd
*
- * $Id: lmtp_sieve.c,v 1.1.2.15 2006/05/23 13:09:35 murch Exp $
+ * $Id: lmtp_sieve.c,v 1.14 2007/02/05 18:41:47 jeaton Exp $
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -75,6 +75,8 @@
#include "util.h"
#include "version.h"
#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
static int sieve_usehomedir = 0;
static const char *sieve_dir = NULL;
@@ -557,7 +559,7 @@
now = time(NULL);
/* ok, let's see if we've responded before */
- t = duplicate_check(arc->hash, SIEVE_HASHLEN,
+ t = duplicate_check((char *) arc->hash, SIEVE_HASHLEN,
sd->username, strlen(sd->username));
if (t) {
if (now >= t) {
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/lmtp_sieve.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/lmtp_sieve.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/lmtp_sieve.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/lmtp_sieve.h Tue Feb 27 04:17:11 2007
@@ -1,6 +1,6 @@
/* lmtp_sieve.h -- Sieve implementation for lmtpd
*
- * $Id: lmtp_sieve.h,v 1.1.2.5 2005/10/19 14:50:06 ken3 Exp $
+ * $Id: lmtp_sieve.h,v 1.4 2006/11/30 17:11:18 murch Exp $
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/lmtpd.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/lmtpd.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/lmtpd.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/lmtpd.c Tue Feb 27 04:17:11 2007
@@ -1,6 +1,6 @@
/* lmtpd.c -- Program to deliver mail to a mailbox
*
- * $Id: lmtpd.c,v 1.121.2.35 2006/05/23 13:09:36 murch Exp $
+ * $Id: lmtpd.c,v 1.147 2007/02/05 18:41:47 jeaton Exp $
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -91,6 +91,8 @@
#include "util.h"
#include "version.h"
#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
#include "lmtpd.h"
#include "lmtpengine.h"
@@ -412,7 +414,7 @@
r = mupdate_find(mhandle, name, &mailboxdata);
if (r == MUPDATE_MAILBOX_UNKNOWN) {
- r = IMAP_MAILBOX_NONEXISTENT;
+ return IMAP_MAILBOX_NONEXISTENT;
} else if (r) {
/* xxx -- yuck: our error handling for now will be to exit;
this txn will be retried later -- to do otherwise means
@@ -422,6 +424,7 @@
type |= MBTYPE_REMOTE;
if (server) *server = (char *) mailboxdata->server;
+ if (aclp) *aclp = (char *) mailboxdata->acl;
}
else {
/* do a local lookup and kick the slave if necessary */
@@ -440,8 +443,7 @@
if (c) *c = '\0';
}
}
- else if (server)
- *server = NULL;
+ else if (server) *server = NULL;
return r;
}
@@ -514,6 +516,16 @@
syslog(LOG_INFO, "Delivered: %s to mailbox: %s", id, mailboxname);
sync_log_append(mailboxname);
+
+ if (user) {
+ /* check if the \Seen flag has been set on this message */
+ while (nflags) {
+ if (!strcmp(flag[--nflags], "\\seen")) {
+ sync_log_seen(user, mailboxname);
+ break;
+ }
+ }
+ }
}
}
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/lmtpd.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/lmtpd.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/lmtpd.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/lmtpd.h Tue Feb 27 04:17:11 2007
@@ -1,6 +1,6 @@
/* lmtpd.h -- Program to deliver mail to a mailbox
*
- * $Id: lmtpd.h,v 1.1.2.1 2005/10/19 14:50:07 ken3 Exp $
+ * $Id: lmtpd.h,v 1.4 2006/11/30 17:11:18 murch Exp $
* Copyright (c) 1998-2005 Carnegie Mellon University. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -71,6 +71,12 @@
} deliver_data_t;
/* forward declarations */
+extern int deliver_local(deliver_data_t *mydata,
+ char **flag,
+ int nflags,
+ const char *username,
+ const char *mailboxname);
+
extern int deliver_mailbox(FILE *f,
struct message_content *content,
struct stagemsg *stage,
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/lmtpengine.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/lmtpengine.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/lmtpengine.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/lmtpengine.c Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
/* lmtpengine.c: LMTP protocol engine
- * $Id: lmtpengine.c,v 1.93.2.17 2005/11/01 20:14:20 murch Exp $
+ * $Id: lmtpengine.c,v 1.118 2007/02/05 18:41:47 jeaton Exp $
*
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
@@ -81,6 +81,8 @@
#include "imap_err.h"
#include "mupdate_err.h"
#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
#include "version.h"
#include "lmtpengine.h"
@@ -1313,7 +1315,7 @@
case 'l':
case 'L':
if (!strncasecmp(buf, "lhlo ", 5)) {
- unsigned int mechcount;
+ int mechcount;
const char *mechs;
prot_printf(pout, "250-%s\r\n"
@@ -1553,7 +1555,7 @@
/* SASL and openssl have different ideas
about whether ssf is signed */
- layerp = &ssf;
+ layerp = (int *) &ssf;
if (cd.starttls_done == 1) {
prot_printf(pout, "454 4.3.3 %s\r\n",
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/lmtpengine.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/lmtpengine.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/lmtpengine.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/lmtpengine.h Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
/* lmtpengine.h: lmtp protocol engine interface
- * $Id: lmtpengine.h,v 1.18.2.5 2004/04/17 18:47:30 ken3 Exp $
+ * $Id: lmtpengine.h,v 1.23 2006/11/30 17:11:18 murch Exp $
*
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mailbox.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mailbox.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mailbox.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mailbox.c Tue Feb 27 04:17:11 2007
@@ -38,7 +38,7 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: mailbox.c,v 1.147.2.36 2006/06/02 18:55:06 murch Exp $
+ * $Id: mailbox.c,v 1.164 2007/02/05 18:41:47 jeaton Exp $
*
*/
@@ -84,6 +84,8 @@
#include "seen.h"
#include "util.h"
#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
static int mailbox_doing_reconstruct = 0;
#define zeromailbox(m) { memset(&m, 0, sizeof(struct mailbox)); \
@@ -982,25 +984,25 @@
buf = (unsigned char*) mailbox->index_base + offset;
- record->uid = htonl(*((bit32 *)(buf+OFFSET_UID)));
- record->internaldate = htonl(*((bit32 *)(buf+OFFSET_INTERNALDATE)));
- record->sentdate = htonl(*((bit32 *)(buf+OFFSET_SENTDATE)));
- record->size = htonl(*((bit32 *)(buf+OFFSET_SIZE)));
- record->header_size = htonl(*((bit32 *)(buf+OFFSET_HEADER_SIZE)));
- record->content_offset = htonl(*((bit32 *)(buf+OFFSET_CONTENT_OFFSET)));
- record->cache_offset = htonl(*((bit32 *)(buf+OFFSET_CACHE_OFFSET)));
- record->last_updated = htonl(*((bit32 *)(buf+OFFSET_LAST_UPDATED)));
- record->system_flags = htonl(*((bit32 *)(buf+OFFSET_SYSTEM_FLAGS)));
+ record->uid = ntohl(*((bit32 *)(buf+OFFSET_UID)));
+ record->internaldate = ntohl(*((bit32 *)(buf+OFFSET_INTERNALDATE)));
+ record->sentdate = ntohl(*((bit32 *)(buf+OFFSET_SENTDATE)));
+ record->size = ntohl(*((bit32 *)(buf+OFFSET_SIZE)));
+ record->header_size = ntohl(*((bit32 *)(buf+OFFSET_HEADER_SIZE)));
+ record->content_offset = ntohl(*((bit32 *)(buf+OFFSET_CONTENT_OFFSET)));
+ record->cache_offset = ntohl(*((bit32 *)(buf+OFFSET_CACHE_OFFSET)));
+ record->last_updated = ntohl(*((bit32 *)(buf+OFFSET_LAST_UPDATED)));
+ record->system_flags = ntohl(*((bit32 *)(buf+OFFSET_SYSTEM_FLAGS)));
for (n = 0; n < MAX_USER_FLAGS/32; n++) {
- record->user_flags[n] = htonl(*((bit32 *)(buf+OFFSET_USER_FLAGS+4*n)));
- }
- record->content_lines = htonl(*((bit32 *)(buf+OFFSET_CONTENT_LINES)));
- record->cache_version = htonl(*((bit32 *)(buf+OFFSET_CACHE_VERSION)));
+ record->user_flags[n] = ntohl(*((bit32 *)(buf+OFFSET_USER_FLAGS+4*n)));
+ }
+ record->content_lines = ntohl(*((bit32 *)(buf+OFFSET_CONTENT_LINES)));
+ record->cache_version = ntohl(*((bit32 *)(buf+OFFSET_CACHE_VERSION)));
message_uuid_unpack(&record->uuid, buf+OFFSET_MESSAGE_UUID);
#ifdef HAVE_LONG_LONG_INT
- record->modseq = htonll(*((bit64 *)(buf+OFFSET_MODSEQ_64)));
+ record->modseq = ntohll(*((bit64 *)(buf+OFFSET_MODSEQ_64)));
#else
- record->modseq = htonl(*((bit32 *)(buf+OFFSET_MODSEQ)));
+ record->modseq = ntohl(*((bit32 *)(buf+OFFSET_MODSEQ)));
#endif
return 0;
}
@@ -2670,16 +2672,70 @@
}
/*
+ * Remove all files in directory
+ */
+static void mailbox_delete_files(char *path)
+{
+ DIR *dirp;
+ struct dirent *f;
+ char buf[MAX_MAILBOX_PATH+1];
+ char *tail;
+
+ strlcpy(buf, path, sizeof(buf));
+
+ if(strlen(buf) >= sizeof(buf) - 2) {
+ syslog(LOG_ERR, "IOERROR: Path too long (%s)", buf);
+ fatal("path too long", EC_OSFILE);
+ }
+
+ tail = buf + strlen(buf);
+ *tail++ = '/';
+ *tail = '\0';
+ dirp = opendir(path);
+ if (dirp) {
+ while ((f = readdir(dirp))!=NULL) {
+ if (f->d_name[0] == '.'
+ && (f->d_name[1] == '\0'
+ || (f->d_name[1] == '.' &&
+ f->d_name[2] == '\0'))) {
+ /* readdir() can return "." or "..", and I got a bug report
+ that SCO might blow the file system to smithereens if we
+ unlink(".."). Let's not do that. */
+ continue;
+ }
+
+ if(strlen(buf) + strlen(f->d_name) >= sizeof(buf)) {
+ syslog(LOG_ERR, "IOERROR: Path too long (%s + %s)",
+ buf, f->d_name);
+ fatal("Path too long", EC_OSFILE);
+ }
+ strcpy(tail, f->d_name);
+ unlink(buf);
+ *tail = '\0';
+ }
+ closedir(dirp);
+ }
+}
+
+/* Callback for use by cmd_delete */
+static int chkchildren(char *name,
+ int matchlen __attribute__((unused)),
+ int maycreate __attribute__((unused)),
+ void *rock __attribute__((unused)))
+{
+ return CYRUSDB_DONE;
+}
+
+/*
* Delete and close the mailbox 'mailbox'. Closes 'mailbox' whether
* or not the deletion was successful. Requires a locked mailbox.
*/
int mailbox_delete(struct mailbox *mailbox, int delete_quota_root)
{
int r, rquota = 0;
- DIR *dirp;
- struct dirent *f;
- char buf[MAX_MAILBOX_PATH+1], *path;
- char *tail;
+ char nbuf[MAX_MAILBOX_NAME+1];
+ char pbuf[MAX_MAILBOX_PATH+1], mbuf[MAX_MAILBOX_PATH+1];
+ char *ntail, *ptail, *mtail = NULL;
struct txn *tid = NULL;
/* Ensure that we are locked */
@@ -2711,55 +2767,60 @@
quota_commit(&tid);
}
- /* remove data (message file) directory */
- path = mailbox->path;
-
+ /* Flush data (message file) directory */
+ mailbox_delete_files(mailbox->path);
+ strlcpy(pbuf, mailbox->path, sizeof(pbuf));
+ ptail = pbuf + strlen(pbuf);
+
+ /* Flush metadata directory */
+ if (mailbox->mpath) {
+ mailbox_delete_files(mailbox->mpath);
+ strlcpy(mbuf, mailbox->mpath, sizeof(mbuf));
+ mtail = mbuf + strlen(mbuf);
+ }
+
+ strlcpy(nbuf, mailbox->name, sizeof(nbuf));
+ ntail = nbuf + strlen(nbuf);
do {
- /* remove all files in directory */
- strlcpy(buf, path, sizeof(buf));
-
- if(strlen(buf) >= sizeof(buf) - 2) {
- syslog(LOG_ERR, "IOERROR: Path too long (%s)", buf);
- fatal("path too long", EC_OSFILE);
- }
-
- tail = buf + strlen(buf);
- *tail++ = '/';
- *tail = '\0';
- dirp = opendir(path);
- if (dirp) {
- while ((f = readdir(dirp))!=NULL) {
- if (f->d_name[0] == '.'
- && (f->d_name[1] == '\0'
- || (f->d_name[1] == '.' &&
- f->d_name[2] == '\0'))) {
- /* readdir() can return "." or "..", and I got a bug report
- that SCO might blow the file system to smithereens if we
- unlink(".."). Let's not do that. */
- continue;
- }
-
- if(strlen(buf) + strlen(f->d_name) >= sizeof(buf)) {
- syslog(LOG_ERR, "IOERROR: Path too long (%s + %s)",
- buf, f->d_name);
- fatal("Path too long", EC_OSFILE);
- }
- strcpy(tail, f->d_name);
- unlink(buf);
- *tail = '\0';
+ /* Check if the mailbox has children */
+ strcpy(ntail, ".*");
+ r = mboxlist_findall(NULL, nbuf, 1, NULL, NULL, chkchildren, NULL);
+ if (r != 0) break; /* We short-circuit with CYRUSDB_DONE */
+
+ /* No children, remove mailbox spool dir(s) */
+ if (rmdir(pbuf)) {
+ syslog(LOG_NOTICE,
+ "Remove of supposedly empty directory %s failed: %m",
+ pbuf);
+ }
+ ptail = strrchr(pbuf, '/');
+ *ptail ='\0';
+
+ if (mtail) {
+ if (rmdir(mbuf)) {
+ syslog(LOG_NOTICE,
+ "Remove of supposedly empty directory %s failed: %m",
+ mbuf);
}
- closedir(dirp);
- }
-
- /* Remove empty directories, going up path */
- tail--;
- do {
- *tail = '\0';
- } while (rmdir(buf) == 0 && (tail = strrchr(buf, '/')));
-
- /* remove metadata directory (if exists) */
- } while (mailbox->mpath && (path != mailbox->mpath) &&
- (path = mailbox->mpath));
+ mtail = strrchr(mbuf, '/');
+ *mtail ='\0';
+ }
+
+ /* Check if parent mailbox exists */
+ *ntail = '\0';
+ ntail = strrchr(nbuf, '.');
+ if (!ntail || strchr(ntail, '!')) {
+ /* Hit top of hierarchy or domain separator */
+ break;
+ }
+ *ntail = '\0';
+ if (!strcmp(nbuf, "user") ||
+ ((ntail - nbuf > 5) && !strcmp(ntail-5, "!user"))) {
+ /* Hit top of 'user' hierarchy */
+ break;
+ }
+ r = mboxlist_lookup(nbuf, NULL, NULL);
+ } while(r == IMAP_MAILBOX_NONEXISTENT);
syslog(LOG_NOTICE, "Deleted mailbox %s", mailbox->name);
mailbox_close(mailbox);
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mailbox.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mailbox.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mailbox.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mailbox.h Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
/* mailbox.h -- Mailbox format definitions
- * $Id: mailbox.h,v 1.77.2.14 2006/06/02 16:41:57 murch Exp $
+ * $Id: mailbox.h,v 1.82 2006/11/30 17:11:19 murch Exp $
*
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mbdump.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mbdump.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mbdump.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mbdump.c Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
/* mbdump.c -- Mailbox dump routines
- * $Id: mbdump.c,v 1.26.2.10 2006/05/22 20:52:27 murch Exp $
+ * $Id: mbdump.c,v 1.33 2007/02/05 18:41:47 jeaton Exp $
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -68,11 +68,14 @@
#include "mailbox.h"
#include "map.h"
#include "mbdump.h"
+#include "mboxkey.h"
#include "mboxlist.h"
#include "prot.h"
#include "quota.h"
#include "seen.h"
#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
#include "util.h"
/* is this the active script? */
@@ -143,22 +146,85 @@
return 0;
}
+static int dump_file(int first, int sync,
+ struct protstream *pin, struct protstream *pout,
+ const char *filename, const char *ftag)
+{
+ int filefd;
+ const char *base;
+ unsigned long len;
+ struct stat sbuf;
+ char c;
+
+ /* map file */
+ syslog(LOG_DEBUG, "wanting to dump %s", filename);
+ filefd = open(filename, O_RDONLY, 0666);
+ if (filefd == -1) {
+ syslog(LOG_ERR, "IOERROR: open on %s: %m", filename);
+ return IMAP_SYS_ERROR;
+ }
+
+ if (fstat(filefd, &sbuf) == -1) {
+ syslog(LOG_ERR, "IOERROR: fstat on %s: %m", filename);
+ fatal("can't fstat message file", EC_OSFILE);
+ }
+
+ base = NULL;
+ len = 0;
+
+ map_refresh(filefd, 1, &base, &len, sbuf.st_size, filename, NULL);
+
+ close(filefd);
+
+ /* send: name, size, and contents */
+ if (first) {
+ prot_printf(pout, " {%d}\r\n", strlen(ftag));
+
+ if (sync) {
+ /* synchronize */
+ c = prot_getc(pin);
+ eatline(pin, c); /* We eat it no matter what */
+ if (c != '+') {
+ /* Synchronization Failure, Abort! */
+ syslog(LOG_ERR, "Sync Error: expected '+' got '%c'",c);
+ return IMAP_SERVER_UNAVAILABLE;
+ }
+ }
+
+ prot_printf(pout, "%s {%lu%s}\r\n",
+ ftag, len, (sync ? "+" : ""));
+ } else {
+ prot_printf(pout, " {%d%s}\r\n%s {%lu%s}\r\n",
+ strlen(ftag), (sync ? "+" : ""),
+ ftag, len, (sync ? "+" : ""));
+ }
+ prot_write(pout, base, len);
+ map_free(&base, &len);
+
+ return 0;
+}
+
struct data_file {
const char *fname;
+ int optional;
unsigned long flag;
};
-static const char fname_header[] = FNAME_HEADER;
-static const char fname_index[] = FNAME_INDEX;
-static const char fname_cache[] = FNAME_CACHE;
+static const char fname_header[] = FNAME_HEADER;
+static const char fname_index[] = FNAME_INDEX;
+static const char fname_cache[] = FNAME_CACHE;
+static const char fname_expunge[] = FNAME_EXPUNGE_INDEX;
static struct data_file data_files[] = {
- { fname_header+1, IMAP_ENUM_METAPARTITION_FILES_HEADER },
- { fname_index+1, IMAP_ENUM_METAPARTITION_FILES_INDEX },
- { fname_cache+1, IMAP_ENUM_METAPARTITION_FILES_CACHE },
- /* XXX For two-phase expunge, we also need to copy cyrus.expunge */
- { NULL, 0 }
+ { fname_header+1, 0, IMAP_ENUM_METAPARTITION_FILES_HEADER },
+ { fname_index+1, 0, IMAP_ENUM_METAPARTITION_FILES_INDEX },
+ { fname_cache+1, 0, IMAP_ENUM_METAPARTITION_FILES_CACHE },
+ { fname_expunge+1, 1, IMAP_ENUM_METAPARTITION_FILES_EXPUNGE },
+ { NULL, 0, 0 }
};
+
+enum { SEEN_DB = 0, SUBS_DB = 1, MBOXKEY_DB = 2 };
+static int NUM_USER_DATA_FILES = 3;
int dump_mailbox(const char *tag, const char *mbname, const char *mbpath,
const char *metapath, const char *mbacl, int uid_start,
@@ -168,23 +234,14 @@
DIR *mbdir = NULL;
int r = 0;
struct dirent *next = NULL;
- char filename[MAX_MAILBOX_PATH + 1024], *fname_tail;
- size_t fname_len;
- int filefd;
- const char *base;
- unsigned long len;
+ char filename[MAX_MAILBOX_PATH + 1024];
int first = 1;
struct mailbox mb;
- unsigned int msgno;
- struct stat sbuf;
- char c;
int i;
struct data_file *df;
/* non-null userid means we are moving the user */
const char *userid = NULL;
- enum { SEEN_DB = 0, SUBS_DB = 1 };
- char *user_data_files[3];
int domainlen = 0;
char *p = NULL, userbuf[81];
@@ -193,19 +250,16 @@
if (config_virtdomains && (p = strchr(mbname, '!')))
domainlen = p - mbname + 1; /* include separator */
- if(!strncmp(mbname+domainlen, "user.", 5) &&
- !strchr(mbname+domainlen+5, '.')) {
+ if (!strncmp(mbname+domainlen, "user.", 5) &&
+ !strchr(mbname+domainlen+5, '.')) {
strcpy(userbuf, mbname+domainlen+5);
if (domainlen)
sprintf(userbuf+strlen(userbuf), "@%.*s", domainlen-1, mbname);
userid = userbuf;
- memset(user_data_files, 0, sizeof(user_data_files));
- user_data_files[SEEN_DB] = seen_getpath(userid);
- user_data_files[SUBS_DB] = mboxlist_hash_usersubs(userid);
}
mbdir = opendir(mbpath);
- if(!mbdir && errno == EACCES) {
+ if (!mbdir && errno == EACCES) {
syslog(LOG_ERR,
"could not dump mailbox in %s (permission denied)", mbpath);
return IMAP_PERMISSION_DENIED;
@@ -216,7 +270,7 @@
}
r = mailbox_open_locked(mbname, mbpath, metapath, mbacl, auth_state, &mb, 0);
- if(r) {
+ if (r) {
closedir(mbdir);
return r;
}
@@ -224,9 +278,7 @@
/* after this point we have to both close the directory and unlock
* the mailbox */
- /* xxx check to ensure we have the cyrus.* files, but we send those last */
-
- if(tag) prot_printf(pout, "%s DUMP ", tag);
+ if (tag) prot_printf(pout, "%s DUMP ", tag);
prot_putc('(',pout);
/* The first member is either a number (if it is a quota root), or NIL
@@ -234,217 +286,121 @@
{
struct quota quota;
- quota.root = (char *)mbname; /* xxx */
+ quota.root = (char *) mbname; /* xxx */
r = quota_read("a, NULL, 0);
- if(r) {
- prot_printf(pout, "NIL ");
- if(r == IMAP_QUOTAROOT_NONEXISTENT) r = 0;
- goto dump_files;
- }
-
- prot_printf(pout, "%d ", quota.limit);
- }
-
- dump_files:
-
- snprintf(filename, sizeof(filename), "%s/", mbpath);
- fname_len = strlen(filename);
- fname_tail = filename + fname_len;
-
- for (msgno = 1; msgno <= mb.exists; msgno++) {
- struct index_record record;
-
- r = mailbox_read_index_record(&mb, msgno, &record);
- if (r) {
- syslog(LOG_ERR, "IOERROR: reading index record %u: %m", msgno);
- goto done;
- }
-
- /* ensure (number) is >= our target uid */
- if(record.uid < uid_start) continue;
-
- /* map file */
- mailbox_message_get_fname(&mb, record.uid, fname_tail,
- sizeof(filename) - fname_len);
-
- filefd = open(filename, O_RDONLY, 0666);
- if (filefd == -1) {
- syslog(LOG_ERR, "IOERROR: open on %s: %m", filename);
- r = IMAP_SYS_ERROR;
- goto done;
- }
-
- if (fstat(filefd, &sbuf) == -1) {
- syslog(LOG_ERR, "IOERROR: fstat on %s: %m", filename);
- fatal("can't fstat message file", EC_OSFILE);
- }
-
- base = NULL;
- len = 0;
-
- map_refresh(filefd, 1, &base, &len, sbuf.st_size, filename, NULL);
-
- close(filefd);
-
- /* send filename, size, and contents */
- if(first) {
- prot_printf(pout, "{%d}\r\n",
- strlen(fname_tail));
-
- if(!tag) {
- /* synchronize */
- c = prot_getc(pin);
- eatline(pin, c); /* We eat it no matter what */
- if(c != '+') {
- /* Synchronization Failure, Abort! */
- syslog(LOG_ERR, "Sync Error: expected '+' got '%c'",c);
- r = IMAP_SERVER_UNAVAILABLE;
- goto done;
- }
- }
-
- prot_printf(pout, "%s {%lu%s}\r\n",
- fname_tail, len,
- (!tag ? "+" : ""));
-
- first = 0;
+ if (!r) {
+ prot_printf(pout, "%d", quota.limit);
} else {
- prot_printf(pout, " {%d%s}\r\n%s {%lu%s}\r\n",
- strlen(fname_tail),
- (!tag ? "+" : ""),
- fname_tail, len,
- (!tag ? "+" : ""));
- }
- prot_write(pout, base, len);
- map_free(&base, &len);
- }
-
- /* XXX For two-phase expunge, we also need to copy message files
- referenced by cyrus.expunge */
-
+ prot_printf(pout, "NIL");
+ if (r == IMAP_QUOTAROOT_NONEXISTENT) r = 0;
+ }
+ }
+
+ /* Dump cyrus data files */
for (df = data_files; df->fname; df++) {
const char *path;
- /* map file */
+ /* construct path/filename */
path = (metapath && (config_metapartition_files & df->flag)) ?
metapath : mbpath;
strlcpy(filename, path, sizeof(filename));
strlcat(filename, "/", sizeof(filename));
strlcat(filename, df->fname, sizeof(filename));
-
- filefd = open(filename, O_RDONLY, 0666);
- if (filefd == -1) {
- syslog(LOG_ERR, "IOERROR: open on %s: %m", filename);
- r = IMAP_SYS_ERROR;
+
+ r = dump_file(first, !tag, pin, pout, filename, df->fname);
+ if (r) {
+ /* If an optional file doesn't exist, skip it */
+ if (df->optional && (r == IMAP_SYS_ERROR) && (errno == ENOENT)) {
+ r = 0;
+ continue;
+ }
+
goto done;
}
-
- if (fstat(filefd, &sbuf) == -1) {
- syslog(LOG_ERR, "IOERROR: fstat on %s: %m", filename);
- fatal("can't fstat message file", EC_OSFILE);
- }
-
- base = NULL;
- len = 0;
-
- map_refresh(filefd, 1, &base, &len, sbuf.st_size, filename, NULL);
-
- close(filefd);
-
- /* send filename, size, and contents */
- if(first) {
- prot_printf(pout, "{%d}\r\n",
- strlen(df->fname));
-
- if(!tag) {
- /* synchronize */
- c = prot_getc(pin);
- if(c != '+') {
- /* Synchronization Failure, Abort! */
- r = IMAP_SERVER_UNAVAILABLE;
- goto done;
- } else {
- eatline(pin, c);
- }
- }
-
- prot_printf(pout, "%s {%lu%s}\r\n",
- df->fname, len,
- (!tag ? "+" : ""));
- first = 0;
- } else {
- prot_printf(pout, " {%d%s}\r\n%s {%lu%s}\r\n",
- strlen(df->fname),
- (!tag ? "+" : ""),
- df->fname, len,
- (!tag ? "+" : ""));
- }
- prot_write(pout, base, len);
- map_free(&base, &len);
- }
-
- /* now dump annotations */
+
+ first = 0;
+ }
+
+ /* Dump message files */
+ while ((next = readdir(mbdir)) != NULL) {
+ char *name = next->d_name; /* Alias */
+ char *p = name;
+
+ /* special case for '.' (well, it gets '..' too) */
+ if (name[0] == '.') continue;
+
+ /* skip non-message files */
+ while (*p && isdigit((int)(*p))) p++;
+ if (p[0] != '.' || p[1] != '\0') continue;
+
+ /* ensure (number) is >= our target uid */
+ if (atoi(name) < uid_start) continue;
+
+ /* construct path/filename */
+ snprintf(filename, sizeof(filename), "%s/%s", mbpath, name);
+
+ r = dump_file(0, !tag, pin, pout, filename, name);
+ if (r) goto done;
+ }
+
+ closedir(mbdir);
+ mbdir = NULL;
+
+ /* Dump annotations */
{
struct dump_annotation_rock actx;
actx.tag = tag;
actx.pout = pout;
- annotatemore_findall(mbname,"*",dump_annotations, (void *)&actx, NULL);
- }
-
- if(userid) {
+ annotatemore_findall(mbname, "*", dump_annotations,
+ (void *) &actx, NULL);
+ }
+
+ /* Dump user files */
+ if (userid) {
char sieve_path[MAX_MAILBOX_PATH];
int sieve_usehomedir = config_getswitch(IMAPOPT_SIEVEUSEHOMEDIR);
-
- /* need to transfer seen, subs, and sieve files */
- for(i=0;i<3;i++) {
- if(!user_data_files[i]) continue;
-
- /* map file */
- filefd = open(user_data_files[i], O_RDONLY, 0666);
- if (filefd == -1) {
- syslog(LOG_ERR, "IOERROR: open on %s: %m (continuing)",
- user_data_files[i]);
- /* but it is allowed to not exist, so... */
- continue;
- }
-
- if (fstat(filefd, &sbuf) == -1) {
- syslog(LOG_ERR, "IOERROR: fstat on %s: %m",
- user_data_files[i]);
- fatal("can't fstat message file", EC_OSFILE);
- }
-
- base = NULL;
- len = 0;
-
- map_refresh(filefd, 1, &base, &len, sbuf.st_size,
- user_data_files[i], NULL);
-
- close(filefd);
-
- /* send user data file type, size, and contents */
- /* No need to test synchronization, all mailboxes should have
- * sent a file by this point! */
- if(i == SEEN_DB) prot_printf(pout, " {4%s}\r\nSEEN",
- (!tag ? "+" : ""));
- else if(i == SUBS_DB) prot_printf(pout, " {4%s}\r\nSUBS",
- (!tag ? "+" : ""));
- else fatal("unknown user_data_file", EC_OSFILE);
- prot_printf(pout, " {%lu%s}\r\n",
- len, (!tag ? "+" : ""));
- prot_write(pout, base, len);
- map_free(&base, &len);
- }
-
- /* xxx can't use home directories currently
+ char *fname, *ftag;
+
+ /* Dump seen and subs files */
+ for (i = 0; i< NUM_USER_DATA_FILES; i++) {
+
+ /* construct path/filename */
+ switch (i) {
+ case SEEN_DB:
+ fname = seen_getpath(userid);
+ ftag = "SEEN";
+ break;
+ case SUBS_DB:
+ fname = mboxlist_hash_usersubs(userid);
+ ftag = "SUBS";
+ break;
+ case MBOXKEY_DB:
+ fname = mboxkey_getpath(userid);
+ ftag = "MBOXKEY";
+ break;
+ default:
+ fatal("unknown user data file", EC_OSFILE);
+ }
+
+ r = dump_file(0, !tag, pin, pout, fname, ftag);
+ free(fname);
+ if (r) {
+ /* If an optional file doesn't exist, skip it */
+ if (errno == ENOENT) {
+ r = 0;
+ continue;
+ }
+
+ goto done;
+ }
+ }
+
+ /* Dump sieve files
+ *
+ * xxx can't use home directories currently
* (it makes almost no sense in the conext of a murder) */
- if(!sieve_usehomedir) {
- char ext_fname[2048];
-
- if(mbdir) closedir(mbdir);
- mbdir = NULL;
-
+ if (!sieve_usehomedir) {
if (domainlen) {
*p = '\0'; /* separate domain!mboxname */
snprintf(sieve_path, sizeof(sieve_path), "%s%s%c/%s/%c/%s",
@@ -458,76 +414,50 @@
config_getstring(IMAPOPT_SIEVEDIR),
(char) dir_hash_c(userid), userid);
}
- mbdir=opendir(sieve_path);
+ mbdir = opendir(sieve_path);
+
+ if (!mbdir) {
+ syslog(LOG_ERR,
+ "could not dump sieve scripts in %s: %m)", mbpath);
+ } else {
+ char tag_fname[2048];
- if(mbdir) {
- snprintf(filename, sizeof(filename), "%s/", sieve_path);
- fname_len = strlen(filename);
- fname_tail = filename + fname_len;
-
while((next = readdir(mbdir)) != NULL) {
int length=strlen(next->d_name);
/* 7 == strlen(".script"); 3 == strlen(".bc") */
- if ((length >= 7 && !strcmp(next->d_name + (length - 7), ".script")) ||
- (length >= 3 && !strcmp(next->d_name + (length - 3), ".bc")))
+ if ((length >= 7 &&
+ !strcmp(next->d_name + (length - 7), ".script")) ||
+ (length >= 3 &&
+ !strcmp(next->d_name + (length - 3), ".bc")))
{
- /* map file */
- strlcpy(fname_tail, next->d_name,
- sizeof(filename) - fname_len);
- syslog(LOG_DEBUG, "wanting to dump %s", filename);
- filefd = open(filename, O_RDONLY, 0666);
- if (filefd == -1) {
- /* non-fatal */
- syslog(LOG_ERR,
- "IOERROR: open on %s: %m", filename);
- continue;
- }
-
- if (fstat(filefd, &sbuf) == -1) {
- syslog(LOG_ERR,
- "IOERROR: fstat on %s: %m", filename);
- fatal("can't fstat message file", EC_OSFILE);
- }
-
- base = NULL;
- len = 0;
-
- map_refresh(filefd, 1, &base, &len, sbuf.st_size,
- filename, NULL);
-
- close(filefd);
-
- /* send filename w/tag + contents */
- if(sieve_isactive(sieve_path, next->d_name)) {
- snprintf(ext_fname, sizeof(ext_fname),
- "SIEVED-%s", next->d_name);
- } else {
- 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),
- (!tag ? "+" : ""),
- ext_fname,
- len,
- (!tag ? "+" : ""));
- prot_write(pout, base, len);
- map_free(&base, &len);
+ /* create tagged name */
+ if(sieve_isactive(sieve_path, next->d_name)) {
+ snprintf(tag_fname, sizeof(tag_fname),
+ "SIEVED-%s", next->d_name);
+ } else {
+ snprintf(tag_fname, sizeof(tag_fname),
+ "SIEVE-%s", next->d_name);
+ }
+
+ /* dump file */
+ r = dump_file(0, !tag, pin, pout, filename, tag_fname);
+ if (r) goto done;
}
}
- }
- }
+
+ closedir(mbdir);
+ mbdir = NULL;
+ }
+ } /* end if !sieve_userhomedir */
- /* transmit sieve script(s) */
- /* free strings for user_data_files */
- } /* end if user */
+ } /* end if userid */
prot_printf(pout,")\r\n");
done:
prot_flush(pout);
mailbox_close(&mb);
- if(mbdir) closedir(mbdir);
+ if (mbdir) closedir(mbdir);
return r;
}
@@ -616,7 +546,7 @@
while(1) {
char fnamebuf[MAX_MAILBOX_PATH + 1024];
- char *seen_file = NULL;
+ char *seen_file = NULL, *mboxkey_file = NULL;
int isnowait, sawdigit;
unsigned long size;
unsigned long cutoff = ULONG_MAX / 10;
@@ -758,6 +688,10 @@
seen_file = seen_getpath(userid);
snprintf(fnamebuf,sizeof(fnamebuf),"%s.%d",seen_file,getpid());
+ } else if (userid && !strcmp(file.s, "MBOXKEY")) {
+ mboxkey_file = mboxkey_getpath(userid);
+
+ snprintf(fnamebuf,sizeof(fnamebuf),"%s.%d",mboxkey_file,getpid());
} else if (userid && !strncmp(file.s, "SIEVE", 5)) {
int isdefault = !strncmp(file.s, "SIEVED", 6);
char *realname;
@@ -864,6 +798,14 @@
unlink(fnamebuf);
}
+ /* we were operating on the seen state, so merge it and cleanup */
+ else if(mboxkey_file) {
+ mboxkey_merge(fnamebuf, mboxkey_file);
+ free(mboxkey_file);
+ mboxkey_file = NULL;
+
+ unlink(fnamebuf);
+ }
c = prot_getc(pin);
if (c == ')') break;
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mbdump.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mbdump.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mbdump.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mbdump.h Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
/* mbdump.h -- Mailbox dump routine definitions
- * $Id: mbdump.h,v 1.4.4.1 2004/04/08 21:13:05 ken3 Exp $
+ * $Id: mbdump.h,v 1.5 2006/11/30 17:11:19 murch Exp $
*
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mbexamine.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mbexamine.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mbexamine.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mbexamine.c Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: mbexamine.c,v 1.5.2.10 2006/06/02 16:41:57 murch Exp $ */
+/* $Id: mbexamine.c,v 1.13 2007/02/05 18:41:47 jeaton Exp $ */
#include <config.h>
@@ -92,6 +92,8 @@
#include "retry.h"
#include "util.h"
#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
extern int optind;
extern char *optarg;
@@ -289,7 +291,7 @@
printf("\n");
}
printf(" Last POP3 Login: (%ld) %s", mailbox.pop3_last_login,
- ctime(&mailbox.pop3_last_login));
+ ctime((const long *) &mailbox.pop3_last_login));
if (mailbox.minor_version >= 8) {
printf(" Highest Mod Sequence: " MODSEQ_FMT "\n",
mailbox.highestmodseq);
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mboxkey.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mboxkey.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mboxkey.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mboxkey.c Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
/* mboxkey.c -- implementation of URLAUTH mailbox keys
- * $Id: mboxkey.c,v 1.1.2.1 2005/11/17 15:46:28 murch Exp $
+ * $Id: mboxkey.c,v 1.2 2006/11/30 17:11:19 murch Exp $
*
* Copyright (c) 1998-2005 Carnegie Mellon University. All rights reserved.
*
@@ -77,6 +77,7 @@
struct mboxkey {
char *user; /* what user is this for? */
+ char *fname; /* filename (full path) of db */
struct db *db;
struct txn *tid; /* outstanding txn, if any */
};
@@ -126,6 +127,7 @@
struct mboxkey **mboxkeydbptr)
{
struct mboxkey *mboxkeydb;
+ struct stat sbuf;
char *fname = NULL;
int r;
@@ -137,7 +139,8 @@
}
/* if this is the db we've already opened, return it */
- if (mboxkeydb && !strcmp(mboxkeydb->user, user)) {
+ if (mboxkeydb && !strcmp(mboxkeydb->user, user) &&
+ !stat(mboxkeydb->fname, &sbuf)) {
abortcurrent(mboxkeydb);
*mboxkeydbptr = mboxkeydb;
return 0;
@@ -153,6 +156,7 @@
cyrusdb_strerror(r));
}
free(mboxkeydb->user);
+ free(mboxkeydb->fname);
} else {
/* create mboxkeydb */
mboxkeydb = (struct mboxkey *) xmalloc(sizeof(struct mboxkey));
@@ -172,10 +176,10 @@
return r;
}
syslog(LOG_DEBUG, "mboxkey_db: user %s opened %s", user, fname);
- free(fname);
mboxkeydb->tid = NULL;
mboxkeydb->user = xstrdup(user);
+ mboxkeydb->fname = fname;
*mboxkeydbptr = mboxkeydb;
return r;
@@ -329,6 +333,7 @@
}
if(!r) lastmboxkey->db = NULL;
free(lastmboxkey->user);
+ free(lastmboxkey->fname);
free(lastmboxkey);
lastmboxkey = NULL;
}
@@ -363,6 +368,7 @@
if (lastmboxkey) {
free(lastmboxkey->user);
+ free(lastmboxkey->fname);
free(lastmboxkey);
lastmboxkey = NULL;
}
@@ -410,21 +416,23 @@
r = IMAP_IOERROR;
}
free(lastmboxkey->user);
+ free(lastmboxkey->fname);
free(lastmboxkey);
}
return r;
}
-#if 0
+
struct mboxkey_merge_rock
{
struct db *db;
struct txn *tid;
};
-/* Look up the unique id in the tgt file, if it is there, compare the
- * last change times, and ensure that the tgt database uses the newer of
- * the two */
+/* Copy keys from tmp file to tgt file.
+ *
+ * XXX We currently have nothing to compare against.
+ */
static int mboxkey_merge_cb(void *rockp,
const char *key, int keylen,
const char *tmpdata, int tmpdatalen)
@@ -440,32 +448,20 @@
r = DB->fetchlock(tgtdb, key, keylen, &tgtdata, &tgtdatalen,
&(rockdata->tid));
if(!r && tgtdata) {
- /* compare timestamps */
- int version, tmplast, tgtlast;
- char *p;
+ unsigned short version, s;
const char *tmp = tmpdata, *tgt = tgtdata;
/* get version */
- version = strtol(tgt, &p, 10); tgt = p;
+ memcpy(&s, tgt, sizeof(s));
+ version = ntohs(s);
assert(version == MBOXKEY_VERSION);
- /* skip lastread */
- strtol(tgt, &p, 10); tgt = p;
- /* skip lastuid */
- strtol(tgt, &p, 10); tgt = p;
- /* get lastchange */
- tgtlast = strtol(tgt, &p, 10);
/* get version */
- version = strtol(tmp, &p, 10); tmp = p;
+ memcpy(&s, tmp, sizeof(s));
+ version = ntohs(s);
assert(version == MBOXKEY_VERSION);
- /* skip lastread */
- strtol(tmp, &p, 10); tmp = p;
- /* skip lastuid */
- strtol(tmp, &p, 10); tmp = p;
- /* get lastchange */
- tmplast = strtol(tmp, &p, 10);
-
- if(tmplast > tgtlast) dirty = 1;
+
+ dirty = 1;
} else {
dirty = 1;
}
@@ -507,4 +503,3 @@
return r;
}
-#endif
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mboxkey.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mboxkey.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mboxkey.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mboxkey.h Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
/* mboxkey.h -- abstract interface for URLAUTH mailbox keys
- * $Id: mboxkey.h,v 1.1.2.1 2005/11/17 15:46:28 murch Exp $
+ * $Id: mboxkey.h,v 1.2 2006/11/30 17:11:19 murch Exp $
* Copyright (c) 1998-2005 Carnegie Mellon University. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -80,8 +80,8 @@
/* Return a path to the mboxkey database for the given user */
char *mboxkey_getpath(const char *userid);
-#if 0
+
/* Merge tmpfile into tgtfile */
int mboxkey_merge(const char *tmpfile, const char *tgtfile);
-#endif
+
#endif /* MBOXKEY_H */
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mboxlist.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mboxlist.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mboxlist.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mboxlist.c Tue Feb 27 04:17:11 2007
@@ -40,7 +40,7 @@
*
*/
/*
- * $Id: mboxlist.c,v 1.221.2.22 2006/05/22 20:37:25 murch Exp $
+ * $Id: mboxlist.c,v 1.245 2007/02/05 18:41:47 jeaton Exp $
*/
#include <config.h>
@@ -74,6 +74,8 @@
#include "exitcodes.h"
#include "imap_err.h"
#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
#include "mboxname.h"
#include "mupdate-client.h"
@@ -549,13 +551,13 @@
int
mboxlist_createmailboxcheck(char *name, int mbtype, char *partition,
- int isadmin, char *userid,
- struct auth_state *auth_state,
- char **newacl, char **newpartition)
+ int isadmin, char *userid,
+ struct auth_state *auth_state,
+ char **newacl, char **newpartition, int forceuser)
{
return mboxlist_mycreatemailboxcheck(name, mbtype, partition, isadmin,
userid, auth_state, newacl,
- newpartition, 0, 0, 0, NULL);
+ newpartition, 0, 0, forceuser, NULL);
}
/*
@@ -1047,7 +1049,7 @@
*/
int mboxlist_renamemailbox(char *oldname, char *newname, char *partition,
int isadmin, char *userid,
- struct auth_state *auth_state)
+ struct auth_state *auth_state, int forceuser)
{
int r;
long access;
@@ -1170,7 +1172,7 @@
}
r = mboxlist_mycreatemailboxcheck(newname, 0, partition, isadmin,
userid, auth_state, NULL,
- &newpartition, 1, 0, 0, &tid);
+ &newpartition, 1, 0, forceuser, &tid);
switch (r) {
case 0:
break;
@@ -1436,7 +1438,7 @@
int r;
int access;
int mode = ACL_MODE_SET;
- int isusermbox = 0;
+ int isusermbox = 0, anyoneuseracl = 1;
struct mailbox mailbox;
int mailbox_open = 0;
char *acl, *newacl = NULL;
@@ -1493,6 +1495,7 @@
name[domainlen+5+useridlen] == '.')) {
isusermbox = 1;
}
+ anyoneuseracl = config_getswitch(IMAPOPT_ANYONEUSERACL);
/* 1. Start Transaction */
/* lookup the mailbox to make sure it exists and get its acl */
@@ -1540,6 +1543,12 @@
IMAP_PERMISSION_DENIED : IMAP_MAILBOX_NONEXISTENT;
goto done;
}
+ }
+
+ /* 2.1 Only admin user can set 'anyone' rights if config says so */
+ if (!r && !isadmin && !anyoneuseracl && !strncmp(identifier, "anyone", 6)) {
+ r = IMAP_PERMISSION_DENIED;
+ goto done;
}
/* 3. Set DB Entry */
@@ -2694,7 +2703,7 @@
void mboxlist_open(char *fname)
{
- int ret;
+ int ret, flags;
char *tofree = NULL;
/* create db file name */
@@ -2708,7 +2717,12 @@
strlcat(fname, FNAME_MBOXLIST, fname_len);
}
- ret = DB->open(fname, CYRUSDB_CREATE, &mbdb);
+ flags = CYRUSDB_CREATE;
+ if (config_getswitch(IMAPOPT_IMPROVED_MBOXLIST_SORT)) {
+ flags |= CYRUSDB_MBOXSORT;
+ }
+
+ ret = DB->open(fname, flags, &mbdb);
if (ret != 0) {
syslog(LOG_ERR, "DBERROR: opening %s: %s", fname,
cyrusdb_strerror(ret));
@@ -2776,12 +2790,18 @@
mboxlist_opensubs(const char *userid,
struct db **ret)
{
- int r = 0;
+ int r = 0,flags;
char *subsfname;
/* Build subscription list filename */
subsfname = mboxlist_hash_usersubs(userid);
- r = SUBDB->open(subsfname, CYRUSDB_CREATE, ret);
+
+ flags = CYRUSDB_CREATE;
+ if (config_getswitch(IMAPOPT_IMPROVED_MBOXLIST_SORT)) {
+ flags |= CYRUSDB_MBOXSORT;
+ }
+
+ r = SUBDB->open(subsfname, flags, ret);
if (r != CYRUSDB_OK) {
r = IMAP_IOERROR;
}
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mboxlist.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mboxlist.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mboxlist.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mboxlist.h Tue Feb 27 04:17:11 2007
@@ -38,7 +38,7 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: mboxlist.h,v 1.38.2.3 2005/02/21 19:25:40 ken3 Exp $
+ * $Id: mboxlist.h,v 1.40 2006/11/30 17:11:19 murch Exp $
*/
#ifndef INCLUDED_MBOXLIST_H
@@ -106,7 +106,8 @@
int mboxlist_createmailboxcheck(char *name, int mbtype, char *partition,
int isadmin, char *userid,
struct auth_state *auth_state,
- char **newacl, char **newpartition);
+ char **newacl, char **newpartition,
+ int forceuser);
/* create mailbox */
/* localonly creates the local mailbox without touching mupdate */
@@ -130,7 +131,7 @@
/* Rename/move a mailbox (hierarchical) */
int mboxlist_renamemailbox(char *oldname, char *newname, char *partition,
int isadmin, char *userid,
- struct auth_state *auth_state);
+ struct auth_state *auth_state, int forceuser);
/* change ACL */
int mboxlist_setacl(const char *name, const char *identifier,
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mboxname.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mboxname.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mboxname.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mboxname.c Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
/* mboxname.c -- Mailbox list manipulation routines
- * $Id: mboxname.c,v 1.31.2.4 2005/02/14 06:43:17 shadow Exp $
+ * $Id: mboxname.c,v 1.37 2006/11/30 17:11:19 murch Exp $
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mboxname.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mboxname.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mboxname.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mboxname.h Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
/* mboxname.h -- Mailbox list manipulation routines
- * $Id: mboxname.h,v 1.12.2.1 2004/03/24 19:53:08 ken3 Exp $
+ * $Id: mboxname.h,v 1.14 2006/11/30 17:11:19 murch Exp $
*
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mbpath.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mbpath.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mbpath.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mbpath.c Tue Feb 27 04:17:11 2007
@@ -1,6 +1,6 @@
/* mbpath.c -- help the sysadmin to find the path matching the mailbox
*
- * $Id: mbpath.c,v 1.14.2.5 2006/02/25 18:32:35 murch Exp $
+ * $Id: mbpath.c,v 1.20 2006/11/30 17:11:19 murch Exp $
*
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
@@ -42,7 +42,7 @@
*
*/
-/* static char _rcsid[] = "$Id: mbpath.c,v 1.14.2.5 2006/02/25 18:32:35 murch Exp $"; */
+/* static char _rcsid[] = "$Id: mbpath.c,v 1.20 2006/11/30 17:11:19 murch Exp $"; */
#include <config.h>
@@ -161,5 +161,5 @@
return 0;
}
-/* $Header: /cvs/src/cyrus/imap/mbpath.c,v 1.14.2.5 2006/02/25 18:32:35 murch Exp $ */
+/* $Header: /cvs/src/cyrus/imap/mbpath.c,v 1.20 2006/11/30 17:11:19 murch Exp $ */
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/message.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/message.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/message.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/message.c Tue Feb 27 04:17:11 2007
@@ -41,7 +41,7 @@
*/
/*
- * $Id: message.c,v 1.97.2.11 2006/05/26 16:27:18 murch Exp $
+ * $Id: message.c,v 1.102 2007/02/05 18:41:47 jeaton Exp $
*/
#include <config.h>
@@ -67,8 +67,11 @@
#include "message.h"
#include "parseaddr.h"
#include "charset.h"
+#include "stristr.h"
#include "util.h"
#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
#include "global.h"
#include "retry.h"
@@ -1649,7 +1652,7 @@
if (t >= 0) return (t - zone_off * 60);
baddate:
- return time(0);
+ return (flags & PARSE_NOCREATE) ? 0 : time(0);
}
/*
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/message.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/message.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/message.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/message.h Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
/* message.h -- Message parsing
- $Id: message.h,v 1.6.4.6 2006/03/09 22:39:36 murch Exp $
+ $Id: message.h,v 1.8 2006/12/19 18:56:27 murch Exp $
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
@@ -61,9 +61,10 @@
unsigned size, int allow_null));
/* Flags for parsing message date/time - to be bitwise OR'd */
-#define PARSE_DATE (1<<0)
+#define PARSE_DATE (1<<0) /* Default (always parsed) */
#define PARSE_TIME (1<<1)
#define PARSE_ZONE (1<<2)
+#define PARSE_NOCREATE (1<<15) /* Don't create one if its missing/invalid */
extern time_t message_parse_date P((char *hdr, unsigned flags));
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mupdate-client.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mupdate-client.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mupdate-client.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mupdate-client.c Tue Feb 27 04:17:11 2007
@@ -1,6 +1,6 @@
/* mupdate-client.c -- cyrus murder database clients
*
- * $Id: mupdate-client.c,v 1.38.2.12 2006/03/15 18:56:30 murch Exp $
+ * $Id: mupdate-client.c,v 1.49 2007/02/05 18:41:47 jeaton Exp $
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -76,6 +76,8 @@
#include "prot.h"
#include "protocol.h"
#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
const char service_name[] = "mupdate";
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mupdate-client.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mupdate-client.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mupdate-client.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mupdate-client.h Tue Feb 27 04:17:11 2007
@@ -1,6 +1,6 @@
/* mupdate-client.h -- cyrus murder database clients
*
- * $Id: mupdate-client.h,v 1.13.4.2 2005/11/23 13:41:26 murch Exp $
+ * $Id: mupdate-client.h,v 1.16 2006/11/30 17:11:19 murch Exp $
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mupdate-slave.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mupdate-slave.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mupdate-slave.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mupdate-slave.c Tue Feb 27 04:17:11 2007
@@ -1,6 +1,6 @@
/* mupdate-slave.c -- cyrus murder database clients
*
- * $Id: mupdate-slave.c,v 1.24.2.4 2006/03/15 18:56:31 murch Exp $
+ * $Id: mupdate-slave.c,v 1.29 2007/02/05 18:41:47 jeaton Exp $
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -68,6 +68,8 @@
#include "prot.h"
#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
#include "global.h"
#include "assert.h"
#include "imparse.h"
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mupdate.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mupdate.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mupdate.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mupdate.c Tue Feb 27 04:17:11 2007
@@ -1,6 +1,6 @@
/* mupdate.c -- cyrus murder database master
*
- * $Id: mupdate.c,v 1.77.2.19 2006/03/15 18:56:31 murch Exp $
+ * $Id: mupdate.c,v 1.94 2007/01/31 14:10:05 murch Exp $
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -182,7 +182,7 @@
static pthread_cond_t listener_cond = PTHREAD_COND_INITIALIZER;
static int listener_lock = 0;
-/* if you want to lick both listener and either of these two, you
+/* if you want to lock both listener and either of these two, you
* must lock listener first. You must have both listener_mutex and
* idle_connlist_mutex locked to remove anything from the idle_connlist */
static pthread_mutex_t idle_connlist_mutex = PTHREAD_MUTEX_INITIALIZER;
@@ -707,6 +707,12 @@
int was_blocking = prot_IS_BLOCKING(c->pin);
char *p;
+ /* We know we have input, so skip the check below.
+ * Note that we MUST skip this nonblocking check in order to properly
+ * catch connections that have timed out.
+ */
+ goto cmd;
+
nextcmd:
/* First we do a check for input */
prot_NONBLOCK(c->pin);
@@ -725,6 +731,7 @@
/* Set it back to blocking so we don't get half a word */
prot_BLOCK(c->pin);
+ cmd:
ch = getword(c->pin, &(c->tag));
if (ch == EOF) goto lost_conn;
@@ -1172,12 +1179,13 @@
pthread_mutex_unlock(&listener_mutex); /* UNLOCK */
if(ret == ETIMEDOUT) {
+ pthread_mutex_lock(&idle_worker_mutex); /* LOCK */
if(idle_worker_count <= config_getint(IMAPOPT_MUPDATE_WORKERS_MINSPARE)) {
+ pthread_mutex_unlock(&idle_worker_mutex); /* UNLOCK */
/* below number of spare workers, try to get the lock again */
goto retry_lock;
} else {
/* Decrement Idle Worker Count */
- pthread_mutex_lock(&idle_worker_mutex); /* LOCK */
idle_worker_count--;
pthread_mutex_unlock(&idle_worker_mutex); /* UNLOCK */
@@ -1256,7 +1264,9 @@
/* If we've been signaled to be unready, drop all current connections
* in the idle list */
+ pthread_mutex_lock(&ready_for_connections_mutex); /* LOCK */
if(!ready_for_connections) {
+ pthread_mutex_unlock(&ready_for_connections_mutex); /* UNLOCK */
/* Free all connections on idle_connlist. Note that
* any connection not currently on the idle_connlist will
* instead be freed when they drop out of their docmd() below */
@@ -1273,6 +1283,7 @@
goto nextlistener;
}
+ pthread_mutex_unlock(&ready_for_connections_mutex); /* UNLOCK */
if(connflag) {
/* read the fd from the pipe, if needed */
@@ -1340,7 +1351,9 @@
}
/* Are we allowed to continue serving data? */
+ pthread_mutex_lock(&ready_for_connections_mutex); /* LOCK */
if(!ready_for_connections) {
+ pthread_mutex_unlock(&ready_for_connections_mutex); /* UNLOCK */
prot_printf(C->pout,
"* BYE \"no longer ready for connections\"\r\n");
conn_free(currConn);
@@ -1348,11 +1361,12 @@
* this back to the idle list */
continue;
}
+ pthread_mutex_unlock(&ready_for_connections_mutex); /* UNLOCK */
} /* done handling command */
if(send_a_banner || do_a_command) {
/* We did work in this thread, so we need to [re-]add the
- * connection to the idle list and signal the current listner */
+ * connection to the idle list and signal the current listener */
pthread_mutex_lock(&idle_connlist_mutex); /* LOCK */
currConn->idle = 1;
@@ -1377,9 +1391,11 @@
* in the idle_worker_count */
pthread_mutex_lock(&worker_count_mutex); /* LOCK */
worker_count--;
+ pthread_mutex_lock(&idle_worker_mutex); /* LOCK */
syslog(LOG_DEBUG,
"Worker thread finished, for a total of %d (%d spare)",
worker_count, idle_worker_count);
+ pthread_mutex_unlock(&idle_worker_mutex); /* UNLOCK */
pthread_mutex_unlock(&worker_count_mutex); /* UNLOCK */
protgroup_free(protin);
@@ -2347,12 +2363,13 @@
void mupdate_ready(void)
{
+ pthread_mutex_lock(&ready_for_connections_mutex);
+
if(ready_for_connections) {
syslog(LOG_CRIT, "mupdate_ready called when already ready");
fatal("mupdate_ready called when already ready", EC_TEMPFAIL);
}
- pthread_mutex_lock(&ready_for_connections_mutex);
ready_for_connections = 1;
pthread_cond_broadcast(&ready_for_connections_cond);
pthread_mutex_unlock(&ready_for_connections_mutex);
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mupdate.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mupdate.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mupdate.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/mupdate.h Tue Feb 27 04:17:11 2007
@@ -1,6 +1,6 @@
/* mupdate.h - private mupdate header file
*
- * $Id: mupdate.h,v 1.15.2.2 2006/03/15 18:56:32 murch Exp $
+ * $Id: mupdate.h,v 1.17 2006/11/30 17:11:19 murch Exp $
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/nntpd.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/nntpd.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/nntpd.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/nntpd.c Tue Feb 27 04:17:11 2007
@@ -38,7 +38,7 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: nntpd.c,v 1.2.2.50 2006/05/26 15:50:07 murch Exp $
+ * $Id: nntpd.c,v 1.54 2007/02/05 18:49:56 jeaton Exp $
*/
/*
@@ -106,6 +106,8 @@
#include "version.h"
#include "wildmat.h"
#include "xmalloc.h"
+#include "xstrlcat.h"
+#include "xstrlcpy.h"
extern int optind;
extern char *optarg;
@@ -2911,7 +2913,7 @@
}
}
- return NNTP_FAIL_NEWSGROUPS;
+ /* never reached */
}
/*
@@ -3388,7 +3390,7 @@
newsprefix, len, group);
r = mboxlist_renamemailbox(oldmailboxname, newmailboxname, NULL, 0,
- newsmaster, newsmaster_authstate);
+ newsmaster, newsmaster_authstate, 0);
/* XXX check body of message for useful MIME parts */
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/notify.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/notify.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/notify.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/notify.c Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
/* notify.c -- Module to notify of new mail
- * $Id: notify.c,v 1.13.2.1 2006/03/17 14:14:54 murch Exp $
+ * $Id: notify.c,v 1.15 2007/02/05 18:41:47 jeaton Exp $
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -59,6 +59,8 @@
#include "global.h"
#include "notify.h"
#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
#define FNAME_NOTIFY_SOCK "/socket/notify"
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/pop3d.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/pop3d.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/pop3d.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/pop3d.c Tue Feb 27 04:17:11 2007
@@ -40,7 +40,7 @@
*/
/*
- * $Id: pop3d.c,v 1.144.2.43 2006/05/26 15:50:09 murch Exp $
+ * $Id: pop3d.c,v 1.171 2007/02/05 18:41:48 jeaton Exp $
*/
#include <config.h>
@@ -79,6 +79,8 @@
#include "mailbox.h"
#include "version.h"
#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
#include "mboxlist.h"
#include "idle.h"
#include "telemetry.h"
@@ -1624,10 +1626,6 @@
prot_printf(popd_out,
"-ERR [LOGIN-DELAY] Logins must be at least %d minute%s apart\r\n",
minpoll, minpoll > 1 ? "s" : "");
- if (!mailbox_lock_index(&mboxstruct)) {
- mboxstruct.pop3_last_login = popd_login_time;
- mailbox_write_index_header(&mboxstruct);
- }
mailbox_close(&mboxstruct);
goto fail;
}
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/protocol.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/protocol.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/protocol.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/protocol.c Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: protocol.c,v 1.2.2.13 2006/06/27 15:58:42 murch Exp $ */
+/* $Id: protocol.c,v 1.15 2006/11/30 17:11:19 murch Exp $ */
#include <config.h>
@@ -114,6 +114,7 @@
{ " MUPDATE", CAPA_MUPDATE },
{ " MULTIAPPEND", CAPA_MULTIAPPEND },
{ " LIST-SUBSCRIBED", CAPA_LISTSUBSCRIBED },
+ { " RIGHTS=kxte", CAPA_ACLRIGHTS },
{ NULL, 0 } } },
{ "S01 STARTTLS", "S01 OK", "S01 NO" },
{ "A01 AUTHENTICATE", 0, 0, "A01 OK", "A01 NO", "+ ", "*", NULL },
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/protocol.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/protocol.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/protocol.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/protocol.h Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: protocol.h,v 1.2.2.6 2006/06/27 15:58:42 murch Exp $ */
+/* $Id: protocol.h,v 1.7 2006/11/30 17:11:19 murch Exp $ */
#ifndef _INCLUDED_PROTOCOL_H
#define _INCLUDED_PROTOCOL_H
@@ -56,13 +56,14 @@
CAPA_MUPDATE = (1 << 3),
CAPA_MULTIAPPEND = (1 << 4),
CAPA_LISTSUBSCRIBED = (1 << 5),
+ CAPA_ACLRIGHTS = (1 << 6),
/* LMTP capabilities */
CAPA_PIPELINING = (1 << 2),
CAPA_IGNOREQUOTA = (1 << 3)
};
-#define MAX_CAPA 6
+#define MAX_CAPA 7
struct capa_t {
const char *str;
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/proxy.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/proxy.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/proxy.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/proxy.c Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: proxy.c,v 1.1.2.8 2006/02/10 21:10:58 murch Exp $
+ * $Id: proxy.c,v 1.5 2007/02/05 18:41:48 jeaton Exp $
*/
#include <config.h>
@@ -60,6 +60,8 @@
#include "prot.h"
#include "proxy.h"
#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
void proxy_adddest(struct dest **dlist, const char *rcpt, int rcpt_num,
char *server, const char *authas)
@@ -125,7 +127,7 @@
struct backend *be = (struct backend *) rock;
int is_active = (be->context ? *((int *) be->context) : 0);
- if ((be != *(be->current)) && !is_active) {
+ if ((!be->current || (be != *(be->current))) && !is_active) {
/* server is not our current server, and idle too long.
* down the backend server (removes the event as a side-effect)
*/
@@ -258,14 +260,15 @@
if (pout) {
const char *err;
+ char buf[4096];
+ int c;
do {
- char buf[4096];
- int c = prot_read(pin, buf, sizeof(buf));
+ c = prot_read(pin, buf, sizeof(buf));
if (c == 0 || c < 0) break;
prot_write(pout, buf, c);
- } while (pin->cnt > 0);
+ } while (c == sizeof(buf));
if ((err = prot_error(pin)) != NULL) {
if (serverout && !strcmp(err, PROT_EOF_STRING)) {
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/proxy.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/proxy.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/proxy.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/proxy.h Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: proxy.h,v 1.1.2.7 2006/02/10 21:10:58 murch Exp $
+ * $Id: proxy.h,v 1.2 2006/11/30 17:11:19 murch Exp $
*/
#ifndef _PROXY_H
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/quota.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/quota.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/quota.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/quota.c Tue Feb 27 04:17:11 2007
@@ -40,7 +40,7 @@
*
*/
-/* $Id: quota.c,v 1.48.2.17 2005/05/27 16:49:44 ken3 Exp $ */
+/* $Id: quota.c,v 1.67 2007/02/05 18:41:48 jeaton Exp $ */
#include <config.h>
@@ -82,6 +82,8 @@
#include "imap_err.h"
#include "mailbox.h"
#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
#include "mboxlist.h"
#include "mboxname.h"
#include "quota.h"
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/quota.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/quota.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/quota.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/quota.h Tue Feb 27 04:17:11 2007
@@ -38,7 +38,7 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: quota.h,v 1.1.2.3 2004/08/09 18:51:21 ken3 Exp $
+ * $Id: quota.h,v 1.3 2006/11/30 17:11:20 murch Exp $
*/
#ifndef INCLUDED_QUOTA_H
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/quota_db.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/quota_db.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/quota_db.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/quota_db.c Tue Feb 27 04:17:11 2007
@@ -38,7 +38,7 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: quota_db.c,v 1.1.2.3 2004/08/09 18:51:21 ken3 Exp $
+ * $Id: quota_db.c,v 1.4 2007/02/05 18:41:48 jeaton Exp $
*
*/
@@ -62,6 +62,8 @@
#include "quota.h"
#include "util.h"
#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
#define QDB config_quota_db
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/reconstruct.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/reconstruct.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/reconstruct.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/reconstruct.c Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: reconstruct.c,v 1.81.2.21 2006/06/02 16:41:57 murch Exp $ */
+/* $Id: reconstruct.c,v 1.90 2007/02/05 18:41:48 jeaton Exp $ */
#include <config.h>
@@ -86,6 +86,8 @@
#include "map.h"
#include "message.h"
#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
#include "global.h"
#include "mboxname.h"
#include "mboxlist.h"
@@ -94,6 +96,7 @@
#include "retry.h"
#include "convert_code.h"
#include "util.h"
+#include "sync_log.h"
extern int optind;
extern char *optarg;
@@ -102,6 +105,13 @@
char *name;
struct discovered *next;
};
+struct uniqmailid {
+ char * uniqmbxid;
+ char *uniqname;
+ struct uniqmailid *uniqnext;
+};
+
+struct uniqmailid *uniqmid_head;
/* current namespace */
static struct namespace recon_namespace;
@@ -114,10 +124,15 @@
int do_reconstruct(char *name, int matchlen, int maycreate, void *rock);
int reconstruct(char *name, struct discovered *l);
void usage(void);
+char * getmailname (char * mailboxname);
+struct uniqmailid * add_uniqid (char * mailboxname, char * mailboxid);
+struct uniqmailid * find_uniqid (char * mailboxname, char * mailboxid);
extern cyrus_acl_canonproc_t mboxlist_ensureOwnerRights;
int code = 0;
+int keepflag = 0;
+int syncflag = 0;
int main(int argc, char **argv)
{
@@ -141,12 +156,16 @@
assert(INDEX_HEADER_SIZE == (OFFSET_SPARE4+4));
assert(INDEX_RECORD_SIZE == (OFFSET_MODSEQ+4));
- while ((opt = getopt(argc, argv, "C:p:rmfx")) != EOF) {
+ while ((opt = getopt(argc, argv, "C:kp:rmfsx")) != EOF) {
switch (opt) {
case 'C': /* alt config file */
alt_config = optarg;
break;
+ case 'k':
+ keepflag = 1;
+ break;
+
case 'p':
start_part = optarg;
break;
@@ -163,6 +182,10 @@
fflag = 1;
break;
+ case 's':
+ syncflag = 1;
+ break;
+
case 'x':
xflag = 1;
break;
@@ -180,6 +203,8 @@
syslog(LOG_ERR, error_message(r));
fatal(error_message(r), EC_CONFIG);
}
+ if (syncflag)
+ sync_log_init();
if(start_part) {
/* Get partition's path */
@@ -352,7 +377,7 @@
void usage(void)
{
fprintf(stderr,
- "usage: reconstruct [-C <alt_config>] [-p partition] [-rfx] mailbox...\n");
+ "usage: reconstruct [-C <alt_config>] [-p partition] [-ksrfx] mailbox...\n");
fprintf(stderr, " reconstruct [-C <alt_config>] -m\n");
exit(EC_USAGE);
}
@@ -404,6 +429,264 @@
return 0;
}
+int
+reconstruct_expunge (char * path, struct mailbox * mailbox,
+ unsigned long **expuid, int *expuid_num)
+{
+ char fnamebuf[MAX_MAILBOX_PATH+1];
+ char newfnamebuf[MAX_MAILBOX_PATH+1];
+ struct stat sbuf;
+
+ char buf[((INDEX_HEADER_SIZE > INDEX_RECORD_SIZE) ?
+ INDEX_HEADER_SIZE : INDEX_RECORD_SIZE)];
+
+ int expunge_fd;
+ FILE *fexpunge;
+
+ const char *index_base = NULL;
+ unsigned long index_len = 0; /* mapped size */
+ int format;
+ int minor_version;
+ unsigned long start_offset;
+ unsigned long record_size;
+ unsigned long exists;
+
+ unsigned long uid;
+ char msgfname[MAILBOX_FNAME_LEN+1];
+
+ unsigned msgno;
+ const char *p;
+ int n;
+
+ unsigned long *expuid_array = NULL;
+ int expuid_idx = 0;
+ int expuid_alloc = 0;
+ int expmsg;
+
+ *expuid = NULL;
+ *expuid_num = 0;
+
+ /* Open and validate the cyrus.expunge file */
+
+ strlcpy(fnamebuf, path, sizeof(fnamebuf));
+ strlcat(fnamebuf, FNAME_EXPUNGE_INDEX, sizeof(fnamebuf));
+
+ if (stat(fnamebuf, &sbuf) == -1 ||
+ sbuf.st_size <= OFFSET_LEAKED_CACHE ||
+ (expunge_fd = open(fnamebuf, O_RDONLY, 0666)) == -1) {
+ unlink(fnamebuf);
+ return (0);
+ }
+
+ /* Map the file */
+ map_refresh(expunge_fd, 1, &index_base,
+ &index_len, sbuf.st_size, "expunge", mailbox->name);
+
+ format = ntohl(*((bit32 *)(index_base+OFFSET_FORMAT)));
+ minor_version = ntohl(*((bit32 *)(index_base+OFFSET_MINOR_VERSION)));
+ start_offset = ntohl(*((bit32 *)(index_base+OFFSET_START_OFFSET)));
+ record_size = ntohl(*((bit32 *)(index_base+OFFSET_RECORD_SIZE)));
+ exists = ntohl(*((bit32 *)(index_base+OFFSET_EXISTS)));
+
+ /* Sanity check the header as best we can */
+ if ((format != 0) || (exists == 0) ||
+ (minor_version == 0) || (minor_version > MAILBOX_MINOR_VERSION) ||
+ (start_offset == 0) || (start_offset > INDEX_HEADER_SIZE) ||
+ (record_size == 0) || (record_size > INDEX_RECORD_SIZE) ||
+ (sbuf.st_size < (start_offset + exists * record_size))) {
+
+ syslog(LOG_ERR, "Unable to verify header - deleting: %s", fnamebuf);
+ close (expunge_fd);
+ map_free(&index_base, &index_len);
+ unlink(fnamebuf);
+ return (0);
+ }
+
+ /*
+ * verify the message files exist -
+ * optionally deleting message files
+ */
+ p = index_base + start_offset;
+ for (msgno = 1; msgno <= exists; msgno++, p += record_size) {
+ uid = ntohl(*((bit32 *)(p + OFFSET_UID)));
+
+ /* Sanity check UID */
+ if (uid == 0) {
+ syslog(LOG_ERR, "IOERROR: %s zero expunge record %u/%lu",
+ fnamebuf, msgno, exists);
+ break;
+ }
+ mailbox_message_get_fname(mailbox, uid, msgfname, sizeof(msgfname));
+
+ if (keepflag == 0) {
+ unlink(msgfname);
+ continue;
+ }
+
+ if ( (stat (msgfname, &sbuf)) != 0) {
+ syslog (LOG_ERR, "IOERROR: %m while stat\'ing message %s", msgfname);
+ continue;
+ }
+ if (sbuf.st_size == 0) {
+ /* Zero-length message file--blow it away */
+ unlink(msgfname);
+ continue;
+ }
+
+ if (expuid_idx == expuid_alloc) {
+ expuid_alloc += UIDGROW;
+ expuid_array = (unsigned long *) xrealloc((char *)*expuid,
+ expuid_alloc * sizeof(unsigned long));
+ }
+ expuid_array[expuid_idx] = uid;
+ expuid_idx++;
+ }
+ *expuid = expuid_array;
+ *expuid_num = expuid_idx;
+
+ if (keepflag == 0) {
+ map_free(&index_base, &index_len);
+ close (expunge_fd);
+ unlink(fnamebuf);
+ return (0);
+ }
+
+ /*
+ * If the number of message files in the old expunge file
+ * is not equal to what we just counted,
+ * we'll rewrite the expunge file.
+ * If we found no message files -- blow away cyrus.expunge
+ */
+ if (exists == expuid_idx) {
+ close(expunge_fd);
+ map_free(&index_base, &index_len);
+ } else if ( expuid_idx == 0) {
+ close(expunge_fd);
+ map_free(&index_base, &index_len);
+ unlink (fnamebuf);
+ } else {
+ /* we must rewrite the cyrus.expunge file */
+
+ strcpy (newfnamebuf, fnamebuf);
+ strcat (newfnamebuf, ".NEW");
+ fexpunge = fopen(newfnamebuf, "w+");
+ if (fexpunge == NULL) {
+ syslog (LOG_ERR, "IOERROR: %m while creating: %s", newfnamebuf);
+ close(expunge_fd);
+ map_free(&index_base, &index_len);
+ free(expuid);
+ return IMAP_IOERROR;
+ }
+ unsigned msgno;
+ const char *p = index_base + start_offset;
+
+ /*
+ * verify the message files exist -
+ * optionally deleting message files
+ */
+ for (msgno = 1; msgno <= exists; msgno++, p += record_size) {
+ unsigned long fileuid = ntohl(*((bit32 *)(p + OFFSET_UID)));
+
+ for (expmsg = 0; expmsg < expuid_idx; expmsg++) {
+ if (fileuid == expuid_array [expmsg]) {
+
+ n = fwrite(buf, 1, INDEX_RECORD_SIZE, fexpunge);
+ if (n != INDEX_RECORD_SIZE) {
+ syslog (LOG_ERR,
+ "IOERROR: %m writing cyrus.expunge record: %s", newfnamebuf);
+ close(expunge_fd);
+ map_free(&index_base, &index_len);
+ free(expuid);
+ fclose(fexpunge);
+
+ return IMAP_IOERROR;
+ }
+ break;
+ }
+ }
+ }
+ rewind (fexpunge);
+ *((bit32 *)(buf+OFFSET_EXISTS)) = htonl(*expuid_num);
+ n = fwrite(buf, 1, INDEX_HEADER_SIZE, fexpunge);
+ if (n != INDEX_HEADER_SIZE || ferror(fexpunge) ) {
+ syslog (LOG_ERR, "IOERROR: %m writing expunge header: %s", newfnamebuf);
+ close(expunge_fd);
+ map_free(&index_base, &index_len);
+ free(expuid);
+ fclose(fexpunge);
+ return IMAP_IOERROR;
+ }
+
+ close(expunge_fd);
+ map_free(&index_base, &index_len);
+ unlink(fnamebuf);
+ fchmod (fileno (fexpunge),
+ S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH |S_IWOTH);
+ fclose(fexpunge);
+ if (rename(newfnamebuf, fnamebuf)) {
+ free(expuid);
+ return IMAP_IOERROR;
+ }
+ }
+
+ if (expuid_idx > 0) {
+ qsort((char *)expuid_array, expuid_idx, sizeof(expuid_array), compare_uid);
+ }
+
+ return (0);
+}
+
+char *
+getmailname (char * mailboxname)
+{
+ static char namebuf[MAX_MAILBOX_PATH + 1];
+ static int namebuflen;
+
+ char * pname;
+
+ strlcpy (namebuf, mailboxname, sizeof (namebuf));
+ pname = strchr (namebuf, '.');
+ if (pname) {
+ pname = strchr(pname + 1, '.');
+ if (pname)
+ *pname = '\0';
+ }
+ return (namebuf);
+}
+
+struct uniqmailid *
+find_uniqid ( char * mailboxname, char * mailboxid)
+{
+ struct uniqmailid *puniq;
+ char * nameptr;
+
+ nameptr = getmailname (mailboxname);
+ for (puniq = uniqmid_head; puniq != NULL; puniq = puniq->uniqnext) {
+ if (strcmp (puniq->uniqmbxid, mailboxid) == 0) {
+ if (strcmp (puniq->uniqname, nameptr) == 0) {
+ return (puniq);
+ }
+ }
+ }
+ return NULL;
+}
+struct uniqmailid *
+add_uniqid ( char * mailboxname, char * mailboxid)
+{
+ struct uniqmailid *puniq;
+ char *pboxname;
+
+ pboxname = getmailname (mailboxname);
+
+ puniq = xmalloc (sizeof (struct uniqmailid));
+ puniq->uniqmbxid = xstrdup(mailboxid);
+ puniq->uniqname = xstrdup(pboxname);
+
+ puniq->uniqnext = uniqmid_head;
+ uniqmid_head = puniq;
+
+ return (puniq);
+}
/*
* Reconstruct the single mailbox named 'name'
*/
@@ -432,6 +715,10 @@
unsigned long *uid;
int uid_num, uid_alloc;
+ unsigned long *expuid;
+ int expuid_num;
+ int expmsg;
+
int msg, old_msg = 0;
int new_exists = 0,
new_answered = 0,
@@ -451,7 +738,8 @@
int mytype;
char mbpath[MAX_MAILBOX_PATH+1], *path;
- int expunge_fd = -1;
+ int expunge_found;
+ char unique_buf[32];
/* Start by looking up current data in mailbox list */
r = mboxlist_detail(name, &mytype, &mypath, &mympath,
@@ -576,64 +864,11 @@
fwrite(buf, 1, INDEX_HEADER_SIZE, newindex);
retry_write(newcache_fd, buf, sizeof(bit32));
- /* Remove any previously expunged messages */
- /* XXX For two-phase we will need to keep the messages referenced
- in cyrus.expunge and refresh its header and offsets */
- path = (mailbox.mpath &&
- (config_metapartition_files &
- IMAP_ENUM_METAPARTITION_FILES_EXPUNGE)) ?
- mailbox.mpath : mailbox.path;
- strlcpy(fnamebuf, path, sizeof(fnamebuf));
- strlcat(fnamebuf, FNAME_EXPUNGE_INDEX, sizeof(fnamebuf));
- if (stat(fnamebuf, &sbuf) != -1 &&
- sbuf.st_size > OFFSET_LEAKED_CACHE &&
- (expunge_fd = open(fnamebuf, O_RDONLY, 0666)) != -1) {
- const char *index_base = NULL;
- unsigned long index_len = 0; /* mapped size */
- int format, minor_version;
- unsigned long start_offset, record_size, exists;
-
- /* Map the file */
- map_refresh(expunge_fd, 1, &index_base,
- &index_len, sbuf.st_size, "expunge", mailbox.name);
-
- format = ntohl(*((bit32 *)(index_base+OFFSET_FORMAT)));
- minor_version = ntohl(*((bit32 *)(index_base+OFFSET_MINOR_VERSION)));
- start_offset = ntohl(*((bit32 *)(index_base+OFFSET_START_OFFSET)));
- record_size = ntohl(*((bit32 *)(index_base+OFFSET_RECORD_SIZE)));
- exists = ntohl(*((bit32 *)(index_base+OFFSET_EXISTS)));
-
- /* Sanity check the header as best we can */
- if (format == 0 && exists &&
- minor_version && minor_version <= MAILBOX_MINOR_VERSION &&
- start_offset && start_offset <= INDEX_HEADER_SIZE &&
- record_size && record_size <= INDEX_RECORD_SIZE &&
- sbuf.st_size >= (start_offset + exists * record_size)) {
- unsigned msgno;
- const char *p = index_base + start_offset;
-
- /* Delete message files */
- for (msgno = 1; msgno <= exists; msgno++, p += record_size) {
- unsigned long uid = ntohl(*((bit32 *)(p + OFFSET_UID)));
- char msgfname[MAILBOX_FNAME_LEN+1];
-
- /* Sanity check UID */
- if (uid == 0) {
- syslog(LOG_ERR, "IOERROR: %s zero expunge record %u/%lu",
- mailbox.name, msgno, exists);
- break;
- }
-
- mailbox_message_get_fname(&mailbox, uid,
- msgfname, sizeof(msgfname));
- unlink(msgfname);
- }
- }
-
- map_free(&index_base, &index_len);
- close(expunge_fd);
- }
- unlink(fnamebuf);
+ if (reconstruct_expunge ( path, &mailbox, &expuid, &expuid_num) != 0) {
+ fclose(newindex);
+ mailbox_close(&mailbox);
+ return IMAP_IOERROR;
+ }
/* Find all message files in directory */
uid = (unsigned long *) xmalloc(UIDGROW * sizeof(unsigned long));
@@ -647,29 +882,29 @@
mailbox_close(&mailbox);
free(uid);
return IMAP_IOERROR;
- } else {
+ }
while ((dirent = readdir(dirp))!=NULL) {
- if (!isdigit((int) (dirent->d_name[0])) || dirent->d_name[0] ==
- '0')
+ if (!isdigit((int) (dirent->d_name[0])) || dirent->d_name[0] == '0')
continue;
- if (uid_num == uid_alloc) {
- uid_alloc += UIDGROW;
- uid = (unsigned long *)
- xrealloc((char *)uid, uid_alloc * sizeof(unsigned long));
- }
- uid[uid_num] = 0;
p = dirent->d_name;
+ msg = 0;
while (isdigit((int) *p)) {
- uid[uid_num] = uid[uid_num] * 10 + *p++ - '0';
+ msg = msg * 10 + *p++ - '0';
}
if (*p++ != '.') continue;
if (*p) continue;
+ if (uid_num == uid_alloc) {
+ uid_alloc += UIDGROW;
+ uid = (unsigned long *)
+ xrealloc((char *)uid, uid_alloc * sizeof(unsigned long));
+ }
+ uid[uid_num] = msg;
uid_num++;
}
closedir(dirp);
+
qsort((char *)uid, uid_num, sizeof(*uid), compare_uid);
- }
/* Put each message file in the new index/cache */
old_msg = 0;
@@ -702,6 +937,20 @@
unlink(msgfname);
continue;
}
+
+ /* Check if this message is on the expunge list */
+ expunge_found = 0;
+ for (expmsg = 0; expmsg < expuid_num; expmsg++) {
+ if (uid[msg] == expuid [expmsg]) {
+ expunge_found = 1;
+ break;
+ }
+ if (uid[msg] > expuid [expmsg]) {
+ break;
+ }
+ }
+ if ( expunge_found == 0 ) {
+
/* Find old index record, if it exists */
while (old_msg < mailbox.exists && old_index.uid < uid[msg]) {
@@ -737,22 +986,28 @@
/* If we are recovering a message, reset MODSEQ */
message_index.modseq = 1;
}
+
message_index.last_updated = time(0);
if (message_index.modseq > mailbox.highestmodseq) {
mailbox.highestmodseq = message_index.modseq;
}
+ }
if (((r = message_parse_file(msgfile, NULL, NULL, &body)) != 0) ||
((r = message_create_record(&mailbox, &message_index, body)) != 0)) {
fclose(msgfile);
fclose(newindex);
mailbox_close(&mailbox);
free(uid);
+ if (expuid_num) {
+ free(expuid);
+ }
return r;
}
fclose(msgfile);
if (body) message_free_body(body);
+ if (expunge_found == 0) {
/* Write out new entry in index file */
mailbox_index_record_to_buf(&message_index, buf);
@@ -761,14 +1016,20 @@
fclose(newindex);
mailbox_close(&mailbox);
free(uid);
+ if (expuid_num) {
+ free(expuid);
+ }
return IMAP_IOERROR;
}
-
new_exists++;
if (message_index.system_flags & FLAG_ANSWERED) new_answered++;
if (message_index.system_flags & FLAG_FLAGGED) new_flagged++;
if (message_index.system_flags & FLAG_DELETED) new_deleted++;
new_quota += message_index.size;
+ }
+ }
+ if (expuid_num) {
+ free (expuid);
}
if (body) free(body);
@@ -835,14 +1096,26 @@
/* validate uniqueid */
if (!mailbox.uniqueid) {
- char buf[32];
/* this may change uniqueid, but if it does, nothing we can do
about it */
- mailbox_make_uniqueid(mailbox.name, mailbox.uidvalidity, buf,
- sizeof(buf));
- mailbox.uniqueid = xstrdup(buf);
- }
+ mailbox_make_uniqueid(mailbox.name, mailbox.uidvalidity, unique_buf,
+ sizeof(unique_buf));
+ mailbox.uniqueid = xstrdup(unique_buf);
+ } else {
+ if (find_uniqid (mailbox.name, mailbox.uniqueid) != NULL ) {
+
+ mailbox_make_uniqueid(mailbox.name, mailbox.uidvalidity, unique_buf,
+ sizeof(unique_buf));
+ free (mailbox.uniqueid);
+ mailbox.uniqueid = xstrdup(unique_buf);
+ }
+ }
+ if (add_uniqid (mailbox.name, mailbox.uniqueid) == NULL) {
+ syslog (LOG_ERR, "Failed adding mailbox: %s unique id: %s\n",
+ mailbox.name, mailbox.uniqueid );
+ }
+
/* Write header */
r = mailbox_write_header(&mailbox);
@@ -881,6 +1154,10 @@
fclose(newindex);
r = seen_reconstruct(&mailbox, (time_t)0, (time_t)0, (int (*)())0, (void *)0);
+ if (syncflag) {
+ sync_log_mailbox(mailbox.name);
+ }
+
mailbox_close(&mailbox);
if (found) {
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/saslclient.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/saslclient.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/saslclient.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/saslclient.c Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: saslclient.c,v 1.12.2.2 2006/06/27 15:58:42 murch Exp $ */
+/* $Id: saslclient.c,v 1.15 2006/11/30 17:11:20 murch Exp $ */
#include <config.h>
@@ -151,7 +151,7 @@
return NULL;
}
- strcpy(secret->data,password);
+ strcpy((char *) secret->data, password);
secret->len = len;
/* password */
@@ -217,41 +217,45 @@
sprintf(cmdbuf, "%s %s", sasl_cmd->cmd, mech);
prot_printf(pout, "%s", cmdbuf);
- if (clientout) { /* initial response */
- if (!clientoutlen) { /* zero-length initial response */
- prot_printf(pout, " =");
-
- clientout = NULL;
- }
- else if (!sendliteral &&
- ((strlen(cmdbuf) + clientoutlen + 3) > sasl_cmd->maxlen)) {
- /* initial response is too long for auth command,
- so wait for a server challenge before sending it */
- goto noinitresp;
- }
- else { /* full response -- encoded below */
- prot_printf(pout, " ");
- }
+ if (!clientout) goto noinitresp; /* no initial response */
+
+ /* initial response */
+ if (!clientoutlen) { /* zero-length initial response */
+ prot_printf(pout, " =");
+
+ clientout = NULL;
+ }
+ else if (!sendliteral &&
+ ((strlen(cmdbuf) + clientoutlen + 3) > sasl_cmd->maxlen)) {
+ /* initial response is too long for auth command,
+ so wait for a server challenge before sending it */
+ goto noinitresp;
+ }
+ else { /* full response -- encoded below */
+ prot_printf(pout, " ");
}
do {
char *p;
+ base64 = buf;
+ *base64 = '\0';
+
if (clientout) { /* response */
/* convert to base64 */
- base64 = buf;
r = sasl_encode64(clientout, clientoutlen,
base64, BASE64_BUF_SIZE, NULL);
clientout = NULL;
-
- /* send to server */
- if (sendliteral) {
- prot_printf(pout, "{%d+}\r\n", strlen(base64));
- prot_flush(pout);
- }
- prot_printf(pout, "%s", base64);
- }
+ }
+
+ /* send to server */
+ if (sendliteral) {
+ prot_printf(pout, "{%d+}\r\n", strlen(base64));
+ prot_flush(pout);
+ }
+ prot_printf(pout, "%s", base64);
+
noinitresp:
prot_printf(pout, "\r\n");
prot_flush(pout);
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/saslserver.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/saslserver.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/saslserver.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/saslserver.c Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: saslserver.c,v 1.5.2.4 2005/02/21 19:25:45 ken3 Exp $ */
+/* $Id: saslserver.c,v 1.10 2006/11/30 17:11:20 murch Exp $ */
#include <config.h>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/search_engines.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/search_engines.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/search_engines.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/search_engines.c Tue Feb 27 04:17:11 2007
@@ -38,7 +38,7 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: search_engines.c,v 1.5.4.1 2004/04/08 21:13:08 ken3 Exp $
+ * $Id: search_engines.c,v 1.7 2007/02/05 18:41:48 jeaton Exp $
*/
#include <config.h>
@@ -56,6 +56,8 @@
#include "imapd.h"
#include "global.h"
#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
#include "squat.h"
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/seen_bigdb.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/seen_bigdb.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/seen_bigdb.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/seen_bigdb.c Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
/* seen_bigdb.c -- implementation of seen database using one big cyrusdb
- * $Id: seen_bigdb.c,v 1.9.2.1 2003/12/19 18:33:38 ken3 Exp $
+ * $Id: seen_bigdb.c,v 1.11 2006/11/30 17:11:20 murch Exp $
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/seen_db.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/seen_db.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/seen_db.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/seen_db.c Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
/* seen_db.c -- implementation of seen database using per-user berkeley db
- * $Id: seen_db.c,v 1.42.2.5 2004/06/24 15:16:29 ken3 Exp $
+ * $Id: seen_db.c,v 1.51 2007/02/05 18:41:48 jeaton Exp $
*
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
@@ -64,6 +64,8 @@
#include "global.h"
#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
#include "mailbox.h"
#include "imap_err.h"
#include "seen.h"
@@ -605,7 +607,7 @@
&(rockdata->tid));
if(!r && tgtdata) {
/* compare timestamps */
- int version, tmplast, tgtlast;
+ int version, tmplast, tgtlast, tmpuid, tgtuid;
char *p;
const char *tmp = tmpdata, *tgt = tgtdata;
@@ -614,8 +616,8 @@
assert(version == SEEN_VERSION);
/* skip lastread */
strtol(tgt, &p, 10); tgt = p;
- /* skip lastuid */
- strtol(tgt, &p, 10); tgt = p;
+ /* get lastuid */
+ tgtuid = strtol(tgt, &p, 10); tgt = p;
/* get lastchange */
tgtlast = strtol(tgt, &p, 10);
@@ -624,11 +626,12 @@
assert(version == SEEN_VERSION);
/* skip lastread */
strtol(tmp, &p, 10); tmp = p;
- /* skip lastuid */
- strtol(tmp, &p, 10); tmp = p;
+ /* get lastuid */
+ tmpuid = strtol(tmp, &p, 10); tmp = p;
/* get lastchange */
tmplast = strtol(tmp, &p, 10);
+ if(tmpuid > tgtuid) dirty = 1;
if(tmplast > tgtlast) dirty = 1;
} else {
dirty = 1;
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/seen_local.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/seen_local.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/seen_local.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/seen_local.c Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
/* seen_local.c -- Storage for /Recent and /Seen state on local filesystem
- * $Id: seen_local.c,v 1.41.2.2 2005/02/14 06:43:17 shadow Exp $
+ * $Id: seen_local.c,v 1.44 2006/11/30 17:11:20 murch Exp $
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/signals.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/signals.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/signals.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/signals.c Tue Feb 27 04:17:11 2007
@@ -38,7 +38,7 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: signals.c,v 1.11.2.2 2005/02/14 16:27:42 shadow Exp $ */
+/* $Id: signals.c,v 1.14 2006/11/30 17:11:20 murch Exp $ */
#include <config.h>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/signals.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/signals.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/signals.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/signals.h Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
*/
-/* $Id: signals.h,v 1.1.2.1 2004/12/17 18:15:17 ken3 Exp $ */
+/* $Id: signals.h,v 1.2 2006/11/30 17:11:20 murch Exp $ */
#ifndef INCLUDED_SIGNALS_H
#define INCLUDED_SIGNALS_H
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/smmapd.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/smmapd.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/smmapd.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/smmapd.c Tue Feb 27 04:17:11 2007
@@ -72,7 +72,7 @@
* may contain an explanatory message.
*
*
- * $Id: smmapd.c,v 1.1.2.14 2005/07/01 22:13:45 ken3 Exp $
+ * $Id: smmapd.c,v 1.15 2007/02/05 18:41:48 jeaton Exp $
*/
#include <config.h>
@@ -95,6 +95,8 @@
#include "mupdate-client.h"
#include "util.h"
#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
const char *BB;
int forcedowncase;
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/spool.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/spool.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/spool.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/spool.c Tue Feb 27 04:17:11 2007
@@ -40,7 +40,7 @@
*
*/
/*
- * $Id: spool.c,v 1.2.2.7 2006/05/26 16:27:19 murch Exp $
+ * $Id: spool.c,v 1.9 2006/11/30 17:11:20 murch Exp $
*/
#include <config.h>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/spool.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/spool.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/spool.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/spool.h Tue Feb 27 04:17:11 2007
@@ -40,7 +40,7 @@
*
*/
/*
- * $Id: spool.h,v 1.2.2.2 2004/03/24 19:53:11 ken3 Exp $
+ * $Id: spool.h,v 1.5 2006/11/30 17:11:20 murch Exp $
*/
#ifndef INCLUDED_SPOOL_H
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/squat.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/squat.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/squat.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/squat.c Tue Feb 27 04:17:11 2007
@@ -37,7 +37,7 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: squat.c,v 1.6.4.1 2004/02/27 21:17:36 ken3 Exp $
+ * $Id: squat.c,v 1.8 2006/11/30 17:11:20 murch Exp $
*/
/*
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/squat_build.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/squat_build.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/squat_build.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/squat_build.c Tue Feb 27 04:17:11 2007
@@ -37,7 +37,7 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: squat_build.c,v 1.9.4.1 2004/12/15 16:42:50 ken3 Exp $
+ * $Id: squat_build.c,v 1.11 2006/11/30 17:11:20 murch Exp $
*/
/*
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/squatter.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/squatter.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/squatter.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/squatter.c Tue Feb 27 04:17:11 2007
@@ -37,7 +37,7 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: squatter.c,v 1.12.2.5 2006/03/31 19:22:28 murch Exp $
+ * $Id: squatter.c,v 1.17 2007/02/05 18:41:48 jeaton Exp $
*/
/*
@@ -88,6 +88,8 @@
#include "imap_err.h"
#include "mailbox.h"
#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
#include "acl.h"
#include "seen.h"
#include "mboxname.h"
@@ -301,6 +303,22 @@
char uid_validity_buf[30];
char extname[MAX_MAILBOX_NAME+1];
int use_annot = *((int *) rock);
+ int mbtype;
+
+ /* Convert internal name to external */
+ (*squat_namespace.mboxname_toexternal)(&squat_namespace, name,
+ NULL, extname);
+
+ /* Skip remote mailboxes */
+ r = mboxlist_detail(name, &mbtype, NULL, NULL, NULL, NULL, NULL);
+ if (r) {
+ if (verbose) {
+ printf("error opening looking up %s: %s\n",
+ extname, error_message(r));
+ }
+ return 1;
+ }
+ if (mbtype & MBTYPE_REMOTE) return 0;
/* make sure the mailbox (or an ancestor) has
/vendor/cmu/cyrus-imapd/squat set to "true" */
@@ -339,10 +357,6 @@
if (r || !attrib.value || strcasecmp(attrib.value, "true"))
return 0;
}
-
- /* Convert internal name to external */
- (*squat_namespace.mboxname_toexternal)(&squat_namespace, name,
- NULL, extname);
data.mailbox_stats = &stats;
data.mailbox = &m;
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_client.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_client.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_client.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_client.c Tue Feb 27 04:17:11 2007
@@ -41,7 +41,7 @@
* Original version written by David Carter <dpc22 at cam.ac.uk>
* Rewritten and integrated into Cyrus by Ken Murchison <ken at oceana.com>
*
- * $Id: sync_client.c,v 1.1.2.35 2006/06/14 18:03:24 murch Exp $
+ * $Id: sync_client.c,v 1.4 2007/01/09 17:29:30 murch Exp $
*/
#include <config.h>
@@ -121,6 +121,7 @@
static int verbose = 0;
static int verbose_logging = 0;
+static int connect_once = 0;
static int do_meta(char *user);
@@ -629,7 +630,7 @@
}
static int folder_create(char *name, char *part, char *uniqueid, char *acl,
- unsigned long uidvalidity)
+ unsigned long options, unsigned long uidvalidity)
{
prot_printf(toserver, "CREATE ");
sync_printastring(toserver, name);
@@ -639,10 +640,7 @@
sync_printastring(toserver, uniqueid);
prot_printf(toserver, " ");
sync_printastring(toserver, acl);
- prot_printf(toserver, " ");
- prot_printf(toserver, "0");
- prot_printf(toserver, " ");
- prot_printf(toserver, "%lu\r\n", uidvalidity);
+ prot_printf(toserver, " %d %lu %lu\r\n", 0, options, uidvalidity);
prot_flush(toserver);
return(sync_parse_code("CREATE", fromserver, SYNC_PARSE_EAT_OKLINE, NULL));
@@ -1118,8 +1116,8 @@
unsigned long msg_size = 0;
/* Protocol for PARSED items:
- * C: PARSED <msgid> <uid>
- * <internaldate> <sent-date> <last-updated> <flags>
+ * C: PARSED <msgid> <uid>
+ * <internaldate> <sent-date> <last-updated> <modseq> <flags>
* <hdr size> <content_lines>
* <cache literal (includes cache size!)>
* <msg literal (includes msg size!)>
@@ -1127,7 +1125,7 @@
/* Protocol for COPY items:
* C: COPY <msgid> <uid>
- * <internaldate> <sent-date> <last-updated> <flags>
+ * <internaldate> <sent-date> <last-updated> <modseq> <flags>
*/
if (sync_msgid_lookup(msgid_onserver, &record->uuid)) {
@@ -1139,10 +1137,10 @@
need_body = 1;
}
- prot_printf(toserver, " %s %lu %lu %lu %lu (",
+ prot_printf(toserver, " %s %lu %lu %lu %lu " MODSEQ_FMT " (",
message_uuid_text(&record->uuid),
record->uid, record->internaldate,
- record->sentdate, record->last_updated);
+ record->sentdate, record->last_updated, record->modseq);
flags_printed = 0;
@@ -1190,8 +1188,8 @@
(char *)(mailbox->cache_base + record->cache_offset),
cache_size);
- prot_printf(toserver, "{%lu+}\r\n", record->size);
- prot_write(toserver, (char *)msg_base, record->size);
+ prot_printf(toserver, "{%lu+}\r\n", msg_size);
+ prot_write(toserver, (char *)msg_base, msg_size);
mailbox_unmap_message(mailbox, record->uid, &msg_base, &msg_size);
sequence++;
}
@@ -1201,13 +1199,16 @@
static int upload_messages_list(struct mailbox *mailbox,
struct sync_msg_list *list)
{
- unsigned long msgno;
+ unsigned long msgno = 1;
int r = 0;
struct index_record record;
struct sync_msg *msg;
- int count = 0;
+ int count;
int c = ' ';
static struct buf token; /* BSS */
+ int max_count = config_getint(IMAPOPT_SYNC_BATCH_SIZE);
+
+ if (max_count <= 0) max_count = INT_MAX;
if (chdir(mailbox->path)) {
syslog(LOG_ERR, "Couldn't chdir to %s: %s",
@@ -1215,8 +1216,10 @@
return(IMAP_IOERROR);
}
+repeatupload:
+
msg = list->head;
- for (msgno = 1 ; msgno <= mailbox->exists ; msgno++) {
+ for (count = 0; count < max_count && msgno <= mailbox->exists ; msgno++) {
r = mailbox_read_index_record(mailbox, msgno, &record);
if (r) {
@@ -1273,6 +1276,12 @@
msgid_onserver = sync_msgid_list_create(hash_size);
syslog(LOG_INFO, "UPLOAD: received RESTART");
+ }
+
+ /* don't overload the server with too many uploads at once! */
+ if (count >= max_count) {
+ syslog(LOG_INFO, "UPLOAD: hit %d uploads at msgno %d", count, msgno);
+ goto repeatupload;
}
return(0);
@@ -1800,7 +1809,8 @@
goto bail;
if ((r=mboxlist_detail(m.name,NULL,NULL,NULL,&part,NULL,NULL))
- || (r=folder_create(m.name,part,m.uniqueid,m.acl,m.uidvalidity)))
+ || (r=folder_create(m.name,part,m.uniqueid,m.acl,m.options,
+ m.uidvalidity)))
goto bail;
if (!r && m.quota.root && !strcmp(m.name, m.quota.root))
@@ -1821,6 +1831,14 @@
if (!(folder2->acl && !strcmp(m.acl, folder2->acl)))
r = folder_setacl(folder->name, m.acl);
+ if ((folder2->options ^ m.options) & OPT_IMAP_CONDSTORE) {
+ r = folder_setannotation(m.name,
+ "/vendor/cmu/cyrus-imapd/condstore",
+ "",
+ (m.options & OPT_IMAP_CONDSTORE) ?
+ "true" : "false");
+ }
+
if (!r && m.quota.root && !strcmp(m.name, m.quota.root))
r = update_quota_work(&m.quota, &folder2->quota);
@@ -1834,7 +1852,8 @@
/* Need to create fresh folder on server */
if ((r=mboxlist_detail(m.name,NULL,NULL,NULL,&part,NULL,NULL)) ||
- (r=folder_create(m.name,part,m.uniqueid,m.acl,m.uidvalidity)))
+ (r=folder_create(m.name,part,m.uniqueid,m.acl,m.options,
+ m.uidvalidity)))
goto bail;
if (!r && m.quota.root && !strcmp(m.name, m.quota.root))
@@ -1887,6 +1906,7 @@
static struct buf acl;
static struct buf name;
static struct buf lastuid;
+ static struct buf options;
static struct buf arg;
struct quota quota, *quotap;
@@ -1918,7 +1938,10 @@
if ((c = getastring(fromserver, toserver, &acl)) != ' ')
goto parse_err;
- c = getastring(fromserver, toserver, &lastuid);
+ if ((c = getastring(fromserver, toserver, &lastuid)) != ' ')
+ goto parse_err;
+
+ c = getastring(fromserver, toserver, &options);
quotap = NULL;
if (c == ' ') {
@@ -1932,7 +1955,7 @@
if (!imparse_isnumber(lastuid.s)) goto parse_err;
folder = sync_folder_list_add(server_list, id.s, name.s, acl.s,
- quotap);
+ sync_atoul(options.s), quotap);
folder->msglist = sync_msg_list_create(NULL, sync_atoul(lastuid.s));
break;
case 1:
@@ -2021,7 +2044,7 @@
{
struct sync_folder_list *list = (struct sync_folder_list *) rock;
- sync_folder_list_add(list, NULL, name, NULL, NULL);
+ sync_folder_list_add(list, NULL, name, NULL, 0, NULL);
return(0);
}
@@ -2032,7 +2055,7 @@
{
struct sync_folder_list *list = (struct sync_folder_list *) rock;
- sync_folder_list_add(list, name, name, NULL, NULL);
+ sync_folder_list_add(list, name, name, NULL, 0, NULL);
return(0);
}
@@ -2310,6 +2333,7 @@
static struct buf flag;
static struct buf acl;
static struct buf lastuid;
+ static struct buf options;
static struct buf arg;
struct sync_folder *folder = NULL;
struct sync_msg *msg = NULL;
@@ -2346,7 +2370,7 @@
c = getastring(fromserver, toserver, &name);
if (c == '\r') c = prot_getc(fromserver);
if (c != '\n') goto parse_err;
- sync_folder_list_add(server_sub_list, name.s, name.s, NULL, NULL);
+ sync_folder_list_add(server_sub_list, name.s, name.s, NULL, 0, NULL);
break;
case 2:
/* New folder */
@@ -2359,7 +2383,10 @@
if ((c = getastring(fromserver, toserver, &acl)) != ' ')
goto parse_err;
- c = getastring(fromserver, toserver, &lastuid);
+ if ((c = getastring(fromserver, toserver, &lastuid)) != ' ')
+ goto parse_err;
+
+ c = getastring(fromserver, toserver, &options);
quotap = NULL;
if (c == ' ') {
@@ -2373,7 +2400,7 @@
if (!imparse_isnumber(lastuid.s)) goto parse_err;
folder = sync_folder_list_add(server_list, id.s, name.s, acl.s,
- quotap);
+ sync_atoul(options.s), quotap);
folder->msglist = sync_msg_list_create(NULL, sync_atoul(lastuid.s));
break;
case 1:
@@ -2558,7 +2585,7 @@
r = IMAP_PROTOCOL_ERROR;
break;
}
- sync_folder_list_add(server_list, name.s, name.s, NULL, NULL);
+ sync_folder_list_add(server_list, name.s, name.s, NULL, 0, NULL);
r = sync_parse_code("LSUB", fromserver,
SYNC_PARSE_EAT_OKLINE, &unsolicited);
@@ -2967,7 +2994,7 @@
if (!action->active)
continue;
- sync_folder_list_add(folder_list, NULL, action->name, NULL, NULL);
+ sync_folder_list_add(folder_list, NULL, action->name, NULL, 0, NULL);
}
if (folder_list->count) {
@@ -3150,12 +3177,18 @@
be = backend_connect(be, servername, &protocol[PROTOCOL_CSYNC],
"", cb, NULL);
- if (be || wait > 1000) break;
+ if (be || connect_once || wait > 1000) break;
fprintf(stderr,
"Can not connect to server '%s', retrying in %d seconds\n",
servername, wait);
sleep(wait);
+ }
+
+ if (!be) {
+ fprintf(stderr, "Can not connect to server '%s'\n",
+ servername);
+ _exit(1);
}
return be;
@@ -3264,10 +3297,14 @@
setbuf(stdout, NULL);
- while ((opt = getopt(argc, argv, "C:vlS:F:f:w:t:d:rums")) != EOF) {
+ while ((opt = getopt(argc, argv, "C:vlS:F:f:w:t:d:rumso")) != EOF) {
switch (opt) {
case 'C': /* alt config file */
alt_config = optarg;
+ break;
+
+ case 'o': /* only try to connect once */
+ connect_once = 1;
break;
case 'v': /* verbose */
@@ -3467,12 +3504,12 @@
if (!sync_folder_lookup_byname(folder_list, argv[i]))
sync_folder_list_add(folder_list,
- NULL, argv[i], NULL, NULL);
+ NULL, argv[i], NULL, 0, NULL);
}
fclose(file);
} else for (i = optind; i < argc; i++) {
if (!sync_folder_lookup_byname(folder_list, argv[i]))
- sync_folder_list_add(folder_list, NULL, argv[i], NULL, NULL);
+ sync_folder_list_add(folder_list, NULL, argv[i], NULL, 0, NULL);
}
if ((r = send_lock())) {
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_commit.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_commit.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_commit.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_commit.c Tue Feb 27 04:17:11 2007
@@ -41,7 +41,7 @@
* Original version written by David Carter <dpc22 at cam.ac.uk>
* Rewritten and integrated into Cyrus by Ken Murchison <ken at oceana.com>
*
- * $Id: sync_commit.c,v 1.1.2.10 2006/06/13 17:24:40 murch Exp $
+ * $Id: sync_commit.c,v 1.2 2006/11/30 17:11:20 murch Exp $
*/
#include <config.h>
@@ -108,6 +108,7 @@
struct index_record record;
int n, r = 0, rc;
struct txn *tid = NULL;
+ modseq_t highestmodseq = 0;
if (upload_list->count == 0) return(0); /* NOOP */
@@ -233,6 +234,17 @@
= htonl(message->cache_version);
message_uuid_pack(&item->uuid, buf+OFFSET_MESSAGE_UUID);
+
+#ifdef HAVE_LONG_LONG_INT
+ *((bit64 *)(buf+OFFSET_MODSEQ_64)) = htonll(item->modseq);
+#else
+ /* zero the unused 32bits */
+ *((bit32 *)(buf+OFFSET_MODSEQ_64)) = htonl(0);
+ *((bit32 *)(buf+OFFSET_MODSEQ)) = htonl(item->modseq);
+#endif
+
+ if (item->modseq > highestmodseq) highestmodseq = item->modseq;
+
quota_add += message->msg_size;
if (item->flags.system_flags & FLAG_ANSWERED) numansweredflag++;
@@ -296,6 +308,18 @@
/* Fix up last_append time */
*((bit32 *)(buf+OFFSET_LAST_APPENDDATE)) = htonl(last_appenddate);
+
+ /* Fix up highest modseq */
+#ifdef HAVE_LONG_LONG_INT
+ if (highestmodseq > *((bit64 *)(buf+OFFSET_HIGHESTMODSEQ_64))) {
+ *((bit64 *)(buf+OFFSET_HIGHESTMODSEQ_64)) = htonll(highestmodseq);
+ }
+#else
+ if (highestmodseq > *((bit32 *)(buf+OFFSET_HIGHESTMODSEQ))) {
+ *((bit32 *)(buf+OFFSET_HIGHESTMODSEQ_64)) = htonl(0);
+ *((bit32 *)(buf+OFFSET_HIGHESTMODSEQ)) = htonl(highestmodseq);
+ }
+#endif
rewind(newindex);
fwrite(buf, 1, mailbox->start_offset, newindex);
@@ -451,6 +475,7 @@
char target[MAX_MAILBOX_PATH];
int n, r = 0;
struct txn *tid = NULL;
+ modseq_t highestmodseq = 0;
if (upload_list->count == 0) return(0); /* NOOP */
@@ -493,6 +518,16 @@
= htonl(message->cache_version);
message_uuid_pack(&item->uuid, record+OFFSET_MESSAGE_UUID);
+#ifdef HAVE_LONG_LONG_INT
+ *((bit64 *)(record+OFFSET_MODSEQ_64)) = htonll(item->modseq);
+#else
+ /* zero the unused 32bits */
+ *((bit32 *)(record+OFFSET_MODSEQ_64)) = htonl(0);
+ *((bit32 *)(record+OFFSET_MODSEQ)) = htonl(item->modseq);
+#endif
+
+ if (item->modseq > highestmodseq) highestmodseq = item->modseq;
+
cache_size += message->cache_size;
quota_add += message->msg_size;
@@ -579,6 +614,18 @@
/* Fix up last_append time */
*((bit32 *)(hbuf+OFFSET_LAST_APPENDDATE)) = htonl(last_appenddate);
+ /* Fix up highest modseq */
+#ifdef HAVE_LONG_LONG_INT
+ if (highestmodseq > ntohll(*((bit64 *)(hbuf+OFFSET_HIGHESTMODSEQ_64)))) {
+ *((bit64 *)(hbuf+OFFSET_HIGHESTMODSEQ_64)) = htonll(highestmodseq);
+ }
+#else
+ if (highestmodseq > ntohl(*((bit32 *)(hbuf+OFFSET_HIGHESTMODSEQ)))) {
+ *((bit32 *)(hbuf+OFFSET_HIGHESTMODSEQ_64)) = htonl(0);
+ *((bit32 *)(hbuf+OFFSET_HIGHESTMODSEQ)) = htonl(highestmodseq);
+ }
+#endif
+
/* And write it back out */
lseek(mailbox->index_fd, 0L, SEEK_SET);
@@ -820,7 +867,7 @@
int
sync_create_commit(char *name, char *partition, char *uniqueid, char *acl,
- int mbtype, unsigned long uidvalidity,
+ int mbtype, unsigned long options, unsigned long uidvalidity,
int isadmin, char *userid, struct auth_state *auth_state)
{
int r;
@@ -847,7 +894,7 @@
r = mboxlist_createmailboxcheck(name, 0, partition, 1,
imapd_userid, imapd_authstate,
- NULL, &newpartition);
+ NULL, &newpartition, 1);
if (r) goto done;
mboxent = mboxlist_makeentry(mbtype | MBTYPE_RESERVE, newpartition, acl);
@@ -904,13 +951,16 @@
if (mboxent) free(mboxent);
if (newpartition) free(newpartition);
- /* Fix UIDvalidity */
+ /* Fix options and UIDvalidity */
if (!r) r = mailbox_open_header(name, 0, &m);
if (!r) mboxopen = 1;
if (!r) r = mailbox_lock_header(&m);
if (!r) r = mailbox_open_index(&m);
if (!r) r = mailbox_lock_index(&m);
- if (!r) m.uidvalidity = uidvalidity;
+ if (!r) {
+ m.options = options;
+ m.uidvalidity = uidvalidity;
+ }
if (!r) mailbox_write_index_header(&m);
if (mboxopen) mailbox_close(&m);
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_commit.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_commit.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_commit.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_commit.h Tue Feb 27 04:17:11 2007
@@ -41,7 +41,7 @@
* Original version written by David Carter <dpc22 at cam.ac.uk>
* Rewritten and integrated into Cyrus by Ken Murchison <ken at oceana.com>
*
- * $Id: sync_commit.h,v 1.1.2.2 2005/05/17 18:29:46 ken3 Exp $
+ * $Id: sync_commit.h,v 1.2 2006/11/30 17:11:20 murch Exp $
*/
#ifndef INCLUDED_SYNC_COMMIT_H
@@ -58,7 +58,7 @@
struct sync_flag_list *flag_list);
int sync_create_commit(char *name, char *partition, char *uniqueid, char *acl,
- int mbtype, unsigned long uidvalidity,
+ int mbtype, unsigned long options, unsigned long uidvalidity,
int isadmin, char *userid, struct auth_state *auth_state);
#endif /* INCLUDED_SYNC_COMMIT_H */
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_log.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_log.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_log.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_log.c Tue Feb 27 04:17:11 2007
@@ -41,7 +41,7 @@
* Original version written by David Carter <dpc22 at cam.ac.uk>
* Rewritten and integrated into Cyrus by Ken Murchison <ken at oceana.com>
*
- * $Id: sync_log.c,v 1.1.2.7 2005/05/12 19:56:17 ken3 Exp $
+ * $Id: sync_log.c,v 1.3 2007/02/05 18:41:48 jeaton Exp $
*/
/* YYY Need better quoting for obscure filenames: use literals? */
@@ -58,6 +58,7 @@
#endif
#include <stdlib.h>
#include <stdio.h>
+#include <string.h>
#include <syslog.h>
#include <errno.h>
@@ -66,6 +67,10 @@
#include "lock.h"
#include "mailbox.h"
#include "retry.h"
+#include "util.h"
+#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
static int sync_log_enabled = 0;
static char sync_log_file[MAX_MAILBOX_PATH+1];
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_log.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_log.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_log.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_log.h Tue Feb 27 04:17:11 2007
@@ -41,7 +41,7 @@
* Original version written by David Carter <dpc22 at cam.ac.uk>
* Rewritten and integrated into Cyrus by Ken Murchison <ken at oceana.com>
*
- * $Id: sync_log.h,v 1.1.2.6 2006/06/14 14:16:12 murch Exp $
+ * $Id: sync_log.h,v 1.2 2006/11/30 17:11:20 murch Exp $
*/
#ifndef INCLUDED_SYNC_LOG_H
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_reset.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_reset.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_reset.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_reset.c Tue Feb 27 04:17:11 2007
@@ -41,7 +41,7 @@
* Original version written by David Carter <dpc22 at cam.ac.uk>
* Rewritten and integrated into Cyrus by Ken Murchison <ken at oceana.com>
*
- * $Id: sync_reset.c,v 1.1.2.4 2005/12/13 15:31:10 murch Exp $
+ * $Id: sync_reset.c,v 1.2 2006/11/30 17:11:20 murch Exp $
*/
#include <config.h>
@@ -124,6 +124,10 @@
if (sync_authstate) auth_freestate(sync_authstate);
seen_done();
+
+ quotadb_close();
+ quotadb_done();
+
mboxlist_close();
mboxlist_done();
exit(code);
@@ -179,7 +183,7 @@
/* List all mailboxes, including directories and deleted items */
- sync_folder_list_add(list, name, name, NULL, NULL);
+ sync_folder_list_add(list, name, name, NULL, 0, NULL);
return(0);
}
@@ -191,7 +195,7 @@
{
struct sync_folder_list *list = (struct sync_folder_list *) rock;
- sync_folder_list_add(list, name, name, NULL, NULL);
+ sync_folder_list_add(list, name, name, NULL, 0, NULL);
return(0);
}
@@ -351,9 +355,13 @@
fatal(error_message(r), EC_CONFIG);
}
- /* open the mboxlist, we'll need it for real work */
+ /* open the mboxlist and quotadb, we'll need them for real work */
mboxlist_init(0);
mboxlist_open(NULL);
+
+ quotadb_init(0);
+ quotadb_open(NULL);
+
mailbox_initialize();
signals_set_shutdown(&shut_down);
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_server.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_server.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_server.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_server.c Tue Feb 27 04:17:11 2007
@@ -41,7 +41,7 @@
* Original version written by David Carter <dpc22 at cam.ac.uk>
* Rewritten and integrated into Cyrus by Ken Murchison <ken at oceana.com>
*
- * $Id: sync_server.c,v 1.1.2.23 2006/06/12 18:56:42 murch Exp $
+ * $Id: sync_server.c,v 1.2 2006/11/30 17:11:20 murch Exp $
*/
#include <config.h>
@@ -169,7 +169,8 @@
static void cmd_user(char *userid);
static void cmd_create(char *mailboxname, char *partition,
char *uniqueid, char *acl,
- int mbtype, unsigned long uidvalidity);
+ int mbtype, unsigned long options,
+ unsigned long uidvalidity);
static void cmd_delete(char *name);
static void cmd_rename(char *oldmailboxname, char *newmailboxname);
static void cmd_lsub(char *user);
@@ -568,7 +569,7 @@
struct mailbox *mailbox = NULL;
struct sync_lock sync_lock;
static struct buf cmd;
- static struct buf arg1, arg2, arg3, arg4, arg5, arg6;
+ static struct buf arg1, arg2, arg3, arg4, arg5, arg6, arg7;
int c;
char *p;
@@ -672,14 +673,18 @@
c = getastring(sync_in, sync_out, &arg5);
if (c != ' ') goto missingargs;
c = getastring(sync_in, sync_out, &arg6);
- if (c == '\r') c = prot_getc(sync_in);
- if (c != '\n') goto extraargs;
-
- if (!imparse_isnumber(arg5.s) || !imparse_isnumber(arg6.s))
+ if (c != ' ') goto missingargs;
+ c = getastring(sync_in, sync_out, &arg7);
+ if (c == '\r') c = prot_getc(sync_in);
+ if (c != '\n') goto extraargs;
+
+ if (!imparse_isnumber(arg5.s) || !imparse_isnumber(arg6.s) ||
+ !imparse_isnumber(arg7.s))
goto invalidargs;
cmd_create(arg1.s, arg2.s, arg3.s, arg4.s,
- atoi(arg5.s), sync_atoul(arg6.s));
+ atoi(arg5.s), sync_atoul(arg6.s),
+ sync_atoul(arg7.s));
continue;
}
break;
@@ -1526,7 +1531,7 @@
/* List all mailboxes, including directories and deleted items */
- sync_folder_list_add(list, name, name, NULL, NULL);
+ sync_folder_list_add(list, name, name, NULL, 0, NULL);
return(0);
}
@@ -1537,7 +1542,7 @@
{
struct sync_folder_list *list = (struct sync_folder_list *) rock;
- sync_folder_list_add(list, name, name, NULL, NULL);
+ sync_folder_list_add(list, name, name, NULL, 0, NULL);
return(0);
}
@@ -1838,6 +1843,17 @@
goto parse_err;
}
+ /* Parse modseq */
+ if ((c = getastring(sync_in, sync_out, &arg)) != ' ') {
+ err = "Invalid modseq";
+ goto parse_err;
+ }
+#ifdef HAVE_LONG_LONG_INT
+ item->modseq = sync_atoull(arg.s);
+#else
+ item->modseq = sync_atoul(arg.s);
+#endif
+
/* Parse Flags */
c = sync_getflags(sync_in, &item->flags, &upload_list->meta);
@@ -2281,6 +2297,7 @@
prot_printf(sync_out, " ");
sync_printastring(sync_out, m.acl);
prot_printf(sync_out, " %lu", m.last_uid);
+ prot_printf(sync_out, " %lu", m.options);
if (m.quota.root && !strcmp(name, m.quota.root) &&
!quota_read(&m.quota, NULL, 0)) {
prot_printf(sync_out, " %d", m.quota.limit);
@@ -2465,7 +2482,8 @@
static void cmd_create(char *mailboxname, char *partition,
char *uniqueid, char *acl,
- int mbtype, unsigned long uidvalidity)
+ int mbtype, unsigned long options,
+ unsigned long uidvalidity)
{
int r;
char buf[MAX_MAILBOX_PATH+1];
@@ -2492,7 +2510,7 @@
}
r = sync_create_commit(mailboxname, partition,
- uniqueid, acl, mbtype, uidvalidity,
+ uniqueid, acl, mbtype, options, uidvalidity,
1, sync_userid, sync_authstate);
if (r)
@@ -2522,7 +2540,7 @@
int r;
r = mboxlist_renamemailbox(oldmailboxname, newmailboxname, NULL,
- 1,sync_userid, sync_authstate);
+ 1, sync_userid, sync_authstate, 1);
if (r)
prot_printf(sync_out, "NO Rename failed %s -> %s: %s\r\n",
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_support.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_support.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_support.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_support.c Tue Feb 27 04:17:11 2007
@@ -41,7 +41,7 @@
* Original version written by David Carter <dpc22 at cam.ac.uk>
* Rewritten and integrated into Cyrus by Ken Murchison <ken at oceana.com>
*
- * $Id: sync_support.c,v 1.1.2.19 2006/06/14 18:03:24 murch Exp $
+ * $Id: sync_support.c,v 1.2 2006/11/30 17:11:20 murch Exp $
*/
#include <config.h>
@@ -559,6 +559,7 @@
struct sync_folder *sync_folder_list_add(struct sync_folder_list *l,
char *id, char *name, char *acl,
+ unsigned long options,
struct quota *quota)
{
struct sync_folder *result = xzmalloc(sizeof(struct sync_folder));
@@ -575,6 +576,7 @@
result->id = (id) ? xstrdup(id) : NULL;
result->name = (name) ? xstrdup(name) : NULL;
result->acl = (acl) ? xstrdup(acl) : NULL;
+ result->options = options;
if (quota) {
result->quota.root = result->name;
result->quota.limit = quota->limit;
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_support.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_support.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_support.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/sync_support.h Tue Feb 27 04:17:11 2007
@@ -41,7 +41,7 @@
* Original version written by David Carter <dpc22 at cam.ac.uk>
* Rewritten and integrated into Cyrus by Ken Murchison <ken at oceana.com>
*
- * $Id: sync_support.h,v 1.1.2.9 2005/06/16 00:02:10 ken3 Exp $
+ * $Id: sync_support.h,v 1.2 2006/11/30 17:11:20 murch Exp $
*/
#ifndef INCLUDED_SYNC_SUPPORT_H
@@ -54,6 +54,7 @@
#define SYNC_MESSAGE_LIST_MAX_OPEN_FILES (64)
#define sync_atoul(s) strtoul(s, NULL, 10)
+#define sync_atoull(s) strtoull(s, NULL, 10)
int sync_eatlines_unsolicited(struct protstream *pin, int c);
@@ -156,6 +157,7 @@
char *id;
char *name;
char *acl;
+ unsigned options;
struct quota quota;
int mark;
int reserve; /* Folder has been processed by reserve operation */
@@ -171,6 +173,7 @@
struct sync_folder *sync_folder_list_add(struct sync_folder_list *l,
char *id, char *name, char *acl,
+ unsigned long options,
struct quota *quota);
struct sync_folder *sync_folder_lookup(struct sync_folder_list *l, char *id);
@@ -323,6 +326,7 @@
time_t last_updated;
struct sync_flags flags;
struct message_uuid uuid;
+ modseq_t modseq;
struct sync_message *message;
};
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/syncnews.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/syncnews.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/syncnews.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/syncnews.c Tue Feb 27 04:17:11 2007
@@ -42,7 +42,7 @@
*/
/*
- * $Id: syncnews.c,v 1.24.2.2 2004/05/25 01:28:13 ken3 Exp $
+ * $Id: syncnews.c,v 1.27 2006/11/30 17:11:20 murch Exp $
*/
#include <config.h>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/tls.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/tls.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/tls.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/tls.c Tue Feb 27 04:17:11 2007
@@ -93,7 +93,7 @@
*
*/
-/* $Id: tls.c,v 1.47.2.3 2005/10/28 14:51:18 ken3 Exp $ */
+/* $Id: tls.c,v 1.53 2007/02/05 18:49:56 jeaton Exp $ */
#include <config.h>
@@ -119,6 +119,8 @@
/* Application-specific. */
#include "assert.h"
#include "xmalloc.h"
+#include "xstrlcat.h"
+#include "xstrlcpy.h"
#include "tls.h"
/* Session caching/reuse stuff */
@@ -226,7 +228,7 @@
int err;
int depth;
- syslog(LOG_ERR,"Doing a peer verify");
+ syslog(LOG_DEBUG, "Doing a peer verify");
err_cert = X509_STORE_CTX_get_current_cert(ctx);
err = X509_STORE_CTX_get_error(ctx);
@@ -419,9 +421,9 @@
if (data && len) {
/* store the session in our database */
do {
- ret = DB->store(sessdb, sess->session_id,
+ ret = DB->store(sessdb, (const char *) sess->session_id,
sess->session_id_length,
- data, len + sizeof(time_t), NULL);
+ (const char *) data, len + sizeof(time_t), NULL);
} while (ret == CYRUSDB_AGAIN);
}
@@ -454,7 +456,7 @@
if (!sess_dbopen) return;
do {
- ret = DB->delete(sessdb, id, idlen, NULL, 1);
+ ret = DB->delete(sessdb, (const char *) id, idlen, NULL, 1);
} while (ret == CYRUSDB_AGAIN);
/* log this transaction */
@@ -495,7 +497,6 @@
{
int ret;
const char *data = NULL;
- unsigned char *asn;
int len = 0;
time_t expire = 0, now = time(0);
SSL_SESSION *sess = NULL;
@@ -506,7 +507,7 @@
if (!sess_dbopen) return NULL;
do {
- ret = DB->fetch(sessdb, id, idlen, &data, &len, NULL);
+ ret = DB->fetch(sessdb, (const char *) id, idlen, &data, &len, NULL);
} while (ret == CYRUSDB_AGAIN);
if (!ret && data) {
@@ -522,7 +523,7 @@
else {
/* transform the ASN1 representation of the session
into an SSL_SESSION object */
- asn = (unsigned char*) data + sizeof(time_t);
+ const unsigned char *asn = (unsigned char *) data + sizeof(time_t);
sess = d2i_SSL_SESSION(NULL, &asn, len - sizeof(time_t));
if (!sess) syslog(LOG_ERR, "d2i_SSL_SESSION failed: %m");
}
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/tls_prune.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/tls_prune.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/tls_prune.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/tls_prune.c Tue Feb 27 04:17:11 2007
@@ -40,7 +40,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: tls_prune.c,v 1.5.2.1 2004/01/27 23:13:51 ken3 Exp $ */
+/* $Id: tls_prune.c,v 1.7 2006/11/30 17:11:20 murch Exp $ */
#include <config.h>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/unexpunge.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/unexpunge.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/unexpunge.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/unexpunge.c Tue Feb 27 04:17:11 2007
@@ -38,7 +38,7 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: unexpunge.c,v 1.1.2.5 2006/03/31 19:22:28 murch Exp $
+ * $Id: unexpunge.c,v 1.4 2007/02/07 14:27:52 murch Exp $
*/
#include <config.h>
@@ -65,13 +65,20 @@
#include "imap_err.h"
#include "index.h"
#include "libcyr_cfg.h"
+#include "lock.h"
+#include "map.h"
#include "mailbox.h"
#include "mboxlist.h"
#include "util.h"
#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
/* global state */
const int config_need_data = 0;
+
+/* current namespace */
+static struct namespace unex_namespace;
int verbose = 0;
@@ -415,6 +422,7 @@
extern char *optarg;
int opt, r = 0;
char *alt_config = NULL;
+ char buf[MAX_MAILBOX_PATH+1];
struct mailbox mailbox;
int doclose = 0, mode = MODE_UNKNOWN, unsetdeleted = 0;
char expunge_fname[MAX_MAILBOX_PATH+1];
@@ -473,8 +481,18 @@
quotadb_init(0);
quotadb_open(NULL);
+ /* Set namespace -- force standard (internal) */
+ if ((r = mboxname_init_namespace(&unex_namespace, 1)) != 0) {
+ syslog(LOG_ERR, error_message(r));
+ fatal(error_message(r), EC_CONFIG);
+ }
+
+ /* Translate mailboxname */
+ (*unex_namespace.mboxname_tointernal)(&unex_namespace, argv[optind],
+ NULL, buf);
+
/* Open/lock header */
- r = mailbox_open_header(argv[optind++], 0, &mailbox);
+ r = mailbox_open_header(buf, 0, &mailbox);
if (!r && mailbox.header_fd != -1) {
doclose = 1;
(void) mailbox_lock_header(&mailbox);
@@ -534,7 +552,7 @@
if (mode == MODE_UID) {
int i;
- nuids = argc - optind;
+ nuids = argc - ++optind;
uids = (unsigned long *) xmalloc(nuids * sizeof(unsigned long));
for (i = 0; i < nuids; i++)
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/user.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/user.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/user.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/user.c Tue Feb 27 04:17:11 2007
@@ -40,7 +40,7 @@
*
*/
/*
- * $Id: user.c,v 1.17.2.5 2005/11/17 15:46:28 murch Exp $
+ * $Id: user.c,v 1.21 2006/11/30 17:11:20 murch Exp $
*/
#include <config.h>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/version.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/version.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/version.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/version.c Tue Feb 27 04:17:11 2007
@@ -37,7 +37,7 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: version.c,v 1.14.2.5 2005/02/16 21:06:19 shadow Exp $
+ * $Id: version.c,v 1.21 2007/02/07 18:58:07 murch Exp $
*/
#include <config.h>
@@ -99,7 +99,7 @@
"\"name\" \"Cyrus IMAPD\""
" \"version\" \"%s %s\""
" \"vendor\" \"Project Cyrus\""
- " \"support-url\" \"http://asg.web.cmu.edu/cyrus\"",
+ " \"support-url\" \"http://cyrusimap.web.cmu.edu\"",
CYRUS_VERSION, CYRUS_CVSDATE);
/* add the os info */
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/version.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/version.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/version.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imap/version.h Tue Feb 27 04:17:11 2007
@@ -37,10 +37,10 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: version.h,v 1.128.2.17 2006/07/10 13:46:20 murch Exp $
+ * $Id: version.h,v 1.144 2007/02/06 18:07:42 murch Exp $
*/
-#define _CYRUS_VERSION "v2.3.7"
+#define _CYRUS_VERSION "v2.3.8"
/* EXTRA_IDENT is a hack to add some version information for which compile
* was used to build this version (at CMU, but we don't care what you do with
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imtest/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imtest/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imtest/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imtest/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,4 +1,4 @@
-/.cvsignore/1.3/Wed Oct 22 18:03:01 2003//Tcyrus-release-2-3-7
-/Makefile.in/1.25.2.5/Mon Feb 21 19:25:50 2005//Tcyrus-release-2-3-7
-/imtest.c/1.93.2.15/Thu May 25 15:21:49 2006//Tcyrus-release-2-3-7
+/.cvsignore/1.3/Wed Oct 22 18:03:01 2003//
+/Makefile.in/1.31/Thu Nov 30 17:11:22 2006//
+/imtest.c/1.110/Thu Nov 30 17:11:22 2006//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imtest/Makefile.in
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imtest/Makefile.in?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imtest/Makefile.in (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imtest/Makefile.in Tue Feb 27 04:17:11 2007
@@ -40,7 +40,7 @@
# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#
-# $Id: Makefile.in,v 1.25.2.5 2005/02/21 19:25:50 ken3 Exp $
+# $Id: Makefile.in,v 1.31 2006/11/30 17:11:22 murch Exp $
srcdir = @srcdir@
top_srcdir = @top_srcdir@
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/imtest/imtest.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/imtest/imtest.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/imtest/imtest.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/imtest/imtest.c Tue Feb 27 04:17:11 2007
@@ -1,7 +1,7 @@
/* imtest.c -- IMAP/POP3/NNTP/LMTP/SMTP/MUPDATE/MANAGESIEVE test client
* Ken Murchison (multi-protocol implementation)
* Tim Martin (SASL implementation)
- * $Id: imtest.c,v 1.93.2.15 2006/05/25 15:21:49 murch Exp $
+ * $Id: imtest.c,v 1.110 2006/11/30 17:11:22 murch Exp $
*
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
@@ -1083,7 +1083,8 @@
/* send to server */
if (sendliteral) {
- printf("{%d+}\r\n", inbase64len);
+ printf("%s{%d+}\r\n",
+ initial_response ? "" : "C: ", inbase64len);
prot_printf(pout, "{%d+}\r\n", inbase64len);
prot_flush(pout);
}
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/installsieve/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/installsieve/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/installsieve/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/installsieve/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,13 +1,13 @@
-/Makefile.in/1.13/Wed Oct 22 18:50:11 2003//Tcyrus-release-2-3-7
-/codes.h/1.4/Thu Feb 13 20:15:37 2003//Tcyrus-release-2-3-7
-/exitcodes.h/1.4/Thu Feb 13 20:15:37 2003//Tcyrus-release-2-3-7
-/installscript.c/1.29/Thu Feb 13 20:15:37 2003//Tcyrus-release-2-3-7
-/isieve.c/1.5/Thu Feb 13 20:15:37 2003//Tcyrus-release-2-3-7
-/isieve.h/1.5/Thu Feb 13 20:15:37 2003//Tcyrus-release-2-3-7
-/lex.c/1.11/Thu Feb 13 20:15:37 2003//Tcyrus-release-2-3-7
-/lex.h/1.8/Thu Feb 13 20:15:37 2003//Tcyrus-release-2-3-7
-/mystring.c/1.6/Thu Feb 13 20:15:37 2003//Tcyrus-release-2-3-7
-/mystring.h/1.6/Thu Feb 13 20:15:37 2003//Tcyrus-release-2-3-7
-/request.c/1.19/Thu Feb 13 20:15:37 2003//Tcyrus-release-2-3-7
-/request.h/1.13/Thu Feb 13 20:15:37 2003//Tcyrus-release-2-3-7
+/Makefile.in/1.13/Wed Oct 22 18:50:11 2003//
+/codes.h/1.4/Thu Feb 13 20:15:37 2003//
+/exitcodes.h/1.4/Thu Feb 13 20:15:37 2003//
+/installscript.c/1.29/Thu Feb 13 20:15:37 2003//
+/isieve.c/1.5/Thu Feb 13 20:15:37 2003//
+/isieve.h/1.5/Thu Feb 13 20:15:37 2003//
+/lex.c/1.11/Thu Feb 13 20:15:37 2003//
+/lex.h/1.8/Thu Feb 13 20:15:37 2003//
+/mystring.c/1.6/Thu Feb 13 20:15:37 2003//
+/mystring.h/1.6/Thu Feb 13 20:15:37 2003//
+/request.c/1.19/Thu Feb 13 20:15:37 2003//
+/request.h/1.13/Thu Feb 13 20:15:37 2003//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,104 +1,104 @@
-/.cvsignore/1.2/Wed Oct 22 18:03:03 2003//Tcyrus-release-2-3-7
-/Makefile.dist/1.2/Wed Oct 22 18:03:03 2003//Tcyrus-release-2-3-7
-/Makefile.in/1.55.2.9/Fri Mar 17 17:29:40 2006//Tcyrus-release-2-3-7
-/acl.c/1.10.4.1/Tue Dec 13 19:36:10 2005//Tcyrus-release-2-3-7
-/acl.h/1.14.4.2/Thu May 18 18:04:52 2006//Tcyrus-release-2-3-7
-/acl_afs.c/1.22.4.3/Thu Apr 13 18:33:22 2006//Tcyrus-release-2-3-7
-/assert.c/1.18/Wed Oct 22 18:50:12 2003//Tcyrus-release-2-3-7
-/assert.h/1.10/Thu Feb 13 20:15:38 2003//Tcyrus-release-2-3-7
-/auth.c/1.1.2.1/Wed Feb 16 21:06:50 2005//Tcyrus-release-2-3-7
-/auth.h/1.15.2.1/Wed Feb 16 21:06:50 2005//Tcyrus-release-2-3-7
-/auth_krb.c/1.39.2.3/Wed Dec 14 13:52:09 2005//Tcyrus-release-2-3-7
-/auth_krb5.c/1.2.2.2/Wed Feb 16 21:06:50 2005//Tcyrus-release-2-3-7
-/auth_pts.c/1.2.2.7/Fri Mar 17 16:05:15 2006//Tcyrus-release-2-3-7
-/auth_pts.h/1.2.2.1/Tue Dec 13 13:35:06 2005//Tcyrus-release-2-3-7
-/auth_unix.c/1.37.2.2/Wed Feb 16 21:06:50 2005//Tcyrus-release-2-3-7
-/bsearch.c/1.19/Thu Feb 13 20:15:39 2003//Tcyrus-release-2-3-7
-/bsearch.h/1.7/Thu Feb 13 20:15:39 2003//Tcyrus-release-2-3-7
-/byteorder64.c/1.1.2.1/Mon Aug 9 18:51:21 2004//Tcyrus-release-2-3-7
-/byteorder64.h/1.1.2.2/Mon Aug 16 11:44:34 2004//Tcyrus-release-2-3-7
-/charset.c/1.44.2.3/Wed Jun 14 11:53:36 2006//Tcyrus-release-2-3-7
-/charset.h/1.19.2.1/Thu Mar 9 22:39:38 2006//Tcyrus-release-2-3-7
-/chartable.h/1.5/Thu Feb 13 20:15:39 2003//Tcyrus-release-2-3-7
-/cyrusdb.c/1.5.2.8/Wed Jan 4 02:14:14 2006//Tcyrus-release-2-3-7
-/cyrusdb.h/1.25.2.4/Wed Jan 4 02:14:14 2006//Tcyrus-release-2-3-7
-/cyrusdb_berkeley.c/1.2.2.12/Tue Feb 28 12:58:07 2006//Tcyrus-release-2-3-7
-/cyrusdb_flat.c/1.31.2.3/Wed Mar 24 19:53:14 2004//Tcyrus-release-2-3-7
-/cyrusdb_quotalegacy.c/1.1.2.9/Wed Apr 20 18:47:48 2005//Tcyrus-release-2-3-7
-/cyrusdb_skiplist.c/1.42.2.3/Wed Jun 9 19:42:47 2004//Tcyrus-release-2-3-7
-/exitcodes.h/1.5/Thu Feb 13 20:15:39 2003//Tcyrus-release-2-3-7
-/ftruncate.c/1.8/Thu Feb 13 20:15:39 2003//Tcyrus-release-2-3-7
-/gai.h/1.6/Wed Oct 22 18:50:12 2003//Tcyrus-release-2-3-7
-/getaddrinfo.c/1.6/Wed Oct 22 18:50:12 2003//Tcyrus-release-2-3-7
-/getdtablesize.c/1.7/Thu Feb 13 20:15:40 2003//Tcyrus-release-2-3-7
-/getnameinfo.c/1.6/Wed Oct 22 18:50:12 2003//Tcyrus-release-2-3-7
-/glob.c/1.25.4.1/Fri Dec 19 18:33:42 2003//Tcyrus-release-2-3-7
-/glob.h/1.12/Thu Feb 13 20:15:40 2003//Tcyrus-release-2-3-7
-/gmtoff.h/1.6/Thu Feb 13 20:15:40 2003//Tcyrus-release-2-3-7
-/gmtoff_gmtime.c/1.11/Wed Oct 22 18:50:12 2003//Tcyrus-release-2-3-7
-/gmtoff_tm.c/1.9.2.1/Fri Feb 27 21:17:39 2004//Tcyrus-release-2-3-7
-/hash.c/1.11.2.1/Tue May 25 01:28:14 2004//Tcyrus-release-2-3-7
-/hash.h/1.9/Wed Oct 22 18:50:12 2003//Tcyrus-release-2-3-7
-/hmac-md5.h/1.1.2.1/Mon Feb 21 19:25:52 2005//Tcyrus-release-2-3-7
-/imapoptions/1.2.2.47/Tue Jun 27 15:58:42 2006//Tcyrus-release-2-3-7
-/imapurl.c/1.10.4.4/Thu Nov 17 15:46:30 2005//Tcyrus-release-2-3-7
-/imapurl.h/1.5.4.2/Thu Nov 17 15:46:30 2005//Tcyrus-release-2-3-7
-/imclient.c/1.84.2.2/Fri Oct 28 14:51:22 2005//Tcyrus-release-2-3-7
-/imclient.h/1.26.2.1/Mon Apr 11 05:48:05 2005//Tcyrus-release-2-3-7
-/imparse.c/1.12/Thu Feb 13 20:15:40 2003//Tcyrus-release-2-3-7
-/imparse.h/1.7/Thu Feb 13 20:15:40 2003//Tcyrus-release-2-3-7
-/iptostring.c/1.5.4.2/Wed Mar 24 19:53:15 2004//Tcyrus-release-2-3-7
-/iptostring.h/1.3/Thu Feb 13 20:15:40 2003//Tcyrus-release-2-3-7
-/libconfig.c/1.2.2.15/Sun Feb 20 05:22:29 2005//Tcyrus-release-2-3-7
-/libconfig.h/1.2.2.8/Sun Feb 20 03:23:45 2005//Tcyrus-release-2-3-7
-/libcyr_cfg.c/1.2.2.12/Tue Dec 13 19:36:12 2005//Tcyrus-release-2-3-7
-/libcyr_cfg.h/1.2.2.9/Tue Dec 13 19:36:12 2005//Tcyrus-release-2-3-7
-/lock.h/1.7/Thu Feb 13 20:15:40 2003//Tcyrus-release-2-3-7
-/lock_fcntl.c/1.16/Thu Feb 13 20:15:40 2003//Tcyrus-release-2-3-7
-/lock_flock.c/1.15/Thu Feb 13 20:15:41 2003//Tcyrus-release-2-3-7
-/lsort.c/1.2/Sat May 25 19:57:47 2002//Tcyrus-release-2-3-7
-/lsort.h/1.2/Sat May 25 19:57:47 2002//Tcyrus-release-2-3-7
-/map.h/1.12/Wed Oct 22 18:50:12 2003//Tcyrus-release-2-3-7
-/map_nommap.c/1.23/Wed Oct 22 18:50:12 2003//Tcyrus-release-2-3-7
-/map_shared.c/1.21/Wed Oct 22 18:50:12 2003//Tcyrus-release-2-3-7
-/map_stupidshared.c/1.14/Wed Oct 22 18:50:12 2003//Tcyrus-release-2-3-7
-/md5.c/1.1.2.1/Mon Feb 21 19:25:53 2005//Tcyrus-release-2-3-7
-/md5.h/1.1.2.1/Mon Feb 21 19:25:54 2005//Tcyrus-release-2-3-7
-/md5global.h/1.1.2.1/Mon Feb 21 19:25:54 2005//Tcyrus-release-2-3-7
-/memmove.c/1.8/Thu Feb 13 20:15:41 2003//Tcyrus-release-2-3-7
-/message_uuid.c/1.1.2.1/Mon Feb 21 19:25:54 2005//Tcyrus-release-2-3-7
-/message_uuid.h/1.1.2.1/Mon Feb 21 19:25:54 2005//Tcyrus-release-2-3-7
-/mkchartable.c/1.25/Wed May 14 18:56:34 2003//Tcyrus-release-2-3-7
-/mkgmtime.c/1.10/Wed Oct 22 18:50:12 2003//Tcyrus-release-2-3-7
-/mkgmtime.h/1.5/Thu Feb 13 20:15:41 2003//Tcyrus-release-2-3-7
-/mpool.c/1.14.2.1/Mon Jan 16 15:39:09 2006//Tcyrus-release-2-3-7
-/mpool.h/1.10.2.1/Mon Jan 16 15:39:09 2006//Tcyrus-release-2-3-7
-/nonblock.h/1.8/Wed Oct 22 18:50:12 2003//Tcyrus-release-2-3-7
-/nonblock_fcntl.c/1.15/Wed Oct 22 18:50:12 2003//Tcyrus-release-2-3-7
-/nonblock_ioctl.c/1.11/Wed Oct 22 18:50:12 2003//Tcyrus-release-2-3-7
-/parseaddr.c/1.17/Thu Feb 13 20:15:41 2003//Tcyrus-release-2-3-7
-/parseaddr.h/1.8/Thu Feb 13 20:15:41 2003//Tcyrus-release-2-3-7
-/prot.c/1.82.2.13/Mon Mar 13 20:05:04 2006//Tcyrus-release-2-3-7
-/prot.h/1.40.2.5/Wed Feb 1 19:25:42 2006//Tcyrus-release-2-3-7
-/retry.c/1.21.2.1/Thu Jan 15 20:24:38 2004//Tcyrus-release-2-3-7
-/retry.h/1.12/Wed Oct 22 18:50:12 2003//Tcyrus-release-2-3-7
-/rfc822date.c/1.6/Wed Oct 22 18:50:12 2003//Tcyrus-release-2-3-7
-/rfc822date.h/1.3/Thu Feb 13 20:15:42 2003//Tcyrus-release-2-3-7
-/strcasecmp.c/1.6/Thu Feb 13 20:15:42 2003//Tcyrus-release-2-3-7
-/strerror.c/1.6/Thu Feb 13 20:15:42 2003//Tcyrus-release-2-3-7
-/strhash.c/1.2/Wed Oct 22 18:03:05 2003//Tcyrus-release-2-3-7
-/strhash.h/1.2/Wed Oct 22 18:03:05 2003//Tcyrus-release-2-3-7
-/stristr.c/1.3/Sat May 25 19:57:47 2002//Tcyrus-release-2-3-7
-/stristr.h/1.2/Sat May 25 19:57:47 2002//Tcyrus-release-2-3-7
-/sysexits.h/1.4/Thu Feb 13 20:15:42 2003//Tcyrus-release-2-3-7
-/util.c/1.27.2.3/Thu Sep 9 18:47:11 2004//Tcyrus-release-2-3-7
-/util.h/1.17.2.1/Fri Sep 10 13:51:12 2004//Tcyrus-release-2-3-7
-/wildmat.c/1.2/Wed Oct 22 18:03:05 2003//Tcyrus-release-2-3-7
-/wildmat.h/1.2/Wed Oct 22 18:03:05 2003//Tcyrus-release-2-3-7
-/xmalloc.c/1.29.4.1/Fri Mar 17 17:29:41 2006//Tcyrus-release-2-3-7
-/xmalloc.h/1.25.2.1/Fri Mar 17 17:29:41 2006//Tcyrus-release-2-3-7
-/xstrlcat.c/1.1.2.2/Wed Mar 22 21:38:48 2006//Tcyrus-release-2-3-7
-/xstrlcat.h/1.1.2.2/Wed Mar 22 21:38:48 2006//Tcyrus-release-2-3-7
-/xstrlcpy.c/1.1.2.2/Wed Mar 22 21:38:49 2006//Tcyrus-release-2-3-7
-/xstrlcpy.h/1.1.2.2/Wed Mar 22 21:38:49 2006//Tcyrus-release-2-3-7
+/.cvsignore/1.2/Wed Oct 22 18:03:03 2003//
+/Makefile.dist/1.2/Wed Oct 22 18:03:03 2003//
+/Makefile.in/1.65/Thu Nov 30 17:11:22 2006//
+/acl.c/1.12/Tue Jan 2 17:19:49 2007//
+/acl.h/1.18/Thu Nov 30 17:11:22 2006//
+/acl_afs.c/1.26/Thu Nov 30 17:11:22 2006//
+/assert.c/1.18/Wed Oct 22 18:50:12 2003//
+/assert.h/1.10/Thu Feb 13 20:15:38 2003//
+/auth.c/1.2/Thu Nov 30 17:11:22 2006//
+/auth.h/1.17/Thu Nov 30 17:11:22 2006//
+/auth_krb.c/1.42/Thu Nov 30 17:11:22 2006//
+/auth_krb5.c/1.5/Thu Nov 30 17:11:22 2006//
+/auth_pts.c/1.12/Mon Feb 5 18:43:26 2007//
+/auth_pts.h/1.3/Thu Nov 30 17:11:22 2006//
+/auth_unix.c/1.40/Thu Nov 30 17:11:22 2006//
+/bsearch.c/1.20/Thu Nov 30 17:11:22 2006//
+/bsearch.h/1.8/Thu Nov 30 17:11:22 2006//
+/byteorder64.c/1.2/Thu Nov 30 17:11:22 2006//
+/byteorder64.h/1.2/Thu Nov 30 17:11:22 2006//
+/charset.c/1.46/Thu Nov 30 17:11:22 2006//
+/charset.h/1.20/Thu Nov 30 17:11:22 2006//
+/chartable.h/1.5/Thu Feb 13 20:15:39 2003//
+/cyrusdb.c/1.11/Thu Nov 30 17:11:22 2006//
+/cyrusdb.h/1.31/Thu Nov 30 17:11:22 2006//
+/cyrusdb_berkeley.c/1.16/Mon Feb 5 18:43:26 2007//
+/cyrusdb_flat.c/1.37/Mon Feb 5 18:43:26 2007//
+/cyrusdb_quotalegacy.c/1.14/Mon Feb 5 18:43:26 2007//
+/cyrusdb_skiplist.c/1.52/Mon Feb 5 18:43:26 2007//
+/exitcodes.h/1.5/Thu Feb 13 20:15:39 2003//
+/ftruncate.c/1.8/Thu Feb 13 20:15:39 2003//
+/gai.h/1.6/Wed Oct 22 18:50:12 2003//
+/getaddrinfo.c/1.6/Wed Oct 22 18:50:12 2003//
+/getdtablesize.c/1.7/Thu Feb 13 20:15:40 2003//
+/getnameinfo.c/1.6/Wed Oct 22 18:50:12 2003//
+/glob.c/1.32/Thu Nov 30 17:11:22 2006//
+/glob.h/1.12/Thu Feb 13 20:15:40 2003//
+/gmtoff.h/1.6/Thu Feb 13 20:15:40 2003//
+/gmtoff_gmtime.c/1.11/Wed Oct 22 18:50:12 2003//
+/gmtoff_tm.c/1.11/Thu Nov 30 17:11:22 2006//
+/hash.c/1.13/Thu Nov 30 17:11:22 2006//
+/hash.h/1.9/Wed Oct 22 18:50:12 2003//
+/hmac-md5.h/1.2/Thu Nov 30 17:11:22 2006//
+/imapoptions/1.42/Wed Feb 7 18:58:07 2007//
+/imapurl.c/1.12/Thu Nov 30 17:11:22 2006//
+/imapurl.h/1.6/Thu Nov 30 17:11:22 2006//
+/imclient.c/1.88/Mon Feb 5 18:43:26 2007//
+/imclient.h/1.28/Thu Nov 30 17:11:22 2006//
+/imparse.c/1.12/Thu Feb 13 20:15:40 2003//
+/imparse.h/1.7/Thu Feb 13 20:15:40 2003//
+/iptostring.c/1.8/Thu Nov 30 17:11:22 2006//
+/iptostring.h/1.3/Thu Feb 13 20:15:40 2003//
+/libconfig.c/1.12/Fri Jan 5 19:54:20 2007//
+/libconfig.h/1.5/Thu Nov 30 17:11:22 2006//
+/libcyr_cfg.c/1.13/Thu Nov 30 17:11:22 2006//
+/libcyr_cfg.h/1.10/Thu Nov 30 17:11:22 2006//
+/lock.h/1.7/Thu Feb 13 20:15:40 2003//
+/lock_fcntl.c/1.16/Thu Feb 13 20:15:40 2003//
+/lock_flock.c/1.15/Thu Feb 13 20:15:41 2003//
+/lsort.c/1.2/Sat May 25 19:57:47 2002//
+/lsort.h/1.2/Sat May 25 19:57:47 2002//
+/map.h/1.12/Wed Oct 22 18:50:12 2003//
+/map_nommap.c/1.23/Wed Oct 22 18:50:12 2003//
+/map_shared.c/1.21/Wed Oct 22 18:50:12 2003//
+/map_stupidshared.c/1.14/Wed Oct 22 18:50:12 2003//
+/md5.c/1.2/Thu Nov 30 17:11:22 2006//
+/md5.h/1.2/Thu Nov 30 17:11:22 2006//
+/md5global.h/1.2/Thu Nov 30 17:11:22 2006//
+/memmove.c/1.8/Thu Feb 13 20:15:41 2003//
+/message_uuid.c/1.2/Thu Nov 30 17:11:22 2006//
+/message_uuid.h/1.2/Thu Nov 30 17:11:22 2006//
+/mkchartable.c/1.25/Wed May 14 18:56:34 2003//
+/mkgmtime.c/1.10/Wed Oct 22 18:50:12 2003//
+/mkgmtime.h/1.5/Thu Feb 13 20:15:41 2003//
+/mpool.c/1.16/Thu Nov 30 17:11:22 2006//
+/mpool.h/1.12/Thu Nov 30 17:11:22 2006//
+/nonblock.h/1.8/Wed Oct 22 18:50:12 2003//
+/nonblock_fcntl.c/1.15/Wed Oct 22 18:50:12 2003//
+/nonblock_ioctl.c/1.11/Wed Oct 22 18:50:12 2003//
+/parseaddr.c/1.17/Thu Feb 13 20:15:41 2003//
+/parseaddr.h/1.8/Thu Feb 13 20:15:41 2003//
+/prot.c/1.89/Tue Jan 9 16:50:31 2007//
+/prot.h/1.43/Thu Nov 30 17:11:22 2006//
+/retry.c/1.23/Thu Nov 30 17:11:22 2006//
+/retry.h/1.12/Wed Oct 22 18:50:12 2003//
+/rfc822date.c/1.6/Wed Oct 22 18:50:12 2003//
+/rfc822date.h/1.3/Thu Feb 13 20:15:42 2003//
+/strcasecmp.c/1.6/Thu Feb 13 20:15:42 2003//
+/strerror.c/1.6/Thu Feb 13 20:15:42 2003//
+/strhash.c/1.2/Wed Oct 22 18:03:05 2003//
+/strhash.h/1.2/Wed Oct 22 18:03:05 2003//
+/stristr.c/1.3/Sat May 25 19:57:47 2002//
+/stristr.h/1.2/Sat May 25 19:57:47 2002//
+/sysexits.h/1.4/Thu Feb 13 20:15:42 2003//
+/util.c/1.31/Thu Nov 30 17:11:22 2006//
+/util.h/1.20/Tue Jan 9 17:04:10 2007//
+/wildmat.c/1.2/Wed Oct 22 18:03:05 2003//
+/wildmat.h/1.2/Wed Oct 22 18:03:05 2003//
+/xmalloc.c/1.31/Thu Nov 30 17:11:22 2006//
+/xmalloc.h/1.27/Thu Nov 30 17:11:22 2006//
+/xstrlcat.c/1.2/Thu Nov 30 17:11:22 2006//
+/xstrlcat.h/1.2/Thu Nov 30 17:11:22 2006//
+/xstrlcpy.c/1.2/Thu Nov 30 17:11:22 2006//
+/xstrlcpy.h/1.2/Thu Nov 30 17:11:22 2006//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/Makefile.in
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/Makefile.in?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/Makefile.in (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/Makefile.in Tue Feb 27 04:17:11 2007
@@ -40,7 +40,7 @@
# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-# $Id: Makefile.in,v 1.55.2.9 2006/03/17 17:29:40 murch Exp $
+# $Id: Makefile.in,v 1.65 2006/11/30 17:11:22 murch Exp $
# Authorization namespace.
AUTH=auth.o auth_krb.o auth_unix.o auth_krb5.o auth_pts.o
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/acl.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/acl.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/acl.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/acl.c Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
/* acl.c -- routines for access control lists
- $Id: acl.c,v 1.10.4.1 2005/12/13 19:36:10 murch Exp $
+ $Id: acl.c,v 1.12 2007/01/02 17:19:49 murch Exp $
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
@@ -41,6 +41,8 @@
*
* Author: Chris Newman
* Start Date: 6/28/93
+ *
+ * RFC 4314 support added by Ken Murchison
*/
#include <config.h>
@@ -53,26 +55,26 @@
int cyrus_acl_strtomask(const char *str)
{
const char *deleteright = libcyrus_config_getstring(CYRUSOPT_DELETERIGHT);
+ long legacy_create = 0;
+ long legacy_delete = 0;
long result = 0;
while (*str) {
- /* legacy DELETE right */
- if (*str == *deleteright) result |= ACL_DELETEMBOX;
-
- switch (*str++) {
+ switch (*str) {
case 'l': result |= ACL_LOOKUP; break;
case 'r': result |= ACL_READ; break;
case 's': result |= ACL_SEEN; break;
case 'w': result |= ACL_WRITE; break;
case 'i': result |= ACL_INSERT; break;
case 'p': result |= ACL_POST; break;
- case 'c': /* legacy CREATE macro */
+ case 'c': /* legacy CREATE macro - build member rights */
+ legacy_create = ACL_CREATE; break;
case 'k': result |= ACL_CREATE; break;
case 'x': result |= ACL_DELETEMBOX; break;
case 't': result |= ACL_DELETEMSG; break;
case 'e': result |= ACL_EXPUNGE; break;
- case 'd': /* legacy DELETE macro */
- result |= (ACL_DELETEMSG | ACL_EXPUNGE); break;
+ case 'd': /* legacy DELETE macro - build member rights */
+ legacy_delete = (ACL_DELETEMSG | ACL_EXPUNGE); break;
case 'a': result |= ACL_ADMIN; break;
case '0': result |= ACL_USER0; break;
case '1': result |= ACL_USER1; break;
@@ -85,33 +87,41 @@
case '8': result |= ACL_USER8; break;
case '9': result |= ACL_USER9; break;
}
+
+ if (*str++ == *deleteright) {
+ switch (*deleteright) {
+ case 'c': /* legacy CREATE macro - build member rights */
+ legacy_create |= ACL_DELETEMBOX; break;
+ case 'd': /* legacy DELETE macro - build member rights */
+ legacy_delete |= ACL_DELETEMBOX; break;
+ default: result |= ACL_DELETEMBOX; break;
+ }
+ }
}
+
+ /* If the rights string contained a legacy macro, but none of its
+ member rights, then we add all of the member rights for the macro.
+ Otherwise, we ignore the legacy macro.
+ */
+ if (!(result & legacy_create)) result |= legacy_create;
+ if (!(result & legacy_delete)) result |= legacy_delete;
return (result);
}
/* convert an acl bit vector to a string
- *
- * The 'legacy' parameter is used to control whether we return
- * the legacy c/d macros when any of their member rights are set.
- * 'legacy' is enabled (1) for GETACL/LISTRIGHTS/MYRIGHTS responses
- * and disabled (0) for SETACL (when writing rights to disk).
*/
-char *cyrus_acl_masktostr(int acl, char *str, int legacy)
+char *cyrus_acl_masktostr(int acl, char *str)
{
char *pos = str;
- int legacy_create = 0, legacy_delete = 0;
+ const char *deleteright = libcyrus_config_getstring(CYRUSOPT_DELETERIGHT);
+ int legacy_create = ACL_CREATE;
+ int legacy_delete = (ACL_DELETEMSG | ACL_EXPUNGE);
- if (legacy) {
- const char *deleteright = libcyrus_config_getstring(CYRUSOPT_DELETERIGHT);
- legacy_create = ACL_CREATE;
- legacy_delete = (ACL_DELETEMSG | ACL_EXPUNGE);
-
- switch (*deleteright) {
- case 'c': legacy_create |= ACL_DELETEMBOX; break;
- case 'd': legacy_delete |= ACL_DELETEMBOX; break;
- default: /* XXX we have backwards compatibility problems */ break;
- }
+ switch (*deleteright) {
+ case 'c': legacy_create |= ACL_DELETEMBOX; break;
+ case 'd': legacy_delete |= ACL_DELETEMBOX; break;
+ default: /* XXX we have backwards compatibility problems */ break;
}
if (acl & ACL_LOOKUP) *pos++ = 'l';
@@ -124,8 +134,14 @@
if (acl & ACL_DELETEMBOX) *pos++ = 'x';
if (acl & ACL_DELETEMSG) *pos++ = 't';
if (acl & ACL_EXPUNGE) *pos++ = 'e';
- if (acl & legacy_create) *pos++ = 'c';
- if (acl & legacy_delete) *pos++ = 'd';
+ if (acl & legacy_create) {
+ /* legacy CREATE macro member right(s) - add macro */
+ *pos++ = 'c';
+ }
+ if (acl & legacy_delete) {
+ /* legacy DELETE macro member right(s) - add macro */
+ *pos++ = 'd';
+ }
if (acl & ACL_ADMIN) *pos++ = 'a';
if (acl & ACL_USER0) *pos++ = '0';
if (acl & ACL_USER1) *pos++ = '1';
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/acl.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/acl.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/acl.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/acl.h Tue Feb 27 04:17:11 2007
@@ -42,7 +42,7 @@
* Start Date: 6/28/93
*/
-/* $Id: acl.h,v 1.14.4.2 2006/05/18 18:04:52 murch Exp $ */
+/* $Id: acl.h,v 1.18 2006/11/30 17:11:22 murch Exp $ */
#ifndef INCLUDED_ACL_H
#define INCLUDED_ACL_H
@@ -93,7 +93,7 @@
* dst must have room for 32 characters (only 20 used currently)
* returns dst
*/
-extern char *cyrus_acl_masktostr(int acl, char *str, int legacy);
+extern char *cyrus_acl_masktostr(int acl, char *str);
/* cyrus_acl_myrights(acl)
* Calculate the set of rights the user in 'auth_state' has in the ACL 'acl'.
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/acl_afs.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/acl_afs.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/acl_afs.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/acl_afs.c Tue Feb 27 04:17:11 2007
@@ -8,7 +8,7 @@
*
*/
/*
- $Id: acl_afs.c,v 1.22.4.3 2006/04/13 18:33:22 murch Exp $
+ $Id: acl_afs.c,v 1.26 2006/11/30 17:11:22 murch Exp $
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
@@ -206,7 +206,7 @@
strncpy(newacl, *acl, (thisid - *acl));
strcpy(newacl + (thisid - *acl), identifier);
strcat(newacl, "\t");
- (void) cyrus_acl_masktostr(access, newacl + strlen(newacl), 0);
+ (void) cyrus_acl_masktostr(access, newacl + strlen(newacl));
strcat(newacl, "\t");
strcat(newacl, nextid);
free(*acl);
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/auth.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/auth.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/auth.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/auth.c Tue Feb 27 04:17:11 2007
@@ -38,7 +38,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: auth.c,v 1.1.2.1 2005/02/16 21:06:50 shadow Exp $ */
+/* $Id: auth.c,v 1.2 2006/11/30 17:11:22 murch Exp $ */
#include <config.h>
#include <stdlib.h>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/auth.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/auth.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/auth.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/auth.h Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
/* auth.h -- Site authorization module
- * $Id: auth.h,v 1.15.2.1 2005/02/16 21:06:50 shadow Exp $
+ * $Id: auth.h,v 1.17 2006/11/30 17:11:22 murch Exp $
*
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/auth_krb.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/auth_krb.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/auth_krb.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/auth_krb.c Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
/* auth_krb.c -- Kerberos authorization
- * $Id: auth_krb.c,v 1.39.2.3 2005/12/14 13:52:09 murch Exp $
+ * $Id: auth_krb.c,v 1.42 2006/11/30 17:11:22 murch Exp $
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -45,6 +45,7 @@
#include "auth.h"
#include "exitcodes.h"
+#include "xmalloc.h"
#ifdef HAVE_KRB
@@ -66,8 +67,6 @@
#endif
#include <krb.h>
-#include "xmalloc.h"
-
#ifndef KRB_MAPNAME
#define KRB_MAPNAME (SYSCONFDIR "/krb.equiv")
#endif
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/auth_krb5.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/auth_krb5.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/auth_krb5.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/auth_krb5.c Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
/* auth_krb5.c -- Kerberos V authorization for Cyrus IMAP
- * $Id: auth_krb5.c,v 1.2.2.2 2005/02/16 21:06:50 shadow Exp $
+ * $Id: auth_krb5.c,v 1.5 2006/11/30 17:11:22 murch Exp $
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/auth_pts.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/auth_pts.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/auth_pts.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/auth_pts.c Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
/* auth_pts.c -- PTLOADER authorization
- * $Id: auth_pts.c,v 1.2.2.7 2006/03/17 16:05:15 murch Exp $
+ * $Id: auth_pts.c,v 1.12 2007/02/05 18:43:26 jeaton Exp $
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -62,6 +62,8 @@
#include "retry.h"
#include "strhash.h"
#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
static char *canonuser_id = NULL;
static struct auth_state *canonuser_cache = NULL;
@@ -246,6 +248,12 @@
strlcpy(retbuf, identifier, sizeof(retbuf));
return retbuf;
}
+
+ if (!strcmp(identifier, "")) {
+ syslog(LOG_ERR, "unable to canonify empty identifier");
+ return NULL;
+ }
+
canonuser_cache = NULL;
if(ptload(identifier, &canonuser_cache) < 0) {
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/auth_pts.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/auth_pts.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/auth_pts.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/auth_pts.h Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
/* auth_pts.h -- PTLOADER authorization module.
- $Id: auth_pts.h,v 1.2.2.1 2005/12/13 13:35:06 murch Exp $
+ $Id: auth_pts.h,v 1.3 2006/11/30 17:11:22 murch Exp $
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/auth_unix.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/auth_unix.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/auth_unix.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/auth_unix.c Tue Feb 27 04:17:11 2007
@@ -41,7 +41,7 @@
*/
/*
- * $Id: auth_unix.c,v 1.37.2.2 2005/02/16 21:06:50 shadow Exp $
+ * $Id: auth_unix.c,v 1.40 2006/11/30 17:11:22 murch Exp $
*/
#include <config.h>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/bsearch.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/bsearch.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/bsearch.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/bsearch.c Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
/* bsearch.c -- binary search newline-separated fields in memory
- $Id: bsearch.c,v 1.19 2003/02/13 20:15:39 rjs3 Exp $
+ $Id: bsearch.c,v 1.20 2006/11/30 17:11:22 murch Exp $
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
@@ -213,3 +213,22 @@
s2++;
}
}
+
+int bsearch_ncompare(const char *s1, int l1, const char *s2, int l2)
+{
+ int min = l1 < l2 ? l1 : l2;
+ int cmp = 0;
+
+ while (min-- > 0 && (cmp = TOCOMPARE(*s1) - TOCOMPARE(*s2)) == 0) {
+ s1++;
+ s2++;
+ }
+ if (min >= 0) {
+ return cmp;
+ } else {
+ if (l2 > l1) return -1;
+ else if (l1 > l2) return 1;
+ else return 0;
+ }
+}
+
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/bsearch.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/bsearch.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/bsearch.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/bsearch.h Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
/* bsearch.h -- binary search
- $Id: bsearch.h,v 1.7 2003/02/13 20:15:39 rjs3 Exp $
+ $Id: bsearch.h,v 1.8 2006/11/30 17:11:22 murch Exp $
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
@@ -51,4 +51,6 @@
extern int bsearch_compare(const char *s1, const char *s2);
+extern int bsearch_ncompare(const char *s1, int l1, const char *s2, int l2);
+
#endif /* INCLUDED_BSEARCH_H */
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/byteorder64.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/byteorder64.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/byteorder64.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/byteorder64.c Tue Feb 27 04:17:11 2007
@@ -38,7 +38,7 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: byteorder64.c,v 1.1.2.1 2004/08/09 18:51:21 ken3 Exp $
+ * $Id: byteorder64.c,v 1.2 2006/11/30 17:11:22 murch Exp $
*/
#include <config.h>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/byteorder64.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/byteorder64.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/byteorder64.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/byteorder64.h Tue Feb 27 04:17:11 2007
@@ -38,7 +38,7 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: byteorder64.h,v 1.1.2.2 2004/08/16 11:44:34 ken3 Exp $
+ * $Id: byteorder64.h,v 1.2 2006/11/30 17:11:22 murch Exp $
*/
#ifndef _BYTEORDER64_H
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/charset.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/charset.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/charset.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/charset.c Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/*
- * $Id: charset.c,v 1.44.2.3 2006/06/14 11:53:36 murch Exp $
+ * $Id: charset.c,v 1.46 2006/11/30 17:11:22 murch Exp $
*/
#include <config.h>
#include <ctype.h>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/charset.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/charset.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/charset.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/charset.h Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
*
*/
/*
- * $Id: charset.h,v 1.19.2.1 2006/03/09 22:39:38 murch Exp $
+ * $Id: charset.h,v 1.20 2006/11/30 17:11:22 murch Exp $
*/
#ifndef INCLUDED_CHARSET_H
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/charset/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/charset/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/charset/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/charset/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,21 +1,21 @@
-/big5.t/1.1/Tue Mar 2 01:06:37 1999//Tcyrus-release-2-3-7
-/gb2312.t/1.1/Tue Mar 2 01:06:39 1999//Tcyrus-release-2-3-7
-/iso-2022-jp.t/1.5/Fri May 15 21:53:45 1998//Tcyrus-release-2-3-7
-/iso-2022-kr.t/1.1/Tue Mar 2 01:06:40 1999//Tcyrus-release-2-3-7
-/iso-8859-1.t/1.5/Fri May 15 21:53:49 1998//Tcyrus-release-2-3-7
-/iso-8859-15.t/1.2/Wed Jan 29 20:48:53 2003//Tcyrus-release-2-3-7
-/iso-8859-2.t/1.4/Fri May 15 21:53:53 1998//Tcyrus-release-2-3-7
-/iso-8859-3.t/1.4/Fri May 15 21:53:57 1998//Tcyrus-release-2-3-7
-/iso-8859-4.t/1.5/Fri May 15 21:54:00 1998//Tcyrus-release-2-3-7
-/iso-8859-5.t/1.4/Fri May 15 21:54:04 1998//Tcyrus-release-2-3-7
-/iso-8859-6.t/1.5/Fri May 15 21:54:07 1998//Tcyrus-release-2-3-7
-/iso-8859-7.t/1.5/Fri May 15 21:54:11 1998//Tcyrus-release-2-3-7
-/iso-8859-8.t/1.4/Fri May 15 21:54:14 1998//Tcyrus-release-2-3-7
-/iso-8859-9.t/1.5/Fri May 15 21:54:18 1998//Tcyrus-release-2-3-7
-/koi8-r.t/1.4/Fri May 15 21:54:21 1998//Tcyrus-release-2-3-7
-/unidata2.txt/1.1/Tue Mar 2 01:08:06 1999//Tcyrus-release-2-3-7
-/unifix.txt/1.2.18.1/Wed Mar 9 16:09:56 2005//Tcyrus-release-2-3-7
-/us-ascii.t/1.4/Fri May 15 21:54:29 1998//Tcyrus-release-2-3-7
-/windows-1252.t/1.2/Wed Jan 29 20:48:53 2003//Tcyrus-release-2-3-7
-/windows-1256.t/1.1/Wed May 14 18:56:36 2003//Tcyrus-release-2-3-7
+/big5.t/1.1/Tue Mar 2 01:06:37 1999//
+/gb2312.t/1.1/Tue Mar 2 01:06:39 1999//
+/iso-2022-jp.t/1.5/Fri May 15 21:53:45 1998//
+/iso-2022-kr.t/1.1/Tue Mar 2 01:06:40 1999//
+/iso-8859-1.t/1.5/Fri May 15 21:53:49 1998//
+/iso-8859-15.t/1.2/Wed Jan 29 20:48:53 2003//
+/iso-8859-2.t/1.4/Fri May 15 21:53:53 1998//
+/iso-8859-3.t/1.4/Fri May 15 21:53:57 1998//
+/iso-8859-4.t/1.5/Fri May 15 21:54:00 1998//
+/iso-8859-5.t/1.4/Fri May 15 21:54:04 1998//
+/iso-8859-6.t/1.5/Fri May 15 21:54:07 1998//
+/iso-8859-7.t/1.5/Fri May 15 21:54:11 1998//
+/iso-8859-8.t/1.4/Fri May 15 21:54:14 1998//
+/iso-8859-9.t/1.5/Fri May 15 21:54:18 1998//
+/koi8-r.t/1.4/Fri May 15 21:54:21 1998//
+/unidata2.txt/1.1/Tue Mar 2 01:08:06 1999//
+/unifix.txt/1.3/Wed Mar 9 16:08:42 2005//
+/us-ascii.t/1.4/Fri May 15 21:54:29 1998//
+/windows-1252.t/1.2/Wed Jan 29 20:48:53 2003//
+/windows-1256.t/1.1/Wed May 14 18:56:36 2003//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/cyrusdb.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/cyrusdb.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/cyrusdb.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/cyrusdb.c Tue Feb 27 04:17:11 2007
@@ -38,7 +38,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: cyrusdb.c,v 1.5.2.8 2006/01/04 02:14:14 murch Exp $ */
+/* $Id: cyrusdb.c,v 1.11 2006/11/30 17:11:22 murch Exp $ */
#include <config.h>
#include <stdlib.h>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/cyrusdb.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/cyrusdb.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/cyrusdb.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/cyrusdb.h Tue Feb 27 04:17:11 2007
@@ -38,7 +38,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: cyrusdb.h,v 1.25.2.4 2006/01/04 02:14:14 murch Exp $ */
+/* $Id: cyrusdb.h,v 1.31 2006/11/30 17:11:22 murch Exp $ */
#ifndef INCLUDED_CYRUSDB_H
#define INCLUDED_CYRUSDB_H
@@ -67,7 +67,8 @@
};
enum cyrusdb_openflags {
- CYRUSDB_CREATE = 0x01 /* Create the database if not existant */
+ CYRUSDB_CREATE = 0x01, /* Create the database if not existant */
+ CYRUSDB_MBOXSORT = 0x02 /* Use mailbox sort order ('.' sorts 1st) */
};
typedef int foreach_p(void *rock,
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/cyrusdb_berkeley.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/cyrusdb_berkeley.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/cyrusdb_berkeley.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/cyrusdb_berkeley.c Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: cyrusdb_berkeley.c,v 1.2.2.12 2006/02/28 12:58:07 murch Exp $ */
+/* $Id: cyrusdb_berkeley.c,v 1.16 2007/02/05 18:43:26 jeaton Exp $ */
#include <config.h>
@@ -51,10 +51,13 @@
#include <stdlib.h>
#include <unistd.h>
+#include "bsearch.h"
#include "cyrusdb.h"
#include "exitcodes.h"
#include "libcyr_cfg.h"
#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
extern void fatal(const char *, int);
@@ -376,6 +379,12 @@
return 0;
}
+static int mbox_compar(DB *db, const DBT *a, const DBT *b)
+{
+ return bsearch_ncompare((const char *) a->data, a->size,
+ (const char *) b->data, b->size);
+}
+
static int myopen(const char *fname, DBTYPE type, int flags, struct db **ret)
{
DB *db = NULL;
@@ -392,6 +401,7 @@
return CYRUSDB_IOERROR;
}
/* xxx set comparator! */
+ if (flags & CYRUSDB_MBOXSORT) db->set_bt_compare(db, mbox_compar);
#if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1
r = db->open(db, NULL, fname, NULL, type, dbflags | DB_AUTO_COMMIT, 0664);
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/cyrusdb_flat.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/cyrusdb_flat.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/cyrusdb_flat.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/cyrusdb_flat.c Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: cyrusdb_flat.c,v 1.31.2.3 2004/03/24 19:53:14 ken3 Exp $ */
+/* $Id: cyrusdb_flat.c,v 1.37 2007/02/05 18:43:26 jeaton Exp $ */
#include <config.h>
@@ -65,6 +65,8 @@
#include "retry.h"
#include "util.h"
#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
/* we have the file locked iff we have an outstanding transaction */
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/cyrusdb_quotalegacy.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/cyrusdb_quotalegacy.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/cyrusdb_quotalegacy.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/cyrusdb_quotalegacy.c Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: cyrusdb_quotalegacy.c,v 1.1.2.9 2005/04/20 18:47:48 ken3 Exp $ */
+/* $Id: cyrusdb_quotalegacy.c,v 1.14 2007/02/05 18:43:26 jeaton Exp $ */
#include <config.h>
@@ -67,6 +67,8 @@
#include "retry.h"
#include "util.h"
#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
#define FNAME_QUOTADIR "/quota/"
#define MAX_QUOTA_PATH 4096
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/cyrusdb_skiplist.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/cyrusdb_skiplist.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/cyrusdb_skiplist.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/cyrusdb_skiplist.c Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
/* cyrusdb_skiplist.c -- cyrusdb skiplist implementation
- * $Id: cyrusdb_skiplist.c,v 1.42.2.3 2004/06/09 19:42:47 ken3 Exp $
+ * $Id: cyrusdb_skiplist.c,v 1.52 2007/02/05 18:43:26 jeaton Exp $
*
* Copyright (c) 1998, 2000, 2002 Carnegie Mellon University.
* All rights reserved.
@@ -61,6 +61,7 @@
#endif
#include <netinet/in.h>
+#include "bsearch.h"
#include "cyrusdb.h"
#include "libcyr_cfg.h"
#include "lock.h"
@@ -68,6 +69,8 @@
#include "retry.h"
#include "util.h"
#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
#define PROB (0.5)
@@ -153,6 +156,9 @@
int listsize;
int logstart; /* where the log starts from last chkpnt */
time_t last_recovery;
+
+ /* comparator function to use for sorting */
+ int (*compar) (const char *s1, int l1, const char *s2, int l2);
};
struct txn {
@@ -174,6 +180,8 @@
be_paranoid = 0,
use_osync = 0
};
+
+static int compare(const char *s1, int l1, const char *s2, int l2);
static void newtxn(struct db *db, struct txn *t)
{
@@ -674,6 +682,7 @@
db->fd = -1;
db->fname = xstrdup(fname);
+ db->compar = (flags & CYRUSDB_MBOXSORT) ? bsearch_ncompare : compare;
db->fd = open(fname, O_RDWR, 0644);
if (db->fd == -1 && errno == ENOENT && (flags & CYRUSDB_CREATE)) {
@@ -824,7 +833,7 @@
for (i = db->curlevel - 1; i >= 0; i--) {
while ((offset = FORWARD(ptr, i)) &&
- compare(KEY(db->map_base + offset), KEYLEN(db->map_base + offset),
+ db->compar(KEY(db->map_base + offset), KEYLEN(db->map_base + offset),
key, keylen) < 0) {
/* move forward at level 'i' */
ptr = db->map_base + offset;
@@ -875,7 +884,7 @@
ptr = find_node(db, key, keylen, 0);
- if (ptr == db->map_base || compare(KEY(ptr), KEYLEN(ptr), key, keylen)) {
+ if (ptr == db->map_base || db->compar(KEY(ptr), KEYLEN(ptr), key, keylen)) {
/* failed to find key/keylen */
r = CYRUSDB_NOTFOUND;
} else {
@@ -963,7 +972,7 @@
while (ptr != db->map_base) {
/* does it match prefix? */
if (KEYLEN(ptr) < (bit32) prefixlen) break;
- if (prefixlen && compare(KEY(ptr), prefixlen, prefix, prefixlen)) break;
+ if (prefixlen && db->compar(KEY(ptr), prefixlen, prefix, prefixlen)) break;
if (!goodp ||
goodp(rock, KEY(ptr), KEYLEN(ptr), DATA(ptr), DATALEN(ptr))) {
@@ -1070,7 +1079,7 @@
unsigned int lvl;
int num_iov;
struct txn t, *tp;
- bit32 endpadding = htonl(-1);
+ bit32 endpadding = (bit32) htonl(-1);
bit32 zeropadding[4] = { 0, 0, 0, 0 };
int updateoffsets[SKIPLIST_MAXLEVEL];
int newoffsets[SKIPLIST_MAXLEVEL];
@@ -1116,7 +1125,7 @@
newoffset = tp->logend;
ptr = find_node(db, key, keylen, updateoffsets);
if (ptr != db->map_base &&
- !compare(KEY(ptr), KEYLEN(ptr), key, keylen)) {
+ !db->compar(KEY(ptr), KEYLEN(ptr), key, keylen)) {
if (!overwrite) {
myabort(db, tp); /* releases lock */
@@ -1282,7 +1291,7 @@
ptr = find_node(db, key, keylen, updateoffsets);
if (ptr == db->map_base ||
- !compare(KEY(ptr), KEYLEN(ptr), key, keylen)) {
+ !db->compar(KEY(ptr), KEYLEN(ptr), key, keylen)) {
/* gotcha */
offset = ptr - db->map_base;
@@ -1825,11 +1834,11 @@
const char *q = db->map_base + offset;
int cmp;
- cmp = compare(KEY(ptr), KEYLEN(ptr), KEY(q), KEYLEN(q));
+ cmp = db->compar(KEY(ptr), KEYLEN(ptr), KEY(q), KEYLEN(q));
if (cmp >= 0) {
fprintf(stdout,
"skiplist inconsistent: %04X: ptr %d is %04X; "
- "compare() = %d\n",
+ "db->compar() = %d\n",
ptr - db->map_base,
i,
offset, cmp);
@@ -2058,7 +2067,7 @@
if (TYPE(ptr) == ADD) {
keyptr = find_node(db, KEY(ptr), KEYLEN(ptr), updateoffsets);
if (keyptr == db->map_base ||
- compare(KEY(ptr), KEYLEN(ptr), KEY(keyptr), KEYLEN(keyptr))) {
+ db->compar(KEY(ptr), KEYLEN(ptr), KEY(keyptr), KEYLEN(keyptr))) {
/* didn't find exactly this node */
keyptr = NULL;
}
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/glob.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/glob.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/glob.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/glob.c Tue Feb 27 04:17:11 2007
@@ -42,7 +42,7 @@
* Start Date: 4/5/93
*/
/*
- * $Id: glob.c,v 1.25.4.1 2003/12/19 18:33:42 ken3 Exp $
+ * $Id: glob.c,v 1.32 2006/11/30 17:11:22 murch Exp $
*/
#include <config.h>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/gmtoff_tm.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/gmtoff_tm.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/gmtoff_tm.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/gmtoff_tm.c Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
/* gmtoff_tm.c - Get offset from GMT from the tm_gmtoff struct member
- $Id: gmtoff_tm.c,v 1.9.2.1 2004/02/27 21:17:39 ken3 Exp $
+ $Id: gmtoff_tm.c,v 1.11 2006/11/30 17:11:22 murch Exp $
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/hash.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/hash.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/hash.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/hash.c Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
/* +++Date last modified: 05-Jul-1997 */
-/* $Id: hash.c,v 1.11.2.1 2004/05/25 01:28:14 ken3 Exp $ */
+/* $Id: hash.c,v 1.13 2006/11/30 17:11:22 murch Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/hmac-md5.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/hmac-md5.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/hmac-md5.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/hmac-md5.h Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
/* hmac-md5.h -- HMAC_MD5 functions
- * $Id: hmac-md5.h,v 1.1.2.1 2005/02/21 19:25:52 ken3 Exp $
+ * $Id: hmac-md5.h,v 1.2 2006/11/30 17:11:22 murch Exp $
*/
#ifndef HMAC_MD5_H
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/imapoptions
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/imapoptions?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/imapoptions (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/imapoptions Tue Feb 27 04:17:11 2007
@@ -42,7 +42,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" $Id: imapoptions,v 1.2.2.47 2006/06/27 15:58:42 murch Exp $
+.\" $Id: imapoptions,v 1.42 2007/02/07 18:58:07 murch Exp $
.SH NAME
imapd.conf \- IMAP configuration file
.SH DESCRIPTION
@@ -146,6 +146,11 @@
{ "annotation_db", "skiplist", STRINGLIST("berkeley", "berkeley-hash", "skiplist")}
/* The cyrusdb backend to use for mailbox annotations. */
+
+{ "anyoneuseracl", 1, SWITCH }
+/* Should non-admin users be allowed to set ACLs for the 'anyone'
+ user on their mailboxes? In a large organization this can cause
+ support problems, but it's enabled by default. */
{ "auth_mech", "unix", STRINGLIST("unix", "pts", "krb", "krb5")}
/* The authorization mechanism to use. */
@@ -300,6 +305,14 @@
configuration. If the path to the file is not absolute, CYRUS_PATH
is prepended. */
+{ "improved_mboxlist_sort", 0, SWITCH }
+/* If enabled, a special comparator will be used which will correctly
+ sort mailbox names that contain characters such as ' ' and '-'.
+.PP
+ Note that this option SHOULD NOT be changed on a live system.
+ The mailboxes database should be dumped before the option is changed,
+ removed, and then undumped after changing the option. */
+
{ "ldap_authz", NULL, STRING }
/* SASL authorization ID for the LDAP server */
@@ -581,12 +594,10 @@
{ "mupdate_workers_start", 5, INT }
/* The number of mupdate worker threads to start */
-{ "netscapeurl", "http://asg.web.cmu.edu/cyrus/imapd/netscape-admin.html", STRING }
+{ "netscapeurl", NULL, STRING }
/* If enabled at compile time, this specifies a URL to reply when
Netscape asks the server where the mail administration HTTP server
- is. The default is a site at CMU with a hopefully informative
- message; administrators should set this to a local resource with
- some information of greater use. */
+ is. Administrators should set this to a local resource. */
{ "newsmaster", "news", STRING }
/* Userid that is used for checking access controls when executing
@@ -904,6 +915,11 @@
{ "sync_authname", NULL, STRING }
/* The authentication name to use when authenticating to a sync server. */
+{ "sync_batch_size", 0, INT }
+/* Maximum number of messages to upload to a replica at one time.
+ A batch size of 0, the default, will disable batching (ALL messages
+ will be sent). */
+
{ "sync_host", NULL, STRING }
/* Name of the host (replica running sync_server(8)) to which
replication actions will be sent by sync_client(8). */
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/imapurl.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/imapurl.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/imapurl.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/imapurl.c Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
*
* derived from chris newman's code */
-/* $Id: imapurl.c,v 1.10.4.4 2005/11/17 15:46:30 murch Exp $ */
+/* $Id: imapurl.c,v 1.12 2006/11/30 17:11:22 murch Exp $ */
#include <stdio.h>
#include <string.h>
@@ -54,6 +54,30 @@
/* hexadecimal lookup table */
static const char hex[] = "0123456789ABCDEF";
+
+#define XX 127
+/*
+ * Table for decoding hexadecimal in %encoding
+ */
+static const char index_hex[256] = {
+ XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
+ XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
+ XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,XX,XX, XX,XX,XX,XX,
+ XX,10,11,12, 13,14,15,XX, XX,XX,XX,XX, XX,XX,XX,XX,
+ XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
+ XX,10,11,12, 13,14,15,XX, XX,XX,XX,XX, XX,XX,XX,XX,
+ XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
+ XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
+ XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
+ XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
+ XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
+ XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
+ XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
+ XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
+ XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX, XX,XX,XX,XX,
+};
+#define HEXCHAR(c) (index_hex[(unsigned char)(c)])
/* URL unsafe printable characters */
static const char urlunsafe[] = " \"#%&+:;<=>?@[\\]^`{|}";
@@ -173,19 +197,11 @@
* dst should be about twice the length of src to deal with non-hex
* coded URLs
*/
-static void URLtoMailbox(char *dst, char *src)
+static int URLtoMailbox(char *dst, char *src)
{
unsigned int utf8pos = 0, utf8total, i, c, utf7mode, bitstogo, utf16flag;
unsigned long ucs4 = 0, bitbuf = 0;
- unsigned char hextab[256];
-
- /* initialize hex lookup table */
- memset(hextab, 0, sizeof (hextab));
- for (i = 0; i < sizeof (hex); ++i) {
- hextab[(int) hex[i]] = i;
- if (isupper((unsigned char) hex[i])) hextab[tolower(hex[i])] = i;
- }
-
+
utf7mode = 0; /* is the output UTF7 currently in base64 mode? */
utf8total = 0; /* how many octets is the current input UTF-8 char;
0 == between characters */
@@ -195,7 +211,12 @@
++src;
/* undo hex-encoding */
if (c == '%' && src[0] != '\0' && src[1] != '\0') {
- c = (hextab[(int) src[0]] << 4) | hextab[(int) src[1]];
+ c = HEXCHAR(src[0]);
+ i = HEXCHAR(src[1]);
+ if (c == XX || i == XX)
+ return -1;
+ else
+ c = (char)((c << 4) | i);
src += 2;
}
@@ -300,11 +321,50 @@
/* tie off string */
*dst = '\0';
+
+ return 0;
}
-void imapurl_fromURL(struct imapurl *url, const char *s)
+/* Decode hex coded url
+ * dst can be the same location as src,
+ * since the decoded length will be shorter than the encoded length
+ */
+static int decode_url(char *dst, char *src)
+{
+ unsigned char c;
+ unsigned char i;
+
+ while ((c = (unsigned char)*src) != '\0') {
+ ++src;
+ /* undo hex-encoding */
+ if (c == '%' && src[0] != '\0' && src[1] != '\0') {
+ c = HEXCHAR(src[0]);
+ i = HEXCHAR(src[1]);
+ if (c == XX || i == XX)
+ return -1;
+ else
+ c = (char)((c << 4) | i);
+ src += 2;
+ }
+ *dst++ = (char) c;
+ }
+
+ /* tie off string */
+ *dst = '\0';
+
+ return 0;
+}
+
+static const int numdays[] = {
+ 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
+};
+
+#define isleap(year) (!((year) % 4) && (((year) % 100) || !((year) % 400)))
+
+int imapurl_fromURL(struct imapurl *url, const char *s)
{
char *src;
+ int step = 0; /* used to force correct ordering of url parts */
memset(url, 0, sizeof(struct imapurl));
url->freeme = xmalloc(3 * strlen(s) + 3); /* space for copy of URL +
@@ -316,11 +376,12 @@
src++;
se = strchr(src, '}');
- if (se == NULL) return;
+ if (se == NULL) return -1;
*se = '\0';
url->server = src;
url->mailbox = se + 1;
} else { /* IMAP URL */
+ int r;
char *se;
char *at;
char *mbox = NULL;
@@ -329,12 +390,14 @@
if (!strncmp(src, "imap://", 7)) { /* absolute URL */
src += 7; /* skip imap:// */
se = strchr(src, '/');
- if (se == NULL) return;
+ if (se == NULL) return -1;
at = strchr(src, '@');
if (at) {
*at = '\0';
url->user = src;
+ r = decode_url((char *) url->user, (char *) url->user);
+ if (r) return r;
src = at + 1;
}
*se = '\0';
@@ -347,50 +410,57 @@
}
/* parse options */
+ errno = 0;
while (src && (src = strchr(src, ';'))) {
unsigned long ul;
+ char *endp;
if (src[-1] == '/') src[-1] = '\0'; /* trim mailbox at /; */
*src++ = '\0'; /* break url at ; */
- if (!strncasecmp(src, "uidvalidity=", 12)) {
+ if (step == 0 && !strncasecmp(src, "uidvalidity=", 12)) {
src += 12; /* skip uidvalidity= */
- errno = 0;
- ul = strtoul(src, NULL, 10); /* ends at '/' or '\0' */
- if (ul < ULONG_MAX || !errno) url->uidvalidity = ul;
- }
- else if (!strncasecmp(src, "uid=", 4)) {
+ ul = strtoul(src, &endp, 10); /* ends at '/' or '\0' */
+ if (errno || endp == src) return -1;
+ url->uidvalidity = ul;
+ step = 1;
+ }
+ else if (step <= 1 && !strncasecmp(src, "uid=", 4)) {
src += 4; /* skip uid= */
- errno = 0;
- ul = strtoul(src, NULL, 10); /* ends at '/' or '\0' */
- if (ul < ULONG_MAX || !errno) url->uid = ul;
- }
- else if (!strncasecmp(src, "section=", 8)) {
+ ul = strtoul(src, &endp, 10); /* ends at '/' or '\0' */
+ if (errno || endp == src) return -1;
+ url->uid = ul;
+ step = 2;
+ }
+ else if (step == 2 && !strncasecmp(src, "section=", 8)) {
src += 8; /* skip section= */
url->section = src; /* ends at ';' (next pass) or '\0' */
- }
- else if (!strncasecmp(src, "partial=", 8)) {
+ step = 3;
+ }
+ else if (step >= 2 && step <= 3 && !strncasecmp(src, "partial=", 8)) {
src += 8; /* skip partial= */
- errno = 0;
- ul = strtoul(src, &src, 10); /* ends at '.', '/' or '\0' */
- if (ul < ULONG_MAX || !errno) url->start_octet = ul;
- if (*src == '.') {
- src++; /* skip . */
- errno = 0;
- ul = strtoul(src, NULL, 10); /* ends at '/' or '\0' */
- if (ul < ULONG_MAX || !errno) url->octet_count = ul;
- }
- }
- else if (!strncasecmp(src, "expire=", 7)) {
+ ul = strtoul(src, &endp, 10); /* ends at '.', '/' or '\0' */
+ if (errno || endp == src) return -1;
+ url->start_octet = ul;
+ if (*endp == '.') {
+ src = endp+1; /* skip . */
+ ul = strtoul(src, &endp, 10); /* ends at '/' or '\0' */
+ if (errno || endp == src) return -1;
+ url->octet_count = ul;
+ }
+ step = 4;
+ }
+ else if (step >= 2 && step < 5 && !strncasecmp(src, "expire=", 7)) {
struct tm exp;
- int tm_off, tm_houroff, tm_minoff;
+ int n, tm_off, leapday;
src += 7; /* skip expire= */
/* parse the ISO 8601 date/time */
memset(&exp, 0, sizeof(struct tm));
- sscanf(src, "%4d-%2d-%2dT%2d:%2d:%2d",
- &exp.tm_year, &exp.tm_mon, &exp.tm_mday,
- &exp.tm_hour, &exp.tm_min, &exp.tm_sec);
+ n = sscanf(src, "%4d-%2d-%2dT%2d:%2d:%2d",
+ &exp.tm_year, &exp.tm_mon, &exp.tm_mday,
+ &exp.tm_hour, &exp.tm_min, &exp.tm_sec);
+ if (n != 6) return -1;
src += 19;
if (*src == '.') {
@@ -403,41 +473,64 @@
case 'Z': tm_off = 0; break;
case '-': tm_off = -1; break;
case '+': tm_off = 1; break;
- default: fprintf(stderr, "illegal offset\n"); exit(1);
- }
- if (tm_off) sscanf(src, "%2d:%2d", &tm_houroff, &tm_minoff);
- tm_off *= 60 * (60 * tm_houroff + tm_minoff);
+ default: return -1;
+ }
+ if (tm_off) {
+ int tm_houroff, tm_minoff;
+
+ n = sscanf(src, "%2d:%2d", &tm_houroff, &tm_minoff);
+ if (n != 2) return -1;
+ tm_off *= 60 * (60 * tm_houroff + tm_minoff);
+ }
exp.tm_year -= 1900; /* normalize to years since 1900 */
exp.tm_mon--; /* normalize to months since January */
+ /* sanity check the date/time (including leap day & second) */
+ leapday = exp.tm_mon == 1 && isleap(exp.tm_year + 1900);
+ if (exp.tm_year < 70 || exp.tm_mon < 0 || exp.tm_mon > 11 ||
+ exp.tm_mday < 1 ||
+ exp.tm_mday > (numdays[exp.tm_mon] + leapday) ||
+ exp.tm_hour > 23 || exp.tm_min > 59 || exp.tm_sec > 60) {
+ return -1;
+ }
+
/* normalize to GMT */
url->urlauth.expire = mktime(&exp) - tm_off;
- }
- else if (!strncasecmp(src, "urlauth=", 8)) {
+ step = 5;
+ }
+ else if (step >= 2 && step < 6 && !strncasecmp(src, "urlauth=", 8)) {
+ char *u;
+
src += 8; /* skip urlauth= */
url->urlauth.access = src;
- if ((src = strchr(src, ':'))) {
- url->urlauth.rump_len = (src - url->freeme);
-
- *src++ = '\0'; /* break urlauth at : */
- url->urlauth.mech = src;
- if ((src = strchr(src, ':'))) {
- *src++ = '\0'; /* break urlauth at : */
- url->urlauth.token = src;
+ if ((u = strchr(src, ':'))) {
+ url->urlauth.rump_len = (u - url->freeme);
+
+ *u++ = '\0'; /* break urlauth at : */
+ url->urlauth.mech = u;
+ if ((u = strchr(u, ':'))) {
+ *u++ = '\0'; /* break urlauth at : */
+ url->urlauth.token = u;
}
+ src = u;
}
else {
url->urlauth.rump_len = strlen(s);
}
+ step = 6;
+ }
+ else {
+ return -1;
}
}
if (mbox && *mbox) {
url->mailbox = url->freeme + strlen(s) + 1;
- URLtoMailbox((char *) url->mailbox, mbox);
- }
- }
+ return URLtoMailbox((char *) url->mailbox, mbox);
+ }
+ }
+ return 0;
}
void imapurl_toURL(char *dst, struct imapurl *url)
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/imapurl.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/imapurl.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/imapurl.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/imapurl.h Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
*
*/
-/* $Id: imapurl.h,v 1.5.4.2 2005/11/17 15:46:30 murch Exp $ */
+/* $Id: imapurl.h,v 1.6 2006/11/30 17:11:22 murch Exp $ */
#ifndef IMAPURL_H
#define IMAPURL_H
@@ -73,7 +73,7 @@
* mailbox should be about twice the length of src to deal with non-hex
* coded URLs; server should be as large as src.
*/
-void imapurl_fromURL(struct imapurl *url, const char *src);
+int imapurl_fromURL(struct imapurl *url, const char *src);
/* Convert an IMAP mailbox to a URL path
* dst needs to have roughly 4 times the storage space of mailbox
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/imclient.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/imclient.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/imclient.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/imclient.c Tue Feb 27 04:17:11 2007
@@ -1,6 +1,6 @@
/* imclient.c -- Streaming IMxP client library
*
- * $Id: imclient.c,v 1.84.2.2 2005/10/28 14:51:22 ken3 Exp $
+ * $Id: imclient.c,v 1.88 2007/02/05 18:43:26 jeaton Exp $
*
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
@@ -78,6 +78,8 @@
#include "exitcodes.h"
#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
#include "imparse.h"
#include "imclient.h"
#include "nonblock.h"
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/imclient.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/imclient.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/imclient.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/imclient.h Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
/* imclient.h -- Streaming IMxP client library
- * $Id: imclient.h,v 1.26.2.1 2005/04/11 05:48:05 shadow Exp $
+ * $Id: imclient.h,v 1.28 2006/11/30 17:11:22 murch Exp $
*
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/iptostring.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/iptostring.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/iptostring.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/iptostring.c Tue Feb 27 04:17:11 2007
@@ -38,7 +38,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: iptostring.c,v 1.5.4.2 2004/03/24 19:53:15 ken3 Exp $ */
+/* $Id: iptostring.c,v 1.8 2006/11/30 17:11:22 murch Exp $ */
#include <config.h>
#include <stdlib.h>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/libconfig.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/libconfig.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/libconfig.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/libconfig.c Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
*
*/
-/* $Id: libconfig.c,v 1.2.2.15 2005/02/20 05:22:29 shadow Exp $ */
+/* $Id: libconfig.c,v 1.12 2007/01/05 19:54:20 jeaton Exp $ */
#include <config.h>
@@ -57,6 +57,8 @@
#include "libconfig.h"
#include "imapopts.h"
#include "xmalloc.h"
+#include "xstrlcat.h"
+#include "xstrlcpy.h"
#define CONFIGHASHSIZE 30 /* relatively small,
* because it is for overflow only */
@@ -186,7 +188,7 @@
void config_read(const char *alt_config)
{
- enum opttype opt = IMAPOPT_ZERO;
+ enum imapopt opt = IMAPOPT_ZERO;
char buf[4096];
char *p;
@@ -289,7 +291,7 @@
void config_read_file(const char *filename)
{
FILE *infile;
- enum opttype opt = IMAPOPT_ZERO;
+ enum imapopt opt = IMAPOPT_ZERO;
int lineno = 0;
char buf[4096], errbuf[1024];
char *p, *q, *key, *fullkey, *srvkey, *val, *newval;
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/libconfig.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/libconfig.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/libconfig.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/libconfig.h Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
/* libconfig.h -- Header for imapd.conf processing
- * $Id: libconfig.h,v 1.2.2.8 2005/02/20 03:23:45 shadow Exp $
+ * $Id: libconfig.h,v 1.5 2006/11/30 17:11:22 murch Exp $
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/libcyr_cfg.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/libcyr_cfg.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/libcyr_cfg.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/libcyr_cfg.c Tue Feb 27 04:17:11 2007
@@ -40,7 +40,7 @@
*
*/
/*
- * $Id: libcyr_cfg.c,v 1.2.2.12 2005/12/13 19:36:12 murch Exp $
+ * $Id: libcyr_cfg.c,v 1.13 2006/11/30 17:11:22 murch Exp $
*/
#include <config.h>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/libcyr_cfg.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/libcyr_cfg.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/libcyr_cfg.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/libcyr_cfg.h Tue Feb 27 04:17:11 2007
@@ -40,7 +40,7 @@
*
*/
/*
- * $Id: libcyr_cfg.h,v 1.2.2.9 2005/12/13 19:36:12 murch Exp $
+ * $Id: libcyr_cfg.h,v 1.10 2006/11/30 17:11:22 murch Exp $
*/
#ifndef INCLUDED_LIBCYR_CFG_H
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/message_uuid.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/message_uuid.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/message_uuid.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/message_uuid.c Tue Feb 27 04:17:11 2007
@@ -409,7 +409,7 @@
************************************************************************/
int
-message_uuid_unpack(struct message_uuid *uuid, const char *packed)
+message_uuid_unpack(struct message_uuid *uuid, const unsigned char *packed)
{
assert(MESSAGE_UUID_SIZE == MESSAGE_UUID_PACKED_SIZE);
@@ -455,7 +455,7 @@
message_uuid_from_text(struct message_uuid *uuid, const char *text)
{
const char *p = text;
- char *buf = &uuid->value[0];
+ unsigned char *buf = &uuid->value[0];
int i;
for (i = 0 ; i < MESSAGE_UUID_SIZE ; i++) {
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/message_uuid.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/message_uuid.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/message_uuid.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/message_uuid.h Tue Feb 27 04:17:11 2007
@@ -58,7 +58,7 @@
* (Wrapper for memcpy() with current implementation) */
int
-message_uuid_unpack(struct message_uuid *uuid, const char *packed);
+message_uuid_unpack(struct message_uuid *uuid, const unsigned char *packed);
/* Fetch Message UID from packed sequence (MESSAGE_UUID_PACKED_SIZE)
* (Wrapper for memcpy() with current implementation) */
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/mpool.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/mpool.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/mpool.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/mpool.c Tue Feb 27 04:17:11 2007
@@ -1,6 +1,6 @@
/* mpool.c memory pool management
*
- * $Id: mpool.c,v 1.14.2.1 2006/01/16 15:39:09 murch Exp $
+ * $Id: mpool.c,v 1.16 2006/11/30 17:11:22 murch Exp $
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/mpool.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/mpool.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/mpool.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/mpool.h Tue Feb 27 04:17:11 2007
@@ -1,6 +1,6 @@
/* mpool.h memory pool management
*
- * $Id: mpool.h,v 1.10.2.1 2006/01/16 15:39:09 murch Exp $
+ * $Id: mpool.h,v 1.12 2006/11/30 17:11:22 murch Exp $
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/prot.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/prot.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/prot.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/prot.c Tue Feb 27 04:17:11 2007
@@ -41,7 +41,7 @@
*
*/
/*
- * $Id: prot.c,v 1.82.2.13 2006/03/13 20:05:04 murch Exp $
+ * $Id: prot.c,v 1.89 2007/01/09 16:50:31 murch Exp $
*/
#include <config.h>
@@ -1223,7 +1223,7 @@
{
if(group) {
memset(group->group, 0,
- group->next_element * sizeof(struct protstream *));
+ group->nalloced * sizeof(struct protstream *));
group->next_element = 0;
}
}
@@ -1270,10 +1270,16 @@
/* find the protstream */
for (i = 0; i < group->next_element; i++) {
if (group->group[i] == item) {
+ /* slide all remaining elements down one slot */
+ group->next_element--;
+ for (; i < group->next_element; i++) {
+ group->group[i] = group->group[i+1];
+ }
group->group[i] = NULL;
return;
}
}
+ syslog(LOG_ERR, "protgroup_delete(): can't find protstream in group");
}
struct protstream *protgroup_getelement(struct protgroup *group,
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/prot.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/prot.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/prot.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/prot.h Tue Feb 27 04:17:11 2007
@@ -1,7 +1,7 @@
/* prot.h -- stdio-like module that handles buffering, SASL, and TLS
* details for I/O over sockets
*
- * $Id: prot.h,v 1.40.2.5 2006/02/01 19:25:42 murch Exp $
+ * $Id: prot.h,v 1.43 2006/11/30 17:11:22 murch Exp $
*
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/retry.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/retry.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/retry.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/retry.c Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
/* retry.c -- keep trying write system calls
- * $Id: retry.c,v 1.21.2.1 2004/01/15 20:24:38 ken3 Exp $
+ * $Id: retry.c,v 1.23 2006/11/30 17:11:22 murch Exp $
*
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/test/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/test/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/test/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/test/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,15 +1,15 @@
-/Makefile/1.1.2.1/Thu May 6 19:38:03 2004//Tcyrus-release-2-3-7
-/cyrusdb.INPUT/1.3/Thu Jan 24 21:55:56 2002//Tcyrus-release-2-3-7
-/cyrusdb.OUTPUT/1.3/Thu Jan 24 21:58:41 2002//Tcyrus-release-2-3-7
-/cyrusdb.c/1.7.8.2/Wed Jun 9 19:42:48 2004//Tcyrus-release-2-3-7
-/cyrusdblong.INPUT/1.1/Wed Feb 20 19:40:28 2002//Tcyrus-release-2-3-7
-/cyrusdblong.OUTPUT/1.1/Wed Feb 20 19:40:28 2002//Tcyrus-release-2-3-7
-/cyrusdbtxn.INPUT/1.1/Thu Jan 24 23:12:35 2002//Tcyrus-release-2-3-7
-/cyrusdbtxn.OUTPUT/1.1/Thu Jan 24 23:12:35 2002//Tcyrus-release-2-3-7
-/imapurl.c/1.1.2.3/Fri May 27 17:40:57 2005//Tcyrus-release-2-3-7
-/pool.c/1.3/Tue Nov 26 18:21:24 2002//Tcyrus-release-2-3-7
-/rnddb.c/1.6.4.1/Fri Dec 19 18:33:45 2003//Tcyrus-release-2-3-7
-/run/1.13/Wed Oct 22 18:03:06 2003//Tcyrus-release-2-3-7
-/testglob.c/1.2.2.1/Fri Dec 19 18:33:45 2003//Tcyrus-release-2-3-7
-/testglob2.c/1.2.2.1/Fri Dec 19 18:33:45 2003//Tcyrus-release-2-3-7
+/Makefile/1.1/Wed May 5 21:40:32 2004//
+/cyrusdb.INPUT/1.3/Thu Jan 24 21:55:56 2002//
+/cyrusdb.OUTPUT/1.3/Thu Jan 24 21:58:41 2002//
+/cyrusdb.c/1.11/Fri Jun 4 19:42:03 2004//
+/cyrusdblong.INPUT/1.1/Wed Feb 20 19:40:28 2002//
+/cyrusdblong.OUTPUT/1.1/Wed Feb 20 19:40:28 2002//
+/cyrusdbtxn.INPUT/1.1/Thu Jan 24 23:12:35 2002//
+/cyrusdbtxn.OUTPUT/1.1/Thu Jan 24 23:12:35 2002//
+/imapurl.c/1.3/Thu Nov 30 17:11:22 2006//
+/pool.c/1.3/Tue Nov 26 18:21:24 2002//
+/rnddb.c/1.7/Mon Dec 15 16:04:35 2003//
+/run/1.13/Wed Oct 22 18:03:06 2003//
+/testglob.c/1.2/Mon Dec 8 20:26:45 2003//
+/testglob2.c/1.2/Mon Dec 8 20:26:45 2003//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/util.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/util.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/util.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/util.c Tue Feb 27 04:17:11 2007
@@ -40,7 +40,7 @@
*
*/
/*
- * $Id: util.c,v 1.27.2.3 2004/09/09 18:47:11 shadow Exp $
+ * $Id: util.c,v 1.31 2006/11/30 17:11:22 murch Exp $
*/
#include <config.h>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/util.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/util.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/util.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/util.h Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
/* util.h -- general utility functions
- * $Id: util.h,v 1.17.2.1 2004/09/10 13:51:12 ken3 Exp $
+ * $Id: util.h,v 1.20 2007/01/09 17:04:10 murch Exp $
*
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
@@ -107,4 +107,10 @@
*/
extern int cyrus_mkdir(const char *path, mode_t mode);
+/* Some systems have very inefficient implementations of isdigit,
+ * and we use it in a lot of inner loops
+ */
+
+#define cyrus_isdigit(x) ((x) >= '0' && (x) <= '9')
+
#endif /* INCLUDED_UTIL_H */
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/xmalloc.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/xmalloc.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/xmalloc.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/xmalloc.c Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/*
- * $Id: xmalloc.c,v 1.29.4.1 2006/03/17 17:29:41 murch Exp $
+ * $Id: xmalloc.c,v 1.31 2006/11/30 17:11:22 murch Exp $
*/
#include <config.h>
#include <stdio.h>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/xmalloc.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/xmalloc.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/xmalloc.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/xmalloc.h Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
/* xmalloc.h -- Allocation package that calls fatal() when out of memory
- * $Id: xmalloc.h,v 1.25.2.1 2006/03/17 17:29:41 murch Exp $
+ * $Id: xmalloc.h,v 1.27 2006/11/30 17:11:22 murch Exp $
*
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/xstrlcat.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/xstrlcat.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/xstrlcat.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/xstrlcat.c Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/*
- * $Id: xstrlcat.c,v 1.1.2.2 2006/03/22 21:38:48 murch Exp $
+ * $Id: xstrlcat.c,v 1.2 2006/11/30 17:11:22 murch Exp $
*/
#include "xstrlcat.h"
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/xstrlcat.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/xstrlcat.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/xstrlcat.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/xstrlcat.h Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
/* xmalloc.h -- Allocation package that calls fatal() when out of memory
- * $Id: xstrlcat.h,v 1.1.2.2 2006/03/22 21:38:48 murch Exp $
+ * $Id: xstrlcat.h,v 1.2 2006/11/30 17:11:22 murch Exp $
*
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
@@ -44,10 +44,14 @@
#ifndef INCLUDED_XSTRLCAT_H
#define INCLUDED_XSTRLCAT_H
+#include <config.h>
+
/* for size_t */
#include <stdio.h>
/* for free() */
#include <stdlib.h>
+/* for strlen() */
+#include <string.h>
#ifndef HAVE_STRLCAT
extern size_t strlcat(char *dst, const char *src, size_t len);
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/xstrlcpy.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/xstrlcpy.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/xstrlcpy.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/xstrlcpy.c Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/*
- * $Id: xstrlcpy.c,v 1.1.2.2 2006/03/22 21:38:49 murch Exp $
+ * $Id: xstrlcpy.c,v 1.2 2006/11/30 17:11:22 murch Exp $
*/
#include "xstrlcpy.h"
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/xstrlcpy.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/xstrlcpy.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/xstrlcpy.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/lib/xstrlcpy.h Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
/* xmalloc.h -- Allocation package that calls fatal() when out of memory
- * $Id: xstrlcpy.h,v 1.1.2.2 2006/03/22 21:38:49 murch Exp $
+ * $Id: xstrlcpy.h,v 1.2 2006/11/30 17:11:22 murch Exp $
*
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
@@ -44,10 +44,14 @@
#ifndef INCLUDED_XSTRLCPY_H
#define INCLUDED_XSTRLCPY_H
+#include <config.h>
+
/* for size_t */
#include <stdio.h>
/* for free() */
#include <stdlib.h>
+/* for strlen() */
+#include <string.h>
/* handy string manipulation functions */
#ifndef HAVE_STRLCPY
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/makedepend/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/makedepend/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/makedepend/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/makedepend/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,15 +1,15 @@
-/Makefile.in/1.7/Tue May 23 20:56:21 2000//Tcyrus-release-2-3-7
-/configure/1.2/Tue May 23 20:56:21 2000//Tcyrus-release-2-3-7
-/configure.in/1.1/Wed Jul 5 19:27:31 1995//Tcyrus-release-2-3-7
-/cpp.ed/1.1/Wed Jul 5 18:49:33 1995//Tcyrus-release-2-3-7
-/cppsetup.c/1.3/Thu Feb 13 20:15:43 2003//Tcyrus-release-2-3-7
-/def.h/1.3/Thu Feb 13 20:15:43 2003//Tcyrus-release-2-3-7
-/ifparser.c/1.3/Thu Feb 13 20:15:43 2003//Tcyrus-release-2-3-7
-/ifparser.h/1.3/Thu Feb 13 20:15:43 2003//Tcyrus-release-2-3-7
-/include.c/1.3/Thu Feb 13 20:15:44 2003//Tcyrus-release-2-3-7
-/install-sh/1.2/Tue May 23 20:56:22 2000//Tcyrus-release-2-3-7
-/main.c/1.5/Thu Feb 13 20:15:44 2003//Tcyrus-release-2-3-7
-/mkdepend.man/1.1/Wed Jul 5 18:49:33 1995//Tcyrus-release-2-3-7
-/parse.c/1.3/Thu Feb 13 20:15:44 2003//Tcyrus-release-2-3-7
-/pr.c/1.3/Thu Feb 13 20:15:44 2003//Tcyrus-release-2-3-7
+/Makefile.in/1.7/Tue May 23 20:56:21 2000//
+/configure/1.2/Tue May 23 20:56:21 2000//
+/configure.in/1.1/Wed Jul 5 19:27:31 1995//
+/cpp.ed/1.1/Wed Jul 5 18:49:33 1995//
+/cppsetup.c/1.3/Thu Feb 13 20:15:43 2003//
+/def.h/1.3/Thu Feb 13 20:15:43 2003//
+/ifparser.c/1.3/Thu Feb 13 20:15:43 2003//
+/ifparser.h/1.3/Thu Feb 13 20:15:43 2003//
+/include.c/1.3/Thu Feb 13 20:15:44 2003//
+/install-sh/1.2/Tue May 23 20:56:22 2000//
+/main.c/1.5/Thu Feb 13 20:15:44 2003//
+/mkdepend.man/1.1/Wed Jul 5 18:49:33 1995//
+/parse.c/1.3/Thu Feb 13 20:15:44 2003//
+/pr.c/1.3/Thu Feb 13 20:15:44 2003//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,48 +1,48 @@
-/.cvsignore/1.2/Wed Oct 22 18:03:08 2003//Tcyrus-release-2-3-7
-/Makefile.dist/1.1.2.1/Wed Mar 24 19:53:16 2004//Tcyrus-release-2-3-7
-/Makefile.in/1.29.2.7/Tue Dec 13 15:16:45 2005//Tcyrus-release-2-3-7
-/arbitron.8/1.9.4.1/Mon Jan 16 15:43:08 2006//Tcyrus-release-2-3-7
-/chk_cyrus.8/1.3.4.1/Mon Jun 19 13:05:02 2006//Tcyrus-release-2-3-7
-/ctl_cyrusdb.8/1.6/Sat Aug 9 23:43:14 2003//Tcyrus-release-2-3-7
-/ctl_deliver.8/1.9/Wed Oct 22 18:50:13 2003//Tcyrus-release-2-3-7
-/ctl_mboxlist.8/1.8.4.1/Thu Apr 6 15:42:11 2006//Tcyrus-release-2-3-7
-/cvt_cyrusdb.8/1.3/Sat Aug 9 23:43:14 2003//Tcyrus-release-2-3-7
-/cyr_expire.8/1.2.2.2/Sat Apr 3 18:44:55 2004//Tcyrus-release-2-3-7
-/cyrus.conf.5/1.11.2.2/Sun Apr 24 20:20:26 2005//Tcyrus-release-2-3-7
-/deliver.8/1.17.8.2/Fri May 26 16:27:21 2006//Tcyrus-release-2-3-7
-/fetchnews.8/1.2.2.2/Wed Mar 23 00:32:51 2005//Tcyrus-release-2-3-7
-/fud.8/1.11/Wed Oct 22 18:50:13 2003//Tcyrus-release-2-3-7
-/idled.8/1.4/Sat Aug 9 23:43:14 2003//Tcyrus-release-2-3-7
-/imapd.8/1.15/Thu Oct 3 19:02:41 2002//Tcyrus-release-2-3-7
-/imclient.3/1.10.2.1/Mon Apr 11 05:48:09 2005//Tcyrus-release-2-3-7
-/imtest.1/1.13.2.1/Thu Dec 16 15:49:58 2004//Tcyrus-release-2-3-7
-/installsieve.1/1.5/Sat May 25 19:57:48 2002//Tcyrus-release-2-3-7
-/ipurge.8/1.7.2.1/Fri Dec 19 18:33:46 2003//Tcyrus-release-2-3-7
-/krb.equiv.5/1.10/Wed Oct 22 18:50:13 2003//Tcyrus-release-2-3-7
-/lmtpd.8/1.6/Thu Oct 3 19:02:41 2002//Tcyrus-release-2-3-7
-/lmtptest.1/1.6.2.1/Thu Dec 16 15:49:59 2004//Tcyrus-release-2-3-7
-/make_md5.8/1.1.2.1/Mon Feb 21 19:25:55 2005//Tcyrus-release-2-3-7
-/master.8/1.10.2.3/Fri Dec 17 18:15:18 2004//Tcyrus-release-2-3-7
-/mbexamine.8/1.3/Sat Aug 9 23:43:14 2003//Tcyrus-release-2-3-7
-/mbpath.8/1.5.4.1/Thu Apr 8 21:13:12 2004//Tcyrus-release-2-3-7
-/mupdatetest.1/1.5.2.1/Thu Dec 16 15:49:59 2004//Tcyrus-release-2-3-7
-/nntpd.8/1.2.2.1/Fri May 26 15:50:11 2006//Tcyrus-release-2-3-7
-/nntptest.1/1.2.2.1/Thu Dec 16 15:49:59 2004//Tcyrus-release-2-3-7
-/notifyd.8/1.7/Sat Aug 9 23:43:14 2003//Tcyrus-release-2-3-7
-/pop3d.8/1.13.4.1/Fri May 26 15:50:12 2006//Tcyrus-release-2-3-7
-/pop3test.1/1.9.2.1/Thu Dec 16 15:49:59 2004//Tcyrus-release-2-3-7
-/quota.8/1.11/Wed Oct 22 18:50:13 2003//Tcyrus-release-2-3-7
-/reconstruct.8/1.18.2.2/Mon Jun 19 12:59:37 2006//Tcyrus-release-2-3-7
-/rmnews.8/1.7/Sat Aug 9 23:43:14 2003//Tcyrus-release-2-3-7
-/sivtest.1/1.5.2.1/Thu Dec 16 15:49:59 2004//Tcyrus-release-2-3-7
-/smmapd.8/1.2.2.1/Fri Dec 19 18:33:46 2003//Tcyrus-release-2-3-7
-/smtptest.1/1.5.2.1/Thu Dec 16 15:50:00 2004//Tcyrus-release-2-3-7
-/squatter.8/1.6/Wed Oct 22 18:50:13 2003//Tcyrus-release-2-3-7
-/sync_client.8/1.1.2.5/Thu Mar 31 20:27:53 2005//Tcyrus-release-2-3-7
-/sync_reset.8/1.1.2.2/Sun Mar 13 01:24:13 2005//Tcyrus-release-2-3-7
-/sync_server.8/1.1.2.3/Fri May 26 15:50:12 2006//Tcyrus-release-2-3-7
-/syncnews.8/1.9/Sat Aug 9 23:43:15 2003//Tcyrus-release-2-3-7
-/timsieved.8/1.6.8.1/Fri Jul 16 14:37:41 2004//Tcyrus-release-2-3-7
-/tls_prune.8/1.3/Sat Aug 9 23:43:15 2003//Tcyrus-release-2-3-7
-/unexpunge.8/1.1.2.3/Tue May 3 01:36:59 2005//Tcyrus-release-2-3-7
+/.cvsignore/1.2/Wed Oct 22 18:03:08 2003//
+/Makefile.dist/1.2/Thu Nov 30 17:11:23 2006//
+/Makefile.in/1.36/Thu Nov 30 17:11:23 2006//
+/arbitron.8/1.15/Thu Nov 30 17:11:23 2006//
+/chk_cyrus.8/1.4/Mon Jun 19 13:05:54 2006//
+/ctl_cyrusdb.8/1.6/Sat Aug 9 23:43:14 2003//
+/ctl_deliver.8/1.9/Wed Oct 22 18:50:13 2003//
+/ctl_mboxlist.8/1.10/Thu Nov 30 17:11:23 2006//
+/cvt_cyrusdb.8/1.3/Sat Aug 9 23:43:14 2003//
+/cyr_expire.8/1.3/Thu Nov 30 17:11:23 2006//
+/cyrus.conf.5/1.13/Thu Nov 30 17:11:23 2006//
+/deliver.8/1.19/Thu Nov 30 17:11:23 2006//
+/fetchnews.8/1.5/Thu Nov 30 17:11:23 2006//
+/fud.8/1.11/Wed Oct 22 18:50:13 2003//
+/idled.8/1.4/Sat Aug 9 23:43:14 2003//
+/imapd.8/1.15/Thu Oct 3 19:02:41 2002//
+/imclient.3/1.12/Thu Nov 30 17:11:23 2006//
+/imtest.1/1.15/Thu Nov 30 17:11:23 2006//
+/installsieve.1/1.5/Sat May 25 19:57:48 2002//
+/ipurge.8/1.9/Thu Nov 30 17:11:23 2006//
+/krb.equiv.5/1.10/Wed Oct 22 18:50:13 2003//
+/lmtpd.8/1.6/Thu Oct 3 19:02:41 2002//
+/lmtptest.1/1.8/Thu Nov 30 17:11:23 2006//
+/make_md5.8/1.2/Thu Nov 30 17:11:23 2006//
+/master.8/1.14/Thu Nov 30 17:11:23 2006//
+/mbexamine.8/1.3/Sat Aug 9 23:43:14 2003//
+/mbpath.8/1.6/Thu Nov 30 17:11:23 2006//
+/mupdatetest.1/1.7/Thu Nov 30 17:11:23 2006//
+/nntpd.8/1.3/Thu Nov 30 17:11:23 2006//
+/nntptest.1/1.4/Thu Nov 30 17:11:23 2006//
+/notifyd.8/1.7/Sat Aug 9 23:43:14 2003//
+/pop3d.8/1.14/Thu Nov 30 17:11:23 2006//
+/pop3test.1/1.11/Thu Nov 30 17:11:23 2006//
+/quota.8/1.11/Wed Oct 22 18:50:13 2003//
+/reconstruct.8/1.21/Thu Nov 30 17:11:23 2006//
+/rmnews.8/1.7/Sat Aug 9 23:43:14 2003//
+/sivtest.1/1.7/Thu Nov 30 17:11:23 2006//
+/smmapd.8/1.3/Thu Nov 30 17:11:23 2006//
+/smtptest.1/1.7/Thu Nov 30 17:11:23 2006//
+/squatter.8/1.6/Wed Oct 22 18:50:13 2003//
+/sync_client.8/1.3/Tue Jan 9 16:51:21 2007//
+/sync_reset.8/1.2/Thu Nov 30 17:11:23 2006//
+/sync_server.8/1.2/Thu Nov 30 17:11:23 2006//
+/syncnews.8/1.9/Sat Aug 9 23:43:15 2003//
+/timsieved.8/1.7/Thu Nov 30 17:11:23 2006//
+/tls_prune.8/1.3/Sat Aug 9 23:43:15 2003//
+/unexpunge.8/1.2/Thu Nov 30 17:11:23 2006//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/Makefile.dist
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/Makefile.dist?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/Makefile.dist (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/Makefile.dist Tue Feb 27 04:17:11 2007
@@ -1,3 +1,3 @@
-# $Id: Makefile.dist,v 1.1.2.1 2004/03/24 19:53:16 ken3 Exp $
+# $Id: Makefile.dist,v 1.2 2006/11/30 17:11:23 murch Exp $
dist:
../tools/config2man ../lib/imapoptions > imapd.conf.5
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/Makefile.in
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/Makefile.in?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/Makefile.in (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/Makefile.in Tue Feb 27 04:17:11 2007
@@ -40,7 +40,7 @@
# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#
-# $Id: Makefile.in,v 1.29.2.7 2005/12/13 15:16:45 murch Exp $
+# $Id: Makefile.in,v 1.36 2006/11/30 17:11:23 murch Exp $
srcdir = @srcdir@
VPATH = @srcdir@
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/arbitron.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/arbitron.8?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/arbitron.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/arbitron.8 Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" $Id: arbitron.8,v 1.9.4.1 2006/01/16 15:43:08 murch Exp $
+.\" $Id: arbitron.8,v 1.15 2006/11/30 17:11:23 murch Exp $
.SH NAME
arbitron \- arbitron mailboxes
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/ctl_mboxlist.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/ctl_mboxlist.8?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/ctl_mboxlist.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/ctl_mboxlist.8 Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" $Id: ctl_mboxlist.8,v 1.8.4.1 2006/04/06 15:42:11 murch Exp $
+.\" $Id: ctl_mboxlist.8,v 1.10 2006/11/30 17:11:23 murch Exp $
.SH NAME
ctl_mboxlist \- perform operations on the mailbox list database
.SH SYNOPSIS
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/cyr_expire.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/cyr_expire.8?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/cyr_expire.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/cyr_expire.8 Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" $Id: cyr_expire.8,v 1.2.2.2 2004/04/03 18:44:55 ken3 Exp $
+.\" $Id: cyr_expire.8,v 1.3 2006/11/30 17:11:23 murch Exp $
.SH NAME
cyr_expire \- expire messages and duplicate delivery database entries
.SH SYNOPSIS
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/cyrus.conf.5
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/cyrus.conf.5?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/cyrus.conf.5 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/cyrus.conf.5 Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" $Id: cyrus.conf.5,v 1.11.2.2 2005/04/24 20:20:26 ken3 Exp $
+.\" $Id: cyrus.conf.5,v 1.13 2006/11/30 17:11:23 murch Exp $
.SH NAME
cyrus.conf \- Cyrus configuration file
.SH DESCRIPTION
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/deliver.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/deliver.8?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/deliver.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/deliver.8 Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" $Id: deliver.8,v 1.17.8.2 2006/05/26 16:27:21 murch Exp $
+.\" $Id: deliver.8,v 1.19 2006/11/30 17:11:23 murch Exp $
.SH NAME
deliver \- deliver mail to an IMAP mailbox
.SH SYNOPSIS
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/fetchnews.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/fetchnews.8?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/fetchnews.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/fetchnews.8 Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" $Id: fetchnews.8,v 1.2.2.2 2005/03/23 00:32:51 shadow Exp $
+.\" $Id: fetchnews.8,v 1.5 2006/11/30 17:11:23 murch Exp $
.SH NAME
fetchnews \- retrieve new articles from peer and feed to Cyrus
.SH SYNOPSIS
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/imclient.3
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/imclient.3?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/imclient.3 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/imclient.3 Tue Feb 27 04:17:11 2007
@@ -38,7 +38,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" $Id: imclient.3,v 1.10.2.1 2005/04/11 05:48:09 shadow Exp $
+.\" $Id: imclient.3,v 1.12 2006/11/30 17:11:23 murch Exp $
.SH NAME
imclient library - authenticating callback interface to IMAP/IMSP servers
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/imtest.1
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/imtest.1?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/imtest.1 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/imtest.1 Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" $Id: imtest.1,v 1.13.2.1 2004/12/16 15:49:58 ken3 Exp $
+.\" $Id: imtest.1,v 1.15 2006/11/30 17:11:23 murch Exp $
.SH NAME
imtest \- interactive IMAP test program
.SH SYNOPSIS
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/ipurge.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/ipurge.8?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/ipurge.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/ipurge.8 Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" $Id: ipurge.8,v 1.7.2.1 2003/12/19 18:33:46 ken3 Exp $
+.\" $Id: ipurge.8,v 1.9 2006/11/30 17:11:23 murch Exp $
.SH NAME
ipurge \- delete mail from IMAP mailbox or partition based on age or size
.SH SYNOPSIS
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/lmtptest.1
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/lmtptest.1?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/lmtptest.1 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/lmtptest.1 Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" $Id: lmtptest.1,v 1.6.2.1 2004/12/16 15:49:59 ken3 Exp $
+.\" $Id: lmtptest.1,v 1.8 2006/11/30 17:11:23 murch Exp $
.SH NAME
lmtptest \- interactive LMTP test program
.SH SYNOPSIS
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/master.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/master.8?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/master.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/master.8 Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" $Id: master.8,v 1.10.2.3 2004/12/17 18:15:18 ken3 Exp $
+.\" $Id: master.8,v 1.14 2006/11/30 17:11:23 murch Exp $
.SH NAME
master \- master Cyrus process
.SH SYNOPSIS
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/mbpath.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/mbpath.8?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/mbpath.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/mbpath.8 Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" $Id: mbpath.8,v 1.5.4.1 2004/04/08 21:13:12 ken3 Exp $
+.\" $Id: mbpath.8,v 1.6 2006/11/30 17:11:23 murch Exp $
.SH NAME
mbpath \- translate mailbox names to filesystem paths
.SH SYNOPSIS
@@ -86,4 +86,4 @@
.TP
.B /etc/imapd.conf
-.\" $Header: /cvs/src/cyrus/man/mbpath.8,v 1.5.4.1 2004/04/08 21:13:12 ken3 Exp $
+.\" $Header: /cvs/src/cyrus/man/mbpath.8,v 1.6 2006/11/30 17:11:23 murch Exp $
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/mupdatetest.1
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/mupdatetest.1?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/mupdatetest.1 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/mupdatetest.1 Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" $Id: mupdatetest.1,v 1.5.2.1 2004/12/16 15:49:59 ken3 Exp $
+.\" $Id: mupdatetest.1,v 1.7 2006/11/30 17:11:23 murch Exp $
.\"
.SH NAME
mupdatetest \- interactive MUPDATE test program
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/nntpd.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/nntpd.8?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/nntpd.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/nntpd.8 Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" $Id: nntpd.8,v 1.2.2.1 2006/05/26 15:50:11 murch Exp $
+.\" $Id: nntpd.8,v 1.3 2006/11/30 17:11:23 murch Exp $
.SH NAME
nntpd \- NNTP server process
.SH SYNOPSIS
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/nntptest.1
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/nntptest.1?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/nntptest.1 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/nntptest.1 Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" $Id: nntptest.1,v 1.2.2.1 2004/12/16 15:49:59 ken3 Exp $
+.\" $Id: nntptest.1,v 1.4 2006/11/30 17:11:23 murch Exp $
.SH NAME
nntptest \- interactive NNTP test program
.SH SYNOPSIS
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/pop3d.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/pop3d.8?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/pop3d.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/pop3d.8 Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" $Id: pop3d.8,v 1.13.4.1 2006/05/26 15:50:12 murch Exp $
+.\" $Id: pop3d.8,v 1.14 2006/11/30 17:11:23 murch Exp $
.SH NAME
pop3d \- POP3 server process
.SH SYNOPSIS
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/pop3test.1
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/pop3test.1?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/pop3test.1 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/pop3test.1 Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" $Id: pop3test.1,v 1.9.2.1 2004/12/16 15:49:59 ken3 Exp $
+.\" $Id: pop3test.1,v 1.11 2006/11/30 17:11:23 murch Exp $
.SH NAME
pop3test \- interactive POP3 test program
.SH SYNOPSIS
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/reconstruct.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/reconstruct.8?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/reconstruct.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/reconstruct.8 Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" $Id: reconstruct.8,v 1.18.2.2 2006/06/19 12:59:37 murch Exp $
+.\" $Id: reconstruct.8,v 1.21 2006/11/30 17:11:23 murch Exp $
.SH NAME
reconstruct \- reconstruct mailboxes
.SH SYNOPSIS
@@ -61,6 +61,13 @@
[
.B \-f
]
+[
+.B \-k
+]
+[
+.B \-s
+]
+
.IR mailbox ...
.br
.B reconstruct
@@ -130,6 +137,14 @@
a cyrus.header found there as new mailboxes. Useful for
restoring mailboxes from backups.
.TP
+.B \-k
+Preserve the cyrus.expunge file and the corresponding message files
+instead of deleting them.
+.TP
+.B \-s
+Adds synchronization records to the log, so the synchronization
+service can replicate the changes.
+.TP
.B \-m
.B NOTE: CURRENTLY UNAVAILABLE
.br
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/sivtest.1
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/sivtest.1?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/sivtest.1 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/sivtest.1 Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" $Id: sivtest.1,v 1.5.2.1 2004/12/16 15:49:59 ken3 Exp $
+.\" $Id: sivtest.1,v 1.7 2006/11/30 17:11:23 murch Exp $
.\"
.SH NAME
sivtest \- interactive MANAGESIEVE test program
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/smmapd.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/smmapd.8?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/smmapd.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/smmapd.8 Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" $Id: smmapd.8,v 1.2.2.1 2003/12/19 18:33:46 ken3 Exp $
+.\" $Id: smmapd.8,v 1.3 2006/11/30 17:11:23 murch Exp $
.SH NAME
SMMAPD \- Sendmail socket map daemon
.SH SYNOPSIS
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/smtptest.1
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/smtptest.1?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/smtptest.1 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/smtptest.1 Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" $Id: smtptest.1,v 1.5.2.1 2004/12/16 15:50:00 ken3 Exp $
+.\" $Id: smtptest.1,v 1.7 2006/11/30 17:11:23 murch Exp $
.\"
.SH NAME
smtptest \- interactive SMTP test program
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/sync_client.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/sync_client.8?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/sync_client.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/sync_client.8 Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" $Id: sync_client.8,v 1.1.2.5 2005/03/31 20:27:53 ken3 Exp $
+.\" $Id: sync_client.8,v 1.3 2007/01/09 16:51:21 murch Exp $
.SH NAME
sync_client \- client side of the synchronization (replication) engine
.SH SYNOPSIS
@@ -108,6 +108,10 @@
.TP
.BI \-l
Verbose logging mode.
+.TP
+.BI \-o
+Only attempt to connect to the backend server once rather than waiting
+up to 1000 seconds before giving up.
.TP
.BI \-C " config-file"
Read configuration options from \fIconfig-file\fR.
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/sync_reset.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/sync_reset.8?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/sync_reset.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/sync_reset.8 Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" $Id: sync_reset.8,v 1.1.2.2 2005/03/13 01:24:13 ken3 Exp $
+.\" $Id: sync_reset.8,v 1.2 2006/11/30 17:11:23 murch Exp $
.SH NAME
sync_reset \- Account reset utility. DANGER.
.SH SYNOPSIS
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/sync_server.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/sync_server.8?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/sync_server.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/sync_server.8 Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" $Id: sync_server.8,v 1.1.2.3 2006/05/26 15:50:12 murch Exp $
+.\" $Id: sync_server.8,v 1.2 2006/11/30 17:11:23 murch Exp $
.SH NAME
sync_server \- server side of the synchronization (replication) engine
.SH SYNOPSIS
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/timsieved.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/timsieved.8?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/timsieved.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/timsieved.8 Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" $Id: timsieved.8,v 1.6.8.1 2004/07/16 14:37:41 ken3 Exp $
+.\" $Id: timsieved.8,v 1.7 2006/11/30 17:11:23 murch Exp $
.SH NAME
timsieved \- CMU hack for getting sieve scripts onto the server
.SH SYNOPSIS
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/unexpunge.8
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/unexpunge.8?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/unexpunge.8 (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/man/unexpunge.8 Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" $Id: unexpunge.8,v 1.1.2.3 2005/05/03 01:36:59 ken3 Exp $
+.\" $Id: unexpunge.8,v 1.2 2006/11/30 17:11:23 murch Exp $
.SH NAME
unexpunge \- restore expunged (but yet unremoved) messages
.SH SYNOPSIS
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,16 +1,16 @@
-/.cvsignore/1.2/Wed Oct 22 18:03:09 2003//Tcyrus-release-2-3-7
-/CYRUS-MASTER.mib/1.4/Tue Aug 14 16:11:26 2001//Tcyrus-release-2-3-7
-/Makefile.in/1.17.2.5/Mon Feb 21 19:25:56 2005//Tcyrus-release-2-3-7
-/README/1.9/Wed Oct 22 18:03:09 2003//Tcyrus-release-2-3-7
-/cyrusMasterMIB.c/1.9.8.2/Tue May 25 01:28:18 2004//Tcyrus-release-2-3-7
-/cyrusMasterMIB.h/1.1/Sun Nov 5 22:11:28 2000//Tcyrus-release-2-3-7
-/master.c/1.85.2.15/Wed Apr 6 20:37:00 2005//Tcyrus-release-2-3-7
-/master.h/1.9.2.6/Wed Apr 6 20:37:01 2005//Tcyrus-release-2-3-7
-/masterconf.c/1.11.2.1/Fri Dec 19 18:33:47 2003//Tcyrus-release-2-3-7
-/masterconf.h/1.6/Wed Oct 22 18:50:14 2003//Tcyrus-release-2-3-7
-/message_uuid_master.c/1.1.2.4/Mon Apr 11 13:37:58 2005//Tcyrus-release-2-3-7
-/message_uuid_master.h/1.1.2.3/Wed Apr 6 20:37:01 2005//Tcyrus-release-2-3-7
-/service-thread.c/1.14.2.5/Thu Dec 1 21:18:11 2005//Tcyrus-release-2-3-7
-/service.c/1.45.2.9/Thu Dec 1 21:18:11 2005//Tcyrus-release-2-3-7
-/service.h/1.16/Wed Oct 22 18:50:14 2003//Tcyrus-release-2-3-7
+/.cvsignore/1.2/Wed Oct 22 18:03:09 2003//
+/CYRUS-MASTER.mib/1.4/Tue Aug 14 16:11:26 2001//
+/Makefile.in/1.22/Thu Nov 30 17:11:23 2006//
+/README/1.9/Wed Oct 22 18:03:09 2003//
+/cyrusMasterMIB.c/1.13/Thu Nov 30 17:11:23 2006//
+/cyrusMasterMIB.h/1.1/Sun Nov 5 22:11:28 2000//
+/master.c/1.104/Thu Nov 30 17:11:23 2006//
+/master.h/1.14/Thu Nov 30 17:11:23 2006//
+/masterconf.c/1.13/Thu Nov 30 17:11:23 2006//
+/masterconf.h/1.6/Wed Oct 22 18:50:14 2003//
+/message_uuid_master.c/1.2/Thu Nov 30 17:11:23 2006//
+/message_uuid_master.h/1.2/Thu Nov 30 17:11:23 2006//
+/service-thread.c/1.20/Thu Nov 30 17:11:23 2006//
+/service.c/1.57/Mon Feb 5 18:57:24 2007//
+/service.h/1.16/Wed Oct 22 18:50:14 2003//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/Makefile.in
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/Makefile.in?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/Makefile.in (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/Makefile.in Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
# Makefile for the Cyrus controlling process
-# $Id: Makefile.in,v 1.17.2.5 2005/02/21 19:25:56 ken3 Exp $
+# $Id: Makefile.in,v 1.22 2006/11/30 17:11:23 murch Exp $
#
# @configure_input@
#
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/conf/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/conf/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/conf/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/conf/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,6 +1,6 @@
-/cmu-backend.conf/1.3/Wed Oct 22 18:03:10 2003//Tcyrus-release-2-3-7
-/cmu-frontend.conf/1.2/Wed Oct 22 18:03:10 2003//Tcyrus-release-2-3-7
-/normal.conf/1.11.2.1/Thu Mar 30 16:10:05 2006//Tcyrus-release-2-3-7
-/prefork.conf/1.10/Wed Oct 22 18:03:10 2003//Tcyrus-release-2-3-7
-/small.conf/1.9/Tue Oct 1 20:46:01 2002//Tcyrus-release-2-3-7
+/cmu-backend.conf/1.3/Wed Oct 22 18:03:10 2003//
+/cmu-frontend.conf/1.2/Wed Oct 22 18:03:10 2003//
+/normal.conf/1.12/Thu Mar 30 16:01:39 2006//
+/prefork.conf/1.10/Wed Oct 22 18:03:10 2003//
+/small.conf/1.9/Tue Oct 1 20:46:01 2002//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/cyrusMasterMIB.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/cyrusMasterMIB.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/cyrusMasterMIB.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/cyrusMasterMIB.c Tue Feb 27 04:17:11 2007
@@ -11,6 +11,12 @@
#include <net-snmp/net-snmp-includes.h>
#include <net-snmp/agent/net-snmp-agent-includes.h>
#include <net-snmp/utilities.h>
+
+ extern int header_generic(struct variable *, oid *, size_t *, int,
+ size_t *, WriteMethod **);
+
+ extern int header_simple_table(struct variable *, oid *, size_t *,
+ int, size_t *, WriteMethod **, int);
#else
#ifdef IN_UCD_SNMP_SOURCE
@@ -129,7 +135,7 @@
{
/* variables we may use later */
static long long_ret;
- static unsigned char string[SPRINT_MAX_LEN];
+ static char string[SPRINT_MAX_LEN];
/* static oid objid[MAX_OID_LEN]; */
/* static struct counter64 c64; */
@@ -177,7 +183,7 @@
{
/* variables we may use later */
static long long_ret;
- static unsigned char string[SPRINT_MAX_LEN];
+ static char string[SPRINT_MAX_LEN];
/* static oid objid[MAX_OID_LEN]; */
/* static struct counter64 c64; */
int index;
@@ -212,10 +218,14 @@
return (unsigned char *) &long_ret;
case SERVICENAME:
- strlcpy(string, Services[index - 1].name, sizeof(string));
- if(Services[index - 1].family == AF_INET6) {
- strlcat(string, "[v6]", sizeof(string));
- }
+ if (Services[index - 1].name != NULL) {
+ strlcpy(string, Services[index - 1].name, sizeof(string));
+ if(Services[index - 1].family == AF_INET6) {
+ strlcat(string, "[v6]", sizeof(string));
+ }
+ } else {
+ strlcpy(string, "", sizeof(string));
+ }
*var_len = strlen(string);
return (unsigned char *) string;
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/master.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/master.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/master.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/master.c Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: master.c,v 1.85.2.15 2005/04/06 20:37:00 ken3 Exp $ */
+/* $Id: master.c,v 1.104 2006/11/30 17:11:23 murch Exp $ */
#include <config.h>
@@ -88,7 +88,11 @@
#if defined(HAVE_NETSNMP)
#include <net-snmp/net-snmp-config.h>
#include <net-snmp/net-snmp-includes.h>
+ #include <net-snmp/agent/agent_module_config.h>
#include <net-snmp/agent/net-snmp-agent-includes.h>
+
+ #include "cyrusMasterMIB.h"
+
#elif defined(HAVE_UCDSNMP)
#include <ucd-snmp/ucd-snmp-config.h>
#include <ucd-snmp/ucd-snmp-includes.h>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/master.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/master.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/master.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/master.h Tue Feb 27 04:17:11 2007
@@ -1,7 +1,7 @@
#ifndef HAVE_MASTER_H
#define HAVE_MASTER_H
-/* $Id: master.h,v 1.9.2.6 2005/04/06 20:37:01 ken3 Exp $ */
+/* $Id: master.h,v 1.14 2006/11/30 17:11:23 murch Exp $ */
#include <config.h>
#include <sys/resource.h> /* for rlim_t */
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/masterconf.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/masterconf.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/masterconf.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/masterconf.c Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
/* masterconfig.c -- Configuration routines for master process
- * $Id: masterconf.c,v 1.11.2.1 2003/12/19 18:33:47 ken3 Exp $
+ * $Id: masterconf.c,v 1.13 2006/11/30 17:11:23 murch Exp $
*
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/message_uuid_master.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/message_uuid_master.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/message_uuid_master.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/message_uuid_master.c Tue Feb 27 04:17:11 2007
@@ -20,6 +20,7 @@
#include "master.h"
#include "message_uuid_master.h"
+#include "xmalloc.h"
/* Four possible forms of messageID:
*
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/service-thread.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/service-thread.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/service-thread.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/service-thread.c Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: service-thread.c,v 1.14.2.5 2005/12/01 21:18:11 murch Exp $ */
+/* $Id: service-thread.c,v 1.20 2006/11/30 17:11:23 murch Exp $ */
#include <config.h>
#include <stdio.h>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/service.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/service.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/service.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/master/service.c Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-/* $Id: service.c,v 1.45.2.9 2005/12/01 21:18:11 murch Exp $ */
+/* $Id: service.c,v 1.57 2007/02/05 18:57:24 jeaton Exp $ */
#include <config.h>
@@ -70,6 +70,8 @@
#include "service.h"
#include "libconfig.h"
#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
#include "signals.h"
extern int optind, opterr;
@@ -335,6 +337,11 @@
exit(EX_SOFTWARE);
}
id = atoi(p);
+
+ /* pick a random timeout between reuse_timeout -> 2*reuse_timeout
+ * to avoid massive IO overload if the network connection goes away */
+ srand(time(NULL) * getpid());
+ reuse_timeout = reuse_timeout + (rand() % reuse_timeout);
cyrus_init(alt_config, service, 0);
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/netnews/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/netnews/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/netnews/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/netnews/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,8 +1,8 @@
-/.cvsignore/1.2/Wed Oct 22 18:03:11 2003//Tcyrus-release-2-3-7
-/Makefile.in/1.8.2.1/Fri Dec 19 18:33:48 2003//Tcyrus-release-2-3-7
-/inn.diffs/1.3/Sat May 25 19:57:49 2002//Tcyrus-release-2-3-7
-/macros.h/1.7/Wed Oct 22 18:50:15 2003//Tcyrus-release-2-3-7
-/readconfig.c/1.8/Wed Oct 22 18:50:15 2003//Tcyrus-release-2-3-7
-/readconfig.h/1.4/Thu Feb 13 20:15:47 2003//Tcyrus-release-2-3-7
-/remotepurge.c/1.18/Thu Feb 13 20:15:47 2003//Tcyrus-release-2-3-7
+/.cvsignore/1.2/Wed Oct 22 18:03:11 2003//
+/Makefile.in/1.10/Thu Nov 30 17:11:23 2006//
+/inn.diffs/1.3/Sat May 25 19:57:49 2002//
+/macros.h/1.7/Wed Oct 22 18:50:15 2003//
+/readconfig.c/1.8/Wed Oct 22 18:50:15 2003//
+/readconfig.h/1.4/Thu Feb 13 20:15:47 2003//
+/remotepurge.c/1.18/Thu Feb 13 20:15:47 2003//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/netnews/Makefile.in
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/netnews/Makefile.in?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/netnews/Makefile.in (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/netnews/Makefile.in Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#
-# $Id: Makefile.in,v 1.8.2.1 2003/12/19 18:33:48 ken3 Exp $
+# $Id: Makefile.in,v 1.10 2006/11/30 17:11:23 murch Exp $
#
srcdir = @srcdir@
VPATH = @srcdir@
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/notifyd/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/notifyd/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/notifyd/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/notifyd/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,16 +1,16 @@
-/.cvsignore/1.2/Wed Oct 22 18:03:13 2003//Tcyrus-release-2-3-7
-/Makefile.in/1.7.2.3/Mon May 31 18:22:59 2004//Tcyrus-release-2-3-7
-/exitcodes.h/1.2/Thu Feb 13 20:15:48 2003//Tcyrus-release-2-3-7
-/notify_log.c/1.7/Wed Oct 22 18:50:16 2003//Tcyrus-release-2-3-7
-/notify_log.h/1.5/Thu Feb 13 20:15:48 2003//Tcyrus-release-2-3-7
-/notify_mailto.c/1.8.2.3/Thu Mar 30 16:08:56 2006//Tcyrus-release-2-3-7
-/notify_mailto.h/1.5/Thu Feb 13 20:15:48 2003//Tcyrus-release-2-3-7
-/notify_null.c/1.6/Thu Feb 13 20:15:48 2003//Tcyrus-release-2-3-7
-/notify_null.h/1.5/Thu Feb 13 20:15:48 2003//Tcyrus-release-2-3-7
-/notify_zephyr.c/1.4.4.1/Wed Dec 14 13:52:56 2005//Tcyrus-release-2-3-7
-/notify_zephyr.h/1.3/Thu Feb 13 20:15:48 2003//Tcyrus-release-2-3-7
-/notifyd.c/1.14.2.5/Wed Apr 13 15:43:36 2005//Tcyrus-release-2-3-7
-/notifyd.h/1.2/Thu Feb 13 20:15:48 2003//Tcyrus-release-2-3-7
-/notifytest.c/1.10/Thu Feb 13 20:15:48 2003//Tcyrus-release-2-3-7
-/version.h/1.2/Thu Feb 13 20:15:48 2003//Tcyrus-release-2-3-7
+/.cvsignore/1.2/Wed Oct 22 18:03:13 2003//
+/Makefile.in/1.11/Thu Nov 30 17:11:23 2006//
+/exitcodes.h/1.2/Thu Feb 13 20:15:48 2003//
+/notify_log.c/1.7/Wed Oct 22 18:50:16 2003//
+/notify_log.h/1.5/Thu Feb 13 20:15:48 2003//
+/notify_mailto.c/1.12/Thu Nov 30 17:11:23 2006//
+/notify_mailto.h/1.5/Thu Feb 13 20:15:48 2003//
+/notify_null.c/1.6/Thu Feb 13 20:15:48 2003//
+/notify_null.h/1.5/Thu Feb 13 20:15:48 2003//
+/notify_zephyr.c/1.5/Thu Nov 30 17:11:23 2006//
+/notify_zephyr.h/1.3/Thu Feb 13 20:15:48 2003//
+/notifyd.c/1.20/Thu Nov 30 17:11:23 2006//
+/notifyd.h/1.2/Thu Feb 13 20:15:48 2003//
+/notifytest.c/1.10/Thu Feb 13 20:15:48 2003//
+/version.h/1.2/Thu Feb 13 20:15:48 2003//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/notifyd/Makefile.in
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/notifyd/Makefile.in?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/notifyd/Makefile.in (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/notifyd/Makefile.in Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
# Makefile.in - notifyd makefile
-# $Id: Makefile.in,v 1.7.2.3 2004/05/31 18:22:59 ken3 Exp $
+# $Id: Makefile.in,v 1.11 2006/11/30 17:11:23 murch Exp $
# @configure_input@
#
# Copyright (c) 1998-2000 Carnegie Mellon University. All rights reserved.
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/notifyd/notify_mailto.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/notifyd/notify_mailto.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/notifyd/notify_mailto.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/notifyd/notify_mailto.c Tue Feb 27 04:17:11 2007
@@ -40,7 +40,7 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: notify_mailto.c,v 1.8.2.3 2006/03/30 16:08:56 murch Exp $
+ * $Id: notify_mailto.c,v 1.12 2006/11/30 17:11:23 murch Exp $
*/
#include <config.h>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/notifyd/notify_zephyr.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/notifyd/notify_zephyr.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/notifyd/notify_zephyr.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/notifyd/notify_zephyr.c Tue Feb 27 04:17:11 2007
@@ -40,7 +40,7 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: notify_zephyr.c,v 1.4.4.1 2005/12/14 13:52:56 murch Exp $
+ * $Id: notify_zephyr.c,v 1.5 2006/11/30 17:11:23 murch Exp $
*/
#include <config.h>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/notifyd/notifyd.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/notifyd/notifyd.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/notifyd/notifyd.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/notifyd/notifyd.c Tue Feb 27 04:17:11 2007
@@ -40,7 +40,7 @@
* AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: notifyd.c,v 1.14.2.5 2005/04/13 15:43:36 shadow Exp $
+ * $Id: notifyd.c,v 1.20 2006/11/30 17:11:23 murch Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -189,7 +189,6 @@
}
/* never reached */
- return 0;
}
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,3 +1,3 @@
-/.cvsignore/1.1/Sun Jan 6 02:03:32 2002//Tcyrus-release-2-3-7
-/Makefile.in/1.14/Wed Oct 22 18:50:17 2003//Tcyrus-release-2-3-7
+/.cvsignore/1.1/Sun Jan 6 02:03:32 2002//
+/Makefile.in/1.14/Wed Oct 22 18:50:17 2003//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,12 +1,12 @@
-/.cvsignore/1.1/Sun Jan 6 02:03:32 2002//Tcyrus-release-2-3-7
-/Changes/1.1/Wed May 3 17:30:54 2000//Tcyrus-release-2-3-7
-/IMAP.pm/1.19.2.4/Tue Feb 7 18:57:19 2006//Tcyrus-release-2-3-7
-/IMAP.xs/1.23.4.3/Tue Feb 7 18:57:20 2006//Tcyrus-release-2-3-7
-/MANIFEST/1.3/Thu Dec 7 22:40:24 2000//Tcyrus-release-2-3-7
-/Makefile.PL/1.17.2.1/Tue Feb 7 18:57:20 2006//Tcyrus-release-2-3-7
-/README/1.2.8.1/Fri Dec 19 18:33:50 2003//Tcyrus-release-2-3-7
-/cyradm.sh/1.13.2.6/Fri Mar 31 19:22:29 2006//Tcyrus-release-2-3-7
-/cyrperl.h/1.7/Thu Feb 13 20:15:49 2003//Tcyrus-release-2-3-7
-/typemap/1.2/Wed May 3 21:37:20 2000//Tcyrus-release-2-3-7
-/xsutil.c/1.5/Thu Feb 13 20:15:49 2003//Tcyrus-release-2-3-7
+/.cvsignore/1.1/Sun Jan 6 02:03:32 2002//
+/Changes/1.1/Wed May 3 17:30:54 2000//
+/IMAP.pm/1.23/Thu Nov 30 17:11:23 2006//
+/IMAP.xs/1.25/Thu Nov 30 17:11:23 2006//
+/MANIFEST/1.3/Thu Dec 7 22:40:24 2000//
+/Makefile.PL/1.18/Thu Nov 30 17:11:23 2006//
+/README/1.4/Thu Nov 30 17:11:23 2006//
+/cyradm.sh/1.18/Thu Nov 30 17:11:23 2006//
+/cyrperl.h/1.7/Thu Feb 13 20:15:49 2003//
+/typemap/1.2/Wed May 3 21:37:20 2000//
+/xsutil.c/1.5/Thu Feb 13 20:15:49 2003//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/CVS/Entries.Log
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/CVS/Entries.Log?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/CVS/Entries.Log (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/CVS/Entries.Log Tue Feb 27 04:17:11 2007
@@ -2,4 +2,3 @@
A D/IMAP////
A D/examples////
A D/t////
-R D/Cyrus////
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/IMAP.pm
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/IMAP.pm?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/IMAP.pm (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/IMAP.pm Tue Feb 27 04:17:11 2007
@@ -37,7 +37,7 @@
# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#
-# $Id: IMAP.pm,v 1.19.2.4 2006/02/07 18:57:19 murch Exp $
+# $Id: IMAP.pm,v 1.23 2006/11/30 17:11:23 murch Exp $
package Cyrus::IMAP;
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/IMAP.xs
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/IMAP.xs?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/IMAP.xs (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/IMAP.xs Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
*
*/
-/* $Id: IMAP.xs,v 1.23.4.3 2006/02/07 18:57:20 murch Exp $ */
+/* $Id: IMAP.xs,v 1.25 2006/11/30 17:11:23 murch Exp $ */
/*
* Perl interface to the Cyrus imclient routines. This enables the
@@ -111,12 +111,13 @@
* the reply struct becomes a hash (passed as a list).
*/
-void imclient_xs_cb(struct imclient *client, struct xsccb *rock,
+void imclient_xs_cb(struct imclient *client, void *prock,
struct imclient_reply *reply)
{
dSP;
dTARG;
SV* rv;
+ struct xsccb *rock = (struct xsccb *) prock;
/* push our args onto Perl's stack */
ENTER;
@@ -156,10 +157,11 @@
* ::_send, which is calling imclient_processoneevent() repeatedly. (This
* simulates a non-callback-based invocation, for trivial clients.)
*/
-void imclient_xs_fcmdcb(struct imclient *client, struct xsccb *rock,
+void imclient_xs_fcmdcb(struct imclient *client, void *prock,
struct imclient_reply *reply)
{
AV *av;
+ struct xsccb *rock = (struct xsccb *) prock;
/* SvREFCNT_dec(SvRV(rock->prock)); */
SvRV(rock->prock) = (SV *) (av = newAV());
@@ -204,7 +206,7 @@
ptr = getpass("");
text->password = safemalloc(sizeof(sasl_secret_t) + strlen(ptr));
text->password->len = strlen(ptr);
- strncpy(text->password->data, ptr, text->password->len);
+ strncpy((char *) text->password->data, ptr, text->password->len);
}
*psecret = text->password;
return SASL_OK;
@@ -406,7 +408,7 @@
client->password =
safemalloc(sizeof(sasl_secret_t) + strlen(password));
client->password->len = strlen(password);
- strncpy(client->password->data, password, client->password->len);
+ strncpy((char *) client->password->data, password, client->password->len);
}
rc = imclient_authenticate(client->imclient, mechlist, service, user,
@@ -633,8 +635,8 @@
/* and do it to it */
imclient_send(client->imclient,
(SvTRUE(pcb) ?
- (void *) imclient_xs_cb :
- (void *) imclient_xs_fcmdcb),
+ imclient_xs_cb :
+ imclient_xs_fcmdcb),
(void *) rock, xstr);
safefree(xstr);
/* if there was no Perl callback, spin on events until finished */
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/IMAP/Admin.pm
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/IMAP/Admin.pm?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/IMAP/Admin.pm (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/IMAP/Admin.pm Tue Feb 27 04:17:11 2007
@@ -37,7 +37,7 @@
# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#
-# $Id: Admin.pm,v 1.39.2.7 2006/03/31 19:22:35 murch Exp $
+# $Id: Admin.pm,v 1.49 2006/11/30 17:11:23 murch Exp $
package Cyrus::IMAP::Admin;
use strict;
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/IMAP/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/IMAP/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/IMAP/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/IMAP/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,4 +1,4 @@
-/Admin.pm/1.39.2.7/Fri Mar 31 19:22:35 2006//Tcyrus-release-2-3-7
-/IMSP.pm/1.3/Sat May 25 19:57:49 2002//Tcyrus-release-2-3-7
-/Shell.pm/1.31.2.7/Fri Mar 31 19:22:35 2006//Tcyrus-release-2-3-7
+/Admin.pm/1.49/Thu Nov 30 17:11:23 2006//
+/IMSP.pm/1.3/Sat May 25 19:57:49 2002//
+/Shell.pm/1.38/Thu Nov 30 17:11:24 2006//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/IMAP/Shell.pm
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/IMAP/Shell.pm?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/IMAP/Shell.pm (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/IMAP/Shell.pm Tue Feb 27 04:17:11 2007
@@ -37,7 +37,7 @@
# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#
-# $Id: Shell.pm,v 1.31.2.7 2006/03/31 19:22:35 murch Exp $
+# $Id: Shell.pm,v 1.38 2006/11/30 17:11:24 murch Exp $
#
# A shell framework for Cyrus::IMAP::Admin
#
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/Makefile.PL
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/Makefile.PL?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/Makefile.PL (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/Makefile.PL Tue Feb 27 04:17:11 2007
@@ -36,7 +36,7 @@
# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#
-# $Id: Makefile.PL,v 1.17.2.1 2006/02/07 18:57:20 murch Exp $
+# $Id: Makefile.PL,v 1.18 2006/11/30 17:11:23 murch Exp $
use ExtUtils::MakeMaker;
use Config;
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/README
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/README?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/README (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/README Tue Feb 27 04:17:11 2007
@@ -1,4 +1,4 @@
-$Id: README,v 1.2.8.1 2003/12/19 18:33:50 ken3 Exp $
+$Id: README,v 1.4 2006/11/30 17:11:23 murch Exp $
This is a Perl interface to the Cyrus imclient library, and an administrative
library, and a replacement for the "cyradm" shell. The imclient library is
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/cyradm.sh
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/cyradm.sh?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/cyradm.sh (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/cyradm.sh Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#
#
-# $Id: cyradm.sh,v 1.13.2.6 2006/03/31 19:22:29 murch Exp $
+# $Id: cyradm.sh,v 1.18 2006/11/30 17:11:23 murch Exp $
case "x$BASH_VERSION" in
x) exec perl -MCyrus::IMAP::Shell -e shell -- ${1+"$@"} ;;
*) exec perl -MCyrus::IMAP::Shell -e shell -- "$@" ;;
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/examples/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/examples/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/examples/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/examples/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
-/auditmbox.pl/1.3.8.1/Fri Dec 19 18:33:52 2003//Tcyrus-release-2-3-7
-/imapcollate.pl/1.5/Sat May 25 19:57:50 2002//Tcyrus-release-2-3-7
-/imapdu.pl/1.8/Fri Nov 30 19:30:45 2001//Tcyrus-release-2-3-7
-/test-imsp.pl/1.2/Sat May 25 19:57:50 2002//Tcyrus-release-2-3-7
+/auditmbox.pl/1.5/Thu Nov 30 17:11:24 2006//
+/imapcollate.pl/1.5/Sat May 25 19:57:50 2002//
+/imapdu.pl/1.8/Fri Nov 30 19:30:45 2001//
+/test-imsp.pl/1.2/Sat May 25 19:57:50 2002//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/examples/auditmbox.pl
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/examples/auditmbox.pl?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/examples/auditmbox.pl (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/examples/auditmbox.pl Tue Feb 27 04:17:11 2007
@@ -38,7 +38,7 @@
# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#
-# $Id: auditmbox.pl,v 1.3.8.1 2003/12/19 18:33:52 ken3 Exp $
+# $Id: auditmbox.pl,v 1.5 2006/11/30 17:11:24 murch Exp $
#
# This script WON'T work for you. Guaranteed.
# It checks CMU ECE policy, and your policy *will* be different.
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/t/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/t/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/t/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/imap/t/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,3 +1,3 @@
-/01-imclient.t/1.4/Sat May 25 19:57:50 2002//Tcyrus-release-2-3-7
-/02-admin.t/1.4/Sat May 25 19:57:50 2002//Tcyrus-release-2-3-7
+/01-imclient.t/1.4/Sat May 25 19:57:50 2002//
+/02-admin.t/1.4/Sat May 25 19:57:50 2002//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,5 +1,3 @@
-/.cvsignore/1.1/Sun Jan 6 02:03:32 2002//Tcyrus-release-2-3-7
-/Makefile.in/1.16/Wed Oct 22 18:50:24 2003//Tcyrus-release-2-3-7
-D/lib////
-D/managesieve////
-D/scripts////
+/.cvsignore/1.1/Sun Jan 6 02:03:32 2002//
+/Makefile.in/1.16/Wed Oct 22 18:50:24 2003//
+D
Added: branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/CVS/Entries.Log
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/CVS/Entries.Log?rev=702&root=cyrus22&view=auto
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/CVS/Entries.Log (added)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/CVS/Entries.Log Tue Feb 27 04:17:11 2007
@@ -1,0 +1,4 @@
+A D/acap////
+A D/lib////
+A D/managesieve////
+A D/scripts////
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/lib/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/lib/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/lib/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/lib/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,13 +1,13 @@
-/.cvsignore/1.2/Wed Oct 22 18:03:19 2003//Tcyrus-release-2-3-7
-/Makefile.in/1.9.2.3/Mon May 31 18:23:00 2004//Tcyrus-release-2-3-7
-/codes.h/1.4/Thu Feb 13 20:15:53 2003//Tcyrus-release-2-3-7
-/exitcodes.h/1.3/Thu Feb 13 20:15:53 2003//Tcyrus-release-2-3-7
-/isieve.c/1.27.2.2/Thu Apr 21 21:04:50 2005//Tcyrus-release-2-3-7
-/isieve.h/1.10/Thu Feb 13 20:15:53 2003//Tcyrus-release-2-3-7
-/lex.c/1.7/Thu Feb 13 20:15:53 2003//Tcyrus-release-2-3-7
-/lex.h/1.7/Thu Feb 13 20:15:53 2003//Tcyrus-release-2-3-7
-/mystring.c/1.7/Thu Feb 13 20:15:53 2003//Tcyrus-release-2-3-7
-/mystring.h/1.5/Thu Feb 13 20:15:53 2003//Tcyrus-release-2-3-7
-/request.c/1.16/Thu Feb 13 20:15:53 2003//Tcyrus-release-2-3-7
-/request.h/1.7/Thu Feb 13 20:15:53 2003//Tcyrus-release-2-3-7
+/.cvsignore/1.2/Wed Oct 22 18:03:19 2003//
+/Makefile.in/1.15/Thu Nov 30 17:11:24 2006//
+/codes.h/1.4/Thu Feb 13 20:15:53 2003//
+/exitcodes.h/1.3/Thu Feb 13 20:15:53 2003//
+/isieve.c/1.30/Thu Nov 30 17:11:24 2006//
+/isieve.h/1.10/Thu Feb 13 20:15:53 2003//
+/lex.c/1.8/Thu Nov 30 17:11:24 2006//
+/lex.h/1.7/Thu Feb 13 20:15:53 2003//
+/mystring.c/1.7/Thu Feb 13 20:15:53 2003//
+/mystring.h/1.5/Thu Feb 13 20:15:53 2003//
+/request.c/1.16/Thu Feb 13 20:15:53 2003//
+/request.h/1.7/Thu Feb 13 20:15:53 2003//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/lib/Makefile.in
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/lib/Makefile.in?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/lib/Makefile.in (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/lib/Makefile.in Tue Feb 27 04:17:11 2007
@@ -40,7 +40,7 @@
# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#
-# $Id: Makefile.in,v 1.9.2.3 2004/05/31 18:23:00 ken3 Exp $
+# $Id: Makefile.in,v 1.15 2006/11/30 17:11:24 murch Exp $
#
srcdir = @srcdir@
top_srcdir = @top_srcdir@
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/lib/isieve.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/lib/isieve.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/lib/isieve.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/lib/isieve.c Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
*
*/
-/* $Id: isieve.c,v 1.27.2.2 2005/04/21 21:04:50 shadow Exp $ */
+/* $Id: isieve.c,v 1.30 2006/11/30 17:11:24 murch Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/lib/lex.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/lib/lex.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/lib/lex.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/lib/lex.c Tue Feb 27 04:17:11 2007
@@ -1,6 +1,6 @@
/* lex.c -- lexers for command line script installer
* Tim Martin
- * $Id: lex.c,v 1.7 2003/02/13 20:15:53 rjs3 Exp $
+ * $Id: lex.c,v 1.8 2006/11/30 17:11:24 murch Exp $
*/
/*
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
@@ -288,11 +288,7 @@
break;
}
-
-
} /* while (1) */
- return 0;
+ /* never reached */
}
-
-
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/managesieve/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/managesieve/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/managesieve/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/managesieve/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,8 +1,8 @@
-/.cvsignore/1.1/Sun Jan 6 02:03:32 2002//Tcyrus-release-2-3-7
-/MANIFEST/1.1/Tue May 9 17:22:30 2000//Tcyrus-release-2-3-7
-/Makefile.PL/1.12/Wed Oct 22 18:50:27 2003//Tcyrus-release-2-3-7
-/managesieve.h/1.5/Thu Feb 13 20:15:55 2003//Tcyrus-release-2-3-7
-/managesieve.pm/1.8/Sat May 25 19:57:51 2002//Tcyrus-release-2-3-7
-/managesieve.xs/1.21.2.1/Thu Apr 21 18:38:48 2005//Tcyrus-release-2-3-7
-/typemap/1.1/Wed May 3 17:31:02 2000//Tcyrus-release-2-3-7
+/.cvsignore/1.1/Sun Jan 6 02:03:32 2002//
+/MANIFEST/1.1/Tue May 9 17:22:30 2000//
+/Makefile.PL/1.14/Thu Nov 30 17:11:24 2006//
+/managesieve.h/1.5/Thu Feb 13 20:15:55 2003//
+/managesieve.pm/1.8/Sat May 25 19:57:51 2002//
+/managesieve.xs/1.23/Thu Nov 30 17:11:24 2006//
+/typemap/1.1/Wed May 3 17:31:02 2000//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/managesieve/Makefile.PL
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/managesieve/Makefile.PL?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/managesieve/Makefile.PL (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/managesieve/Makefile.PL Tue Feb 27 04:17:11 2007
@@ -37,7 +37,7 @@
# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#
-# $Id: Makefile.PL,v 1.12 2003/10/22 18:50:27 rjs3 Exp $
+# $Id: Makefile.PL,v 1.14 2006/11/30 17:11:24 murch Exp $
#
use ExtUtils::MakeMaker;
use Config;
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/managesieve/managesieve.xs
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/managesieve/managesieve.xs?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/managesieve/managesieve.xs (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/managesieve/managesieve.xs Tue Feb 27 04:17:11 2007
@@ -39,7 +39,7 @@
*
*/
-/* $Id: managesieve.xs,v 1.21.2.1 2005/04/21 18:38:48 shadow Exp $ */
+/* $Id: managesieve.xs,v 1.23 2006/11/30 17:11:24 murch Exp $ */
#ifdef __cplusplus
extern "C" {
@@ -64,7 +64,7 @@
static char *globalerr = NULL;
#include "isieve.h"
-
+#include "util.h"
#include "xmalloc.h"
static int
@@ -126,7 +126,7 @@
/* copy result */
*psecret = malloc(sizeof(sasl_secret_t) + strlen(tmp) + 2);
if (!*psecret) return SASL_NOMEM;
- strcpy( (*psecret)->data ,tmp);
+ strcpy((char *) (*psecret)->data ,tmp);
(*psecret)->len = strlen(tmp);
PUTBACK ;
@@ -177,8 +177,8 @@
/* copy result */
*result = malloc(strlen(tmp) + 2);
if (!*result) return SASL_NOMEM;
- strcpy(*result,tmp);
- if (len) *len = strlen(*result);
+ strcpy((char *) *result, tmp);
+ if (len) *len = strlen((char *) *result);
PUTBACK ;
FREETMPS ;
@@ -195,7 +195,7 @@
{
dSP ;
PUSHMARK(sp) ;
- XPUSHs(sv_2mortal(newSVpv(name, 0)));
+ XPUSHs(sv_2mortal(newSVpv((const char *) name, 0)));
XPUSHs(sv_2mortal(newSViv(isactive)));
PUTBACK ;
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/scripts/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/scripts/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/scripts/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/scripts/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,3 +1,3 @@
-/installsieve.pl/1.7/Sat May 25 19:57:52 2002//Tcyrus-release-2-3-7
-/sieveshell.pl/1.21.2.1/Thu Jan 15 20:24:44 2004//Tcyrus-release-2-3-7
+/installsieve.pl/1.7/Sat May 25 19:57:52 2002//
+/sieveshell.pl/1.24/Thu Nov 30 17:11:24 2006//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/scripts/sieveshell.pl
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/scripts/sieveshell.pl?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/scripts/sieveshell.pl (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/perl/sieve/scripts/sieveshell.pl Tue Feb 27 04:17:11 2007
@@ -40,7 +40,7 @@
# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#
-# $Id: sieveshell.pl,v 1.21.2.1 2004/01/15 20:24:44 ken3 Exp $
+# $Id: sieveshell.pl,v 1.24 2006/11/30 17:11:24 murch Exp $
#
use Cyrus::SIEVE::managesieve;
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/ptclient/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/ptclient/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/ptclient/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/ptclient/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,13 +1,13 @@
-/.cvsignore/1.2.10.1/Wed Mar 24 19:53:19 2004//Tcyrus-release-2-3-7
-/Makefile.in/1.23.2.7/Mon Jun 19 16:00:18 2006//Tcyrus-release-2-3-7
-/README/1.5/Wed Oct 22 18:50:29 2003//Tcyrus-release-2-3-7
-/afskrb.c/1.2.2.7/Wed Feb 16 21:07:09 2005//Tcyrus-release-2-3-7
-/ldap.c/1.2.2.7/Thu Apr 13 18:39:44 2006//Tcyrus-release-2-3-7
-/ptdump.c/1.8.2.4/Wed Mar 24 19:53:19 2004//Tcyrus-release-2-3-7
-/ptexpire.c/1.14.2.4/Mon May 31 18:23:01 2004//Tcyrus-release-2-3-7
-/ptextract.c/1.4/Thu Feb 13 20:15:56 2003//Tcyrus-release-2-3-7
-/ptloader.c/1.32.2.9/Fri Feb 25 07:19:06 2005//Tcyrus-release-2-3-7
-/ptloader.h/1.1.2.1/Wed Feb 16 21:07:09 2005//Tcyrus-release-2-3-7
-/test.c/1.6/Wed Oct 22 18:50:29 2003//Tcyrus-release-2-3-7
-/test2.c/1.6/Wed Oct 22 18:50:29 2003//Tcyrus-release-2-3-7
+/.cvsignore/1.3/Tue Mar 9 18:05:40 2004//
+/Makefile.in/1.29/Thu Nov 30 17:11:24 2006//
+/README/1.5/Wed Oct 22 18:50:29 2003//
+/afskrb.c/1.14/Mon Feb 5 18:58:27 2007//
+/ldap.c/1.10/Thu Nov 30 17:11:24 2006//
+/ptdump.c/1.13/Thu Nov 30 17:11:24 2006//
+/ptexpire.c/1.19/Thu Nov 30 17:11:24 2006//
+/ptextract.c/1.4/Thu Feb 13 20:15:56 2003//
+/ptloader.c/1.44/Tue Jan 9 21:25:04 2007//
+/ptloader.h/1.2/Thu Nov 30 17:11:24 2006//
+/test.c/1.6/Wed Oct 22 18:50:29 2003//
+/test2.c/1.6/Wed Oct 22 18:50:29 2003//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/ptclient/Makefile.in
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/ptclient/Makefile.in?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/ptclient/Makefile.in (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/ptclient/Makefile.in Tue Feb 27 04:17:11 2007
@@ -41,7 +41,7 @@
# AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
# OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#
-# $Id: Makefile.in,v 1.23.2.7 2006/06/19 16:00:18 murch Exp $
+# $Id: Makefile.in,v 1.29 2006/11/30 17:11:24 murch Exp $
#
srcdir = @srcdir@
top_srcdir = @top_srcdir@
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/ptclient/afskrb.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/ptclient/afskrb.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/ptclient/afskrb.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/ptclient/afskrb.c Tue Feb 27 04:17:11 2007
@@ -40,12 +40,13 @@
*
*/
-static char rcsid[] __attribute__((unused)) =
- "$Id: afskrb.c,v 1.2.2.7 2005/02/16 21:07:09 shadow Exp $";
+static char rcsid[] =
+ "$Id: afskrb.c,v 1.14 2007/02/05 18:58:27 jeaton Exp $";
#include <config.h>
#include "ptloader.h"
#include "exitcodes.h"
+#include "xmalloc.h"
#ifdef HAVE_AFSKRB
@@ -70,7 +71,6 @@
#include "auth_pts.h"
#include "libconfig.h"
#include "strhash.h"
-#include "xmalloc.h"
/* AFS stuff */
#include <des.h> /* for int32, necessary for the AFS includes below */
@@ -131,11 +131,13 @@
static char *afspts_canonifyid(const char *identifier, size_t len)
{
static char *retbuf = NULL;
+ char *tmp = NULL;
krb5_context context;
krb5_principal princ, princ_dummy;
char *realm;
char *realmbegin;
int striprealm = 0;
+ char *identifier2;
if(retbuf) free(retbuf);
retbuf = NULL;
@@ -149,14 +151,23 @@
if (strcasecmp(identifier, "anyone") == 0)
return "anyone";
+ identifier2 = strdup(identifier);
+ if (tmp = strchr(identifier2, '+')) {
+ syslog(LOG_DEBUG, "afspts_canonifyid stripping: %s", identifier2);
+ tmp[0] = 0;
+ syslog(LOG_DEBUG, "afspts_canonifyid stripped: %s", identifier2);
+ }
+
if (krb5_init_context(&context))
return NULL;
- if (krb5_parse_name(context,identifier,&princ))
+ if (krb5_parse_name(context,identifier2,&princ))
{
krb5_free_context(context);
+ free(identifier2);
return NULL;
}
+ free(identifier2);
if(config_getswitch(IMAPOPT_PTSKRB5_STRIP_DEFAULT_REALM)) {
/* get local realm */
@@ -478,7 +489,7 @@
/* fill in our new state structure */
*dsize = sizeof(struct auth_state) +
(groups.namelist_len * sizeof(struct auth_ident));
- newstate = (struct auth_state *) xmalloc(*dsize);
+ newstate = (struct auth_state *) xzmalloc(*dsize);
strcpy(newstate->userid.id, canon_id);
newstate->userid.hash = strhash(canon_id);
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/ptclient/ldap.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/ptclient/ldap.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/ptclient/ldap.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/ptclient/ldap.c Tue Feb 27 04:17:11 2007
@@ -40,8 +40,8 @@
*
*/
-static char rcsid[] __attribute__((unused)) =
- "$Id: ldap.c,v 1.2.2.7 2006/04/13 18:39:44 murch Exp $";
+static char rcsid[] =
+ "$Id: ldap.c,v 1.10 2006/11/30 17:11:24 murch Exp $";
#include <config.h>
#include "ptloader.h"
@@ -1064,7 +1064,6 @@
if (vals == NULL)
continue;
- strcpy((*newstate)->groups[i].id, "group:");
int j;
strcpy((*newstate)->groups[i].id, "group:");
for(j =0; j < strlen(vals[i]); j++) {
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/ptclient/ptdump.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/ptclient/ptdump.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/ptclient/ptdump.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/ptclient/ptdump.c Tue Feb 27 04:17:11 2007
@@ -48,7 +48,7 @@
#include "global.h"
#include "libconfig.h"
-static char rcsid[] = "$Id: ptdump.c,v 1.8.2.4 2004/03/24 19:53:19 ken3 Exp $";
+static char rcsid[] = "$Id: ptdump.c,v 1.13 2006/11/30 17:11:24 murch Exp $";
int config_need_data = 0;
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/ptclient/ptexpire.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/ptclient/ptexpire.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/ptclient/ptexpire.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/ptclient/ptexpire.c Tue Feb 27 04:17:11 2007
@@ -69,7 +69,7 @@
#include "lock.h"
#include "xmalloc.h"
-static char rcsid[] = "$Id: ptexpire.c,v 1.14.2.4 2004/05/31 18:23:01 ken3 Exp $";
+static char rcsid[] = "$Id: ptexpire.c,v 1.19 2006/11/30 17:11:24 murch Exp $";
/* global */
time_t timenow;
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/ptclient/ptloader.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/ptclient/ptloader.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/ptclient/ptloader.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/ptclient/ptloader.c Tue Feb 27 04:17:11 2007
@@ -67,7 +67,7 @@
#include "ptloader.h"
static char rcsid[] __attribute__((unused)) =
- "$Id: ptloader.c,v 1.32.2.9 2005/02/25 07:19:06 shadow Exp $";
+ "$Id: ptloader.c,v 1.44 2007/01/09 21:25:04 jeaton Exp $";
struct pts_module *pts_modules[] = {
#ifdef HAVE_LDAP
@@ -94,6 +94,7 @@
pts = pts_modules[i]; break;
}
}
+
if (!pts) {
char errbuf[1024];
snprintf(errbuf, sizeof(errbuf),
@@ -126,6 +127,11 @@
/* Globals */
#define DB (config_ptscache_db)
+/* XXXXXXXXX */
+void des_init_random_number_generator() {
+ return;
+}
+
static char ptclient_debug = 0;
struct db *ptsdb = NULL;
@@ -142,7 +148,7 @@
/* set signal handlers */
signal(SIGPIPE, SIG_IGN);
- syslog(LOG_NOTICE, "starting: $Id: ptloader.c,v 1.32.2.9 2005/02/25 07:19:06 shadow Exp $");
+ syslog(LOG_NOTICE, "starting: $Id: ptloader.c,v 1.44 2007/01/09 21:25:04 jeaton Exp $");
while ((opt = getopt(argc, argv, "d:")) != EOF) {
switch (opt) {
@@ -220,6 +226,12 @@
goto sendreply;
}
+ if (size == 0) {
+ syslog(LOG_ERR, "size sent is 0");
+ reply = "Error: zero request size";
+ goto sendreply;
+ }
+
memset(&user, 0, sizeof(user));
if (read(c, &user, size) < 0) {
syslog(LOG_ERR, "socket(user; size = %d; key = %s): %m",
@@ -231,6 +243,7 @@
if (ptclient_debug) {
syslog(LOG_DEBUG, "user %s, cacheid %s", user, keyinhex);
}
+
newstate = ptsmodule_make_authstate(user, size, &reply, &dsize);
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/ptclient/ptloader.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/ptclient/ptloader.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/ptclient/ptloader.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/ptclient/ptloader.h Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
/* ptloader.h -- Site authorization module
- * $Id: ptloader.h,v 1.1.2.1 2005/02/16 21:07:09 shadow Exp $
+ * $Id: ptloader.h,v 1.2 2006/11/30 17:11:24 murch Exp $
*
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
*
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/AUTHORS
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/AUTHORS?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/AUTHORS (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/AUTHORS Tue Feb 27 04:17:11 2007
@@ -1,4 +1,4 @@
-$Id: AUTHORS,v 1.4.8.1 2004/11/02 12:38:33 ken3 Exp $
+$Id: AUTHORS,v 1.6 2006/11/30 17:11:24 murch Exp $
Larry Greenfield <leg+sieve at andrew.cmu.edu> wrote the first pass.
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,33 +1,33 @@
-/.cvsignore/1.2/Wed Oct 22 18:03:23 2003//Tcyrus-release-2-3-7
-/AUTHORS/1.4.8.1/Tue Nov 2 12:38:33 2004//Tcyrus-release-2-3-7
-/COPYING/1.1.1.1/Fri Jul 2 18:55:35 1999//Tcyrus-release-2-3-7
-/ChangeLog/1.1.1.1/Fri Jul 2 18:55:35 1999//Tcyrus-release-2-3-7
-/Makefile.dist/1.6.8.1/Tue Nov 18 16:22:51 2003//Tcyrus-release-2-3-7
-/Makefile.in/1.30.2.6/Mon Feb 21 19:25:59 2005//Tcyrus-release-2-3-7
-/NEWS/1.5/Tue Feb 19 18:09:46 2002//Tcyrus-release-2-3-7
-/README/1.4.8.1/Wed Nov 24 16:48:35 2004//Tcyrus-release-2-3-7
-/addr-lex.l/1.8/Tue Feb 19 18:09:46 2002//Tcyrus-release-2-3-7
-/addr.y/1.11/Wed Oct 22 18:50:30 2003//Tcyrus-release-2-3-7
-/bc_dump.c/1.2.2.4/Wed Oct 5 15:56:20 2005//Tcyrus-release-2-3-7
-/bc_emit.c/1.2.2.5/Wed Dec 14 13:45:18 2005//Tcyrus-release-2-3-7
-/bc_eval.c/1.2.2.12/Fri Dec 2 00:06:00 2005//Tcyrus-release-2-3-7
-/bc_generate.c/1.2.2.6/Wed Oct 5 15:56:22 2005//Tcyrus-release-2-3-7
-/bytecode.h/1.2.2.6/Wed Oct 5 15:56:22 2005//Tcyrus-release-2-3-7
-/comparator.c/1.15.2.4/Sun May 8 14:31:00 2005//Tcyrus-release-2-3-7
-/comparator.h/1.11.2.1/Wed Jun 23 20:15:18 2004//Tcyrus-release-2-3-7
-/interp.c/1.22.8.5/Sat Mar 12 03:30:11 2005//Tcyrus-release-2-3-7
-/interp.h/1.7.8.2/Fri Jul 16 14:37:43 2004//Tcyrus-release-2-3-7
-/message.c/1.27.2.6/Wed Oct 5 15:56:23 2005//Tcyrus-release-2-3-7
-/message.h/1.16.2.2/Wed Oct 5 15:56:23 2005//Tcyrus-release-2-3-7
-/script.c/1.59.2.11/Wed Oct 5 15:56:23 2005//Tcyrus-release-2-3-7
-/script.h/1.11.2.3/Sat Mar 12 03:30:12 2005//Tcyrus-release-2-3-7
-/sieve-lex.l/1.20.8.5/Wed Oct 5 15:56:24 2005//Tcyrus-release-2-3-7
-/sieve.y/1.23.2.13/Wed Oct 5 15:56:24 2005//Tcyrus-release-2-3-7
-/sieve_err.et/1.2/Sat May 25 19:57:52 2002//Tcyrus-release-2-3-7
-/sieve_interface.h/1.19.2.5/Wed Oct 5 15:56:25 2005//Tcyrus-release-2-3-7
-/sievec.c/1.2.2.6/Fri Jul 16 14:37:45 2004//Tcyrus-release-2-3-7
-/sieved.c/1.2.2.8/Wed Oct 5 15:56:25 2005//Tcyrus-release-2-3-7
-/test.c/1.21.2.6/Wed Oct 5 15:56:25 2005//Tcyrus-release-2-3-7
-/tree.c/1.11.2.3/Sat Mar 12 03:30:13 2005//Tcyrus-release-2-3-7
-/tree.h/1.8.2.5/Wed Oct 5 15:56:26 2005//Tcyrus-release-2-3-7
+/.cvsignore/1.2/Wed Oct 22 18:03:23 2003//
+/AUTHORS/1.6/Thu Nov 30 17:11:24 2006//
+/COPYING/1.1.1.1/Fri Jul 2 18:55:35 1999//
+/ChangeLog/1.1.1.1/Fri Jul 2 18:55:35 1999//
+/Makefile.dist/1.8/Thu Nov 30 17:11:24 2006//
+/Makefile.in/1.39/Thu Nov 30 17:11:24 2006//
+/NEWS/1.5/Tue Feb 19 18:09:46 2002//
+/README/1.6/Thu Nov 30 17:11:24 2006//
+/addr-lex.l/1.9/Thu Nov 30 17:11:24 2006//
+/addr.y/1.12/Thu Nov 30 17:11:24 2006//
+/bc_dump.c/1.3/Thu Nov 30 17:11:24 2006//
+/bc_emit.c/1.3/Thu Nov 30 17:11:24 2006//
+/bc_eval.c/1.9/Mon Feb 5 18:44:01 2007//
+/bc_generate.c/1.4/Thu Nov 30 17:11:24 2006//
+/bytecode.h/1.4/Thu Nov 30 17:11:24 2006//
+/comparator.c/1.18/Thu Nov 30 17:11:24 2006//
+/comparator.h/1.12/Thu Nov 30 17:11:24 2006//
+/interp.c/1.24/Thu Nov 30 17:11:24 2006//
+/interp.h/1.8/Thu Nov 30 17:11:24 2006//
+/message.c/1.30/Mon Feb 5 18:44:01 2007//
+/message.h/1.17/Thu Nov 30 17:11:24 2006//
+/script.c/1.63/Thu Nov 30 17:11:24 2006//
+/script.h/1.12/Thu Nov 30 17:11:25 2006//
+/sieve-lex.l/1.22/Wed Feb 7 13:25:14 2007//
+/sieve.y/1.33/Thu Nov 30 17:11:25 2006//
+/sieve_err.et/1.2/Sat May 25 19:57:52 2002//
+/sieve_interface.h/1.20/Thu Nov 30 17:11:25 2006//
+/sievec.c/1.6/Thu Nov 30 17:11:25 2006//
+/sieved.c/1.6/Thu Nov 30 17:11:25 2006//
+/test.c/1.26/Thu Nov 30 17:11:25 2006//
+/tree.c/1.12/Thu Nov 30 17:11:25 2006//
+/tree.h/1.10/Thu Nov 30 17:11:25 2006//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/Makefile.dist
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/Makefile.dist?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/Makefile.dist (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/Makefile.dist Tue Feb 27 04:17:11 2007
@@ -1,4 +1,4 @@
-# $Id: Makefile.dist,v 1.6.8.1 2003/11/18 16:22:51 ken3 Exp $
+# $Id: Makefile.dist,v 1.8 2006/11/30 17:11:24 murch Exp $
YFLAGS = -d
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/Makefile.in
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/Makefile.in?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/Makefile.in (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/Makefile.in Tue Feb 27 04:17:11 2007
@@ -1,6 +1,6 @@
# Makefile.in - sieve makefile
# @configure_input@
-# $Id: Makefile.in,v 1.30.2.6 2005/02/21 19:25:59 ken3 Exp $
+# $Id: Makefile.in,v 1.39 2006/11/30 17:11:24 murch Exp $
################################################################
# Copyright 1998 by Carnegie Mellon University
#
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/README
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/README?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/README (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/README Tue Feb 27 04:17:11 2007
@@ -1,4 +1,4 @@
-$Id: README,v 1.4.8.1 2004/11/24 16:48:35 shadow Exp $
+$Id: README,v 1.6 2006/11/30 17:11:24 murch Exp $
CMU Sieve 2.1
-------------
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/addr-lex.l
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/addr-lex.l?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/addr-lex.l (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/addr-lex.l Tue Feb 27 04:17:11 2007
@@ -2,7 +2,7 @@
/*
* addr-lex.l -- RFC 822 address lexer
* Ken Murchison
- * $Id: addr-lex.l,v 1.8 2002/02/19 18:09:46 ken3 Exp $
+ * $Id: addr-lex.l,v 1.9 2006/11/30 17:11:24 murch Exp $
*/
/***********************************************************
Copyright 1999 by Carnegie Mellon University
@@ -28,6 +28,7 @@
******************************************************************/
#include "addr.h"
+#include <stdlib.h>
#include <string.h>
#undef YY_INPUT
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/addr.y
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/addr.y?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/addr.y (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/addr.y Tue Feb 27 04:17:11 2007
@@ -2,7 +2,7 @@
/*
* addr.y -- RFC 822 address parser
* Ken Murchison
- * $Id: addr.y,v 1.11 2003/10/22 18:50:30 rjs3 Exp $
+ * $Id: addr.y,v 1.12 2006/11/30 17:11:24 murch Exp $
*/
/***********************************************************
Copyright 1999 by Carnegie Mellon University
@@ -26,6 +26,10 @@
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
******************************************************************/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include <stdlib.h>
#include <string.h>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/bc_dump.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/bc_dump.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/bc_dump.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/bc_dump.c Tue Feb 27 04:17:11 2007
@@ -1,6 +1,6 @@
/* bc_generate.c -- sieve bytecode- almost flattened bytecode
* Rob Siemborski
- * $Id: bc_dump.c,v 1.2.2.4 2005/10/05 15:56:20 ken3 Exp $
+ * $Id: bc_dump.c,v 1.3 2006/11/30 17:11:24 murch Exp $
*/
/***********************************************************
Copyright 2001 by Carnegie Mellon University
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/bc_emit.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/bc_emit.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/bc_emit.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/bc_emit.c Tue Feb 27 04:17:11 2007
@@ -1,7 +1,7 @@
/* bc_emit.c -- sieve bytecode - pass 2 of the compiler
* Rob Siemborski
* Jen Smith
- * $Id: bc_emit.c,v 1.2.2.5 2005/12/14 13:45:18 murch Exp $
+ * $Id: bc_emit.c,v 1.3 2006/11/30 17:11:24 murch Exp $
*/
/***********************************************************
Copyright 2001 by Carnegie Mellon University
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/bc_eval.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/bc_eval.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/bc_eval.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/bc_eval.c Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
/* bc_eval.c - evaluate the bytecode
- * $Id: bc_eval.c,v 1.2.2.12 2005/12/02 00:06:00 murch Exp $
+ * $Id: bc_eval.c,v 1.9 2007/02/05 18:44:01 jeaton Exp $
*/
/***********************************************************
Copyright 2001 by Carnegie Mellon University
@@ -38,6 +38,8 @@
#include "charset.h"
#include "hash.h"
#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
#include <string.h>
#include <ctype.h>
@@ -929,7 +931,7 @@
sieve_bytecode_t *bc_cur = exe->bc_cur;
bytecode_input_t *bc = (bytecode_input_t *) bc_cur->data;
- unsigned int ip = 0, ip_max = (bc_cur->len/sizeof(bytecode_input_t));
+ int ip = 0, ip_max = (bc_cur->len/sizeof(bytecode_input_t));
if (bc_cur->is_executing) {
*errmsg = "Recursive Include";
@@ -1329,7 +1331,7 @@
if (data) {
/* user specified handle */
- handle = data;
+ handle = (char *) data;
}
}
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/bc_generate.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/bc_generate.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/bc_generate.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/bc_generate.c Tue Feb 27 04:17:11 2007
@@ -1,6 +1,6 @@
/* bc_generate.c -- sieve bytecode- almost flattened bytecode
* Rob Siemborski
- * $Id: bc_generate.c,v 1.2.2.6 2005/10/05 15:56:22 ken3 Exp $
+ * $Id: bc_generate.c,v 1.4 2006/11/30 17:11:24 murch Exp $
*/
/***********************************************************
Copyright 2001 by Carnegie Mellon University
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/comparator.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/comparator.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/comparator.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/comparator.c Tue Feb 27 04:17:11 2007
@@ -1,7 +1,7 @@
/* comparator.c -- comparator functions
* Larry Greenfield
* Ken Murchison (rewritten to handle relational ops and non-terminated text)
- * $Id: comparator.c,v 1.15.2.4 2005/05/08 14:31:00 ken3 Exp $
+ * $Id: comparator.c,v 1.18 2006/11/30 17:11:24 murch Exp $
*/
/***********************************************************
Copyright 1999 by Carnegie Mellon University
@@ -237,8 +237,8 @@
}
}
}
+
/* never reaches */
- abort();
}
static int octet_matches(const char *text, size_t tlen, const char *pat,
@@ -454,7 +454,7 @@
#endif
case B_VALUE:
ret = lookup_rel(relation);
- *comprock = &ascii_casemap_cmp;
+ *comprock = (void **) &ascii_casemap_cmp;
break;
}
break;/*end of ascii casemap */
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/comparator.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/comparator.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/comparator.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/comparator.h Tue Feb 27 04:17:11 2007
@@ -1,6 +1,6 @@
/* comparator.h
* Larry Greenfield
- * $Id: comparator.h,v 1.11.2.1 2004/06/23 20:15:18 ken3 Exp $
+ * $Id: comparator.h,v 1.12 2006/11/30 17:11:24 murch Exp $
*/
/***********************************************************
Copyright 1999 by Carnegie Mellon University
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/interp.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/interp.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/interp.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/interp.c Tue Feb 27 04:17:11 2007
@@ -1,6 +1,6 @@
/* interp.c -- sieve script interpretor builder
* Larry Greenfield
- * $Id: interp.c,v 1.22.8.5 2005/03/12 03:30:11 ken3 Exp $
+ * $Id: interp.c,v 1.24 2006/11/30 17:11:24 murch Exp $
*/
/***********************************************************
Copyright 1999 by Carnegie Mellon University
@@ -30,6 +30,7 @@
#endif
#include <stdlib.h>
+#include <string.h>
#include "xmalloc.h"
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/interp.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/interp.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/interp.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/interp.h Tue Feb 27 04:17:11 2007
@@ -1,6 +1,6 @@
/* interp.h -- interpretor definition
* Larry Greenfield
- * $Id: interp.h,v 1.7.8.2 2004/07/16 14:37:43 ken3 Exp $
+ * $Id: interp.h,v 1.8 2006/11/30 17:11:24 murch Exp $
*/
/***********************************************************
Copyright 1999 by Carnegie Mellon University
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/message.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/message.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/message.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/message.c Tue Feb 27 04:17:11 2007
@@ -1,6 +1,6 @@
/* message.c -- message parsing functions
* Larry Greenfield
- * $Id: message.c,v 1.27.2.6 2005/10/05 15:56:23 ken3 Exp $
+ * $Id: message.c,v 1.30 2007/02/05 18:44:01 jeaton Exp $
*/
/***********************************************************
Copyright 1999 by Carnegie Mellon University
@@ -45,6 +45,8 @@
#include "message.h"
#include "parseaddr.h"
#include "xmalloc.h"
+#include "xstrlcpy.h"
+#include "xstrlcat.h"
#include "util.h"
/* reject message m with message msg
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/message.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/message.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/message.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/message.h Tue Feb 27 04:17:11 2007
@@ -1,6 +1,6 @@
/* message.h
* Larry Greenfield
- * $Id: message.h,v 1.16.2.2 2005/10/05 15:56:23 ken3 Exp $
+ * $Id: message.h,v 1.17 2006/11/30 17:11:24 murch Exp $
*/
/***********************************************************
Copyright 1999 by Carnegie Mellon University
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/script.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/script.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/script.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/script.c Tue Feb 27 04:17:11 2007
@@ -1,6 +1,6 @@
/* script.c -- sieve script functions
* Larry Greenfield
- * $Id: script.c,v 1.59.2.11 2005/10/05 15:56:23 ken3 Exp $
+ * $Id: script.c,v 1.63 2006/11/30 17:11:24 murch Exp $
*/
/***********************************************************
Copyright 1999 by Carnegie Mellon University
@@ -475,7 +475,7 @@
default: return "Unknown";
}
- return "Error!";
+ /* never reached */
}
static char *sieve_errstr(int code)
@@ -491,7 +491,7 @@
default: return "Unknown error";
}
- return "Error!";
+ /* never reached */
}
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/script.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/script.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/script.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/script.h Tue Feb 27 04:17:11 2007
@@ -1,6 +1,6 @@
/* script.h -- script definition
* Larry Greenfield
- * $Id: script.h,v 1.11.2.3 2005/03/12 03:30:12 ken3 Exp $
+ * $Id: script.h,v 1.12 2006/11/30 17:11:25 murch Exp $
*/
/***********************************************************
Copyright 1999 by Carnegie Mellon University
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/sieve-lex.l
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/sieve-lex.l?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/sieve-lex.l (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/sieve-lex.l Tue Feb 27 04:17:11 2007
@@ -1,7 +1,7 @@
%{
/* sieve.l -- sieve lexer
* Larry Greenfield
- * $Id: sieve-lex.l,v 1.20.8.5 2005/10/05 15:56:24 ken3 Exp $
+ * $Id: sieve-lex.l,v 1.22 2007/02/07 13:25:14 murch Exp $
*/
/***********************************************************
Copyright 1999 by Carnegie Mellon University
@@ -77,7 +77,7 @@
mlcur = 0; mlbufsz = 0; mlbuf = NULL; }
<INITIAL>\" { BEGIN QSTRING;
mlcur = 0; mlbufsz = 0; mlbuf = NULL; }
-<INITIAL>[0-9]+[KMG]? { yylval.nval = tonum(yytext); return NUMBER; }
+<INITIAL>[0-9]+[KMGkmg]? { yylval.nval = tonum(yytext); return NUMBER; }
<INITIAL>if return IF;
<INITIAL>elsif return ELSIF;
<INITIAL>else return ELSE;
@@ -153,9 +153,9 @@
{
int val = atoi(c);
switch (c[strlen(c)-1]) {
- case 'K': val *= (1 << 10); break;
- case 'M': val *= (1 << 20); break;
- case 'G': val *= (1 << 30); break;
+ case 'K': case 'k': val *= (1 << 10); break;
+ case 'M': case 'm': val *= (1 << 20); break;
+ case 'G': case 'g': val *= (1 << 30); break;
default: break;
}
return val;
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/sieve.y
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/sieve.y?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/sieve.y (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/sieve.y Tue Feb 27 04:17:11 2007
@@ -1,7 +1,7 @@
%{
/* sieve.y -- sieve parser
* Larry Greenfield
- * $Id: sieve.y,v 1.23.2.13 2005/10/05 15:56:24 ken3 Exp $
+ * $Id: sieve.y,v 1.33 2006/11/30 17:11:25 murch Exp $
*/
/***********************************************************
Copyright 1999 by Carnegie Mellon University
@@ -1219,8 +1219,8 @@
*/
static int verify_utf8(char *s)
{
- const unsigned char *buf = s;
- const unsigned char *endbuf = s + strlen(s);
+ const char *buf = s;
+ const char *endbuf = s + strlen(s);
unsigned char byte2mask = 0x00, c;
int trailing = 0; /* trailing (continuation) bytes to follow */
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/sieve_interface.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/sieve_interface.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/sieve_interface.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/sieve_interface.h Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
/* sieve_interface.h -- interface for deliver
- * $Id: sieve_interface.h,v 1.19.2.5 2005/10/05 15:56:25 ken3 Exp $
+ * $Id: sieve_interface.h,v 1.20 2006/11/30 17:11:25 murch Exp $
*/
/***********************************************************
Copyright 1999 by Carnegie Mellon University
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/sievec.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/sievec.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/sievec.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/sievec.c Tue Feb 27 04:17:11 2007
@@ -1,6 +1,6 @@
/* sievec.c -- compile a sieve script to bytecode manually
* Rob Siemborski
- * $Id: sievec.c,v 1.2.2.6 2004/07/16 14:37:45 ken3 Exp $
+ * $Id: sievec.c,v 1.6 2006/11/30 17:11:25 murch Exp $
*/
/*
* Copyright (c) 1999-2000 Carnegie Mellon University. All rights reserved.
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/sieved.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/sieved.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/sieved.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/sieved.c Tue Feb 27 04:17:11 2007
@@ -1,4 +1,4 @@
-/* dump.c -- bytecode decompiler
+/* sieved.c -- bytecode decompiler
* Jen Smith
*/
/***********************************************************
@@ -25,6 +25,9 @@
*****************************************************************/
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
#include "sieve_interface.h"
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/test.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/test.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/test.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/test.c Tue Feb 27 04:17:11 2007
@@ -2,7 +2,7 @@
* test.c -- tester for libsieve
* Larry Greenfield
- * $Id: test.c,v 1.21.2.6 2005/10/05 15:56:25 ken3 Exp $
+ * $Id: test.c,v 1.26 2006/11/30 17:11:25 murch Exp $
*
* usage: "test message script"
*/
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,5 +1,2 @@
-/README/1.2.4.1/Wed Apr 14 16:57:43 2004//Tcyrus-release-2-3-7
-D/action////
-D/actionExtensions////
-D/test////
-D/testExtension////
+/README/1.2/Wed Oct 22 18:03:26 2003//
+D
Added: branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/CVS/Entries.Log
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/CVS/Entries.Log?rev=702&root=cyrus22&view=auto
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/CVS/Entries.Log (added)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/CVS/Entries.Log Tue Feb 27 04:17:11 2007
@@ -1,0 +1,4 @@
+A D/action////
+A D/actionExtensions////
+A D/test////
+A D/testExtension////
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/action/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/action/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/action/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/action/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,3 +1,3 @@
-/uberActionScript.key/1.2.4.1/Wed Apr 14 16:57:44 2004//Tcyrus-release-2-3-7
-/uberActionScript.s/1.2.4.1/Wed Apr 14 16:57:44 2004//Tcyrus-release-2-3-7
+/uberActionScript.key/1.2/Wed Oct 22 18:03:27 2003//
+/uberActionScript.s/1.2/Wed Oct 22 18:03:27 2003//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/action/serverm/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/action/serverm/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/action/serverm/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/action/serverm/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,6 +1,6 @@
-/uamail-discard/1.2.4.1/Wed Apr 14 16:57:45 2004//Tcyrus-release-2-3-7
-/uamail-keep/1.2.4.1/Wed Apr 14 16:57:45 2004//Tcyrus-release-2-3-7
-/uamail-redirect/1.2.4.1/Wed Apr 14 16:57:45 2004//Tcyrus-release-2-3-7
-/uamail-stop/1.2.4.1/Wed Apr 14 16:57:45 2004//Tcyrus-release-2-3-7
-/uamail-stop2/1.2.4.1/Wed Apr 14 16:57:45 2004//Tcyrus-release-2-3-7
+/uamail-discard/1.2/Wed Oct 22 18:03:28 2003//
+/uamail-keep/1.2/Wed Oct 22 18:03:28 2003//
+/uamail-redirect/1.2/Wed Oct 22 18:03:29 2003//
+/uamail-stop/1.2/Wed Oct 22 18:03:29 2003//
+/uamail-stop2/1.2/Wed Oct 22 18:03:29 2003//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/action/testm/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/action/testm/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/action/testm/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/action/testm/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,6 +1,6 @@
-/uatest-discard/1.2.4.1/Wed Apr 14 16:57:46 2004//Tcyrus-release-2-3-7
-/uatest-keep/1.2.4.1/Wed Apr 14 16:57:46 2004//Tcyrus-release-2-3-7
-/uatest-redirect/1.2.4.1/Wed Apr 14 16:57:46 2004//Tcyrus-release-2-3-7
-/uatest-stop/1.2.4.1/Wed Apr 14 16:57:46 2004//Tcyrus-release-2-3-7
-/uatest-stop2/1.2.4.1/Wed Apr 14 16:57:47 2004//Tcyrus-release-2-3-7
+/uatest-discard/1.2/Wed Oct 22 18:03:30 2003//
+/uatest-keep/1.2/Wed Oct 22 18:03:30 2003//
+/uatest-redirect/1.2/Wed Oct 22 18:03:30 2003//
+/uatest-stop/1.2/Wed Oct 22 18:03:30 2003//
+/uatest-stop2/1.2/Wed Oct 22 18:03:30 2003//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/actionExtensions/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/actionExtensions/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/actionExtensions/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/actionExtensions/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,3 +1,3 @@
-/uberExtensionActionScript.key/1.2.4.1/Wed Apr 14 16:57:47 2004//Tcyrus-release-2-3-7
-/uberExtensionActionScript.s/1.2.4.1/Wed Apr 14 16:57:48 2004//Tcyrus-release-2-3-7
+/uberExtensionActionScript.key/1.2/Wed Oct 22 18:03:31 2003//
+/uberExtensionActionScript.s/1.2/Wed Oct 22 18:03:31 2003//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/actionExtensions/serverm/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/actionExtensions/serverm/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/actionExtensions/serverm/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/actionExtensions/serverm/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,15 +1,15 @@
-/ueamail-denotify/1.2.4.1/Wed Apr 14 16:57:48 2004//Tcyrus-release-2-3-7
-/ueamail-denotify2/1.2.4.1/Wed Apr 14 16:57:48 2004//Tcyrus-release-2-3-7
-/ueamail-fileinto/1.2.4.1/Wed Apr 14 16:57:49 2004//Tcyrus-release-2-3-7
-/ueamail-flag1/1.2.4.1/Wed Apr 14 16:57:49 2004//Tcyrus-release-2-3-7
-/ueamail-flag2/1.2.4.1/Wed Apr 14 16:57:49 2004//Tcyrus-release-2-3-7
-/ueamail-flag3/1.2.4.1/Wed Apr 14 16:57:49 2004//Tcyrus-release-2-3-7
-/ueamail-flag4/1.2.4.1/Wed Apr 14 16:57:49 2004//Tcyrus-release-2-3-7
-/ueamail-flag5/1.2.4.1/Wed Apr 14 16:57:49 2004//Tcyrus-release-2-3-7
-/ueamail-mark/1.2.4.1/Wed Apr 14 16:57:49 2004//Tcyrus-release-2-3-7
-/ueamail-notify/1.2.4.1/Wed Apr 14 16:57:50 2004//Tcyrus-release-2-3-7
-/ueamail-notify2/1.2.4.1/Wed Apr 14 16:57:50 2004//Tcyrus-release-2-3-7
-/ueamail-reject/1.2.4.1/Wed Apr 14 16:57:50 2004//Tcyrus-release-2-3-7
-/ueamail-unmark/1.2.4.1/Wed Apr 14 16:57:50 2004//Tcyrus-release-2-3-7
-/ueamail-vacation/1.2.4.1/Wed Apr 14 16:57:50 2004//Tcyrus-release-2-3-7
+/ueamail-denotify/1.2/Wed Oct 22 18:03:32 2003//
+/ueamail-denotify2/1.2/Wed Oct 22 18:03:32 2003//
+/ueamail-fileinto/1.2/Wed Oct 22 18:03:32 2003//
+/ueamail-flag1/1.2/Wed Oct 22 18:03:32 2003//
+/ueamail-flag2/1.2/Wed Oct 22 18:03:32 2003//
+/ueamail-flag3/1.2/Wed Oct 22 18:03:32 2003//
+/ueamail-flag4/1.2/Wed Oct 22 18:03:32 2003//
+/ueamail-flag5/1.2/Wed Oct 22 18:03:32 2003//
+/ueamail-mark/1.2/Wed Oct 22 18:03:32 2003//
+/ueamail-notify/1.2/Wed Oct 22 18:03:32 2003//
+/ueamail-notify2/1.2/Wed Oct 22 18:03:32 2003//
+/ueamail-reject/1.2/Wed Oct 22 18:03:32 2003//
+/ueamail-unmark/1.2/Wed Oct 22 18:03:32 2003//
+/ueamail-vacation/1.2/Wed Oct 22 18:03:32 2003//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/actionExtensions/testm/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/actionExtensions/testm/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/actionExtensions/testm/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/actionExtensions/testm/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,15 +1,15 @@
-/ueatest-denotify/1.2.4.1/Wed Apr 14 16:57:51 2004//Tcyrus-release-2-3-7
-/ueatest-denotify2/1.2.4.1/Wed Apr 14 16:57:51 2004//Tcyrus-release-2-3-7
-/ueatest-fileinto/1.2.4.1/Wed Apr 14 16:57:51 2004//Tcyrus-release-2-3-7
-/ueatest-flag1/1.2.4.1/Wed Apr 14 16:57:51 2004//Tcyrus-release-2-3-7
-/ueatest-flag2/1.2.4.1/Wed Apr 14 16:57:51 2004//Tcyrus-release-2-3-7
-/ueatest-flag3/1.2.4.1/Wed Apr 14 16:57:51 2004//Tcyrus-release-2-3-7
-/ueatest-flag4/1.2.4.1/Wed Apr 14 16:57:52 2004//Tcyrus-release-2-3-7
-/ueatest-flag5/1.2.4.1/Wed Apr 14 16:57:52 2004//Tcyrus-release-2-3-7
-/ueatest-mark/1.2.4.1/Wed Apr 14 16:57:52 2004//Tcyrus-release-2-3-7
-/ueatest-notify/1.2.4.1/Wed Apr 14 16:57:52 2004//Tcyrus-release-2-3-7
-/ueatest-notify2/1.2.4.1/Wed Apr 14 16:57:52 2004//Tcyrus-release-2-3-7
-/ueatest-reject/1.2.4.1/Wed Apr 14 16:57:52 2004//Tcyrus-release-2-3-7
-/ueatest-unmark/1.2.4.1/Wed Apr 14 16:57:52 2004//Tcyrus-release-2-3-7
-/ueatest-vacation/1.2.4.1/Wed Apr 14 16:57:53 2004//Tcyrus-release-2-3-7
+/ueatest-denotify/1.2/Wed Oct 22 18:03:33 2003//
+/ueatest-denotify2/1.2/Wed Oct 22 18:03:33 2003//
+/ueatest-fileinto/1.2/Wed Oct 22 18:03:33 2003//
+/ueatest-flag1/1.2/Wed Oct 22 18:03:33 2003//
+/ueatest-flag2/1.2/Wed Oct 22 18:03:33 2003//
+/ueatest-flag3/1.2/Wed Oct 22 18:03:33 2003//
+/ueatest-flag4/1.2/Wed Oct 22 18:03:33 2003//
+/ueatest-flag5/1.2/Wed Oct 22 18:03:33 2003//
+/ueatest-mark/1.2/Wed Oct 22 18:03:33 2003//
+/ueatest-notify/1.2/Wed Oct 22 18:03:33 2003//
+/ueatest-notify2/1.2/Wed Oct 22 18:03:33 2003//
+/ueatest-reject/1.2/Wed Oct 22 18:03:33 2003//
+/ueatest-unmark/1.2/Wed Oct 22 18:03:33 2003//
+/ueatest-vacation/1.2/Wed Oct 22 18:03:33 2003//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/test/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/test/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/test/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/test/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,3 +1,3 @@
-/uberTestScript.key/1.2.4.1/Wed Apr 14 16:57:53 2004//Tcyrus-release-2-3-7
-/uberTestScript.s/1.2.4.1/Wed Apr 14 16:57:53 2004//Tcyrus-release-2-3-7
+/uberTestScript.key/1.2/Wed Oct 22 18:03:38 2003//
+/uberTestScript.s/1.2/Wed Oct 22 18:03:38 2003//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/test/serverm/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/test/serverm/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/test/serverm/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/test/serverm/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,3 +1,3 @@
-/utmail-address/1.2.4.1/Wed Apr 14 16:57:54 2004//Tcyrus-release-2-3-7
-/utmail-header/1.2.4.1/Wed Apr 14 16:57:54 2004//Tcyrus-release-2-3-7
+/utmail-address/1.2/Wed Oct 22 18:03:39 2003//
+/utmail-header/1.2/Wed Oct 22 18:03:39 2003//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/test/testm/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/test/testm/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/test/testm/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/test/testm/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,3 +1,3 @@
-/utest-address/1.2.4.1/Wed Apr 14 16:57:55 2004//Tcyrus-release-2-3-7
-/utest-header/1.2.4.1/Wed Apr 14 16:57:55 2004//Tcyrus-release-2-3-7
+/utest-address/1.2/Wed Oct 22 18:03:40 2003//
+/utest-header/1.2/Wed Oct 22 18:03:40 2003//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/testExtension/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/testExtension/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/testExtension/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/testExtension/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,3 +1,3 @@
-/uberExtensionTestScript.key/1.2.4.1/Wed Apr 14 16:57:56 2004//Tcyrus-release-2-3-7
-/uberExtensionTestScript.s/1.2.4.1/Wed Apr 14 16:57:56 2004//Tcyrus-release-2-3-7
+/uberExtensionTestScript.key/1.2/Wed Oct 22 18:03:41 2003//
+/uberExtensionTestScript.s/1.2/Wed Oct 22 18:03:41 2003//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/testExtension/serverm/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/testExtension/serverm/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/testExtension/serverm/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/testExtension/serverm/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,9 +1,9 @@
-/uetmail-areg/1.2.4.1/Wed Apr 14 16:57:57 2004//Tcyrus-release-2-3-7
-/uetmail-asub/1.2.4.1/Wed Apr 14 16:57:57 2004//Tcyrus-release-2-3-7
-/uetmail-count/1.2.4.1/Wed Apr 14 16:57:57 2004//Tcyrus-release-2-3-7
-/uetmail-count2/1.2.4.1/Wed Apr 14 16:57:57 2004//Tcyrus-release-2-3-7
-/uetmail-envelope/1.2.4.1/Wed Apr 14 16:57:57 2004//Tcyrus-release-2-3-7
-/uetmail-hreg/1.2.4.1/Wed Apr 14 16:57:58 2004//Tcyrus-release-2-3-7
-/uetmail-value/1.2.4.1/Wed Apr 14 16:57:58 2004//Tcyrus-release-2-3-7
-/uetmail-value2/1.2.4.1/Wed Apr 14 16:57:58 2004//Tcyrus-release-2-3-7
+/uetmail-areg/1.2/Wed Oct 22 18:03:42 2003//
+/uetmail-asub/1.2/Wed Oct 22 18:03:42 2003//
+/uetmail-count/1.2/Wed Oct 22 18:03:42 2003//
+/uetmail-count2/1.2/Wed Oct 22 18:03:42 2003//
+/uetmail-envelope/1.2/Wed Oct 22 18:03:42 2003//
+/uetmail-hreg/1.2/Wed Oct 22 18:03:42 2003//
+/uetmail-value/1.2/Wed Oct 22 18:03:42 2003//
+/uetmail-value2/1.2/Wed Oct 22 18:03:42 2003//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/testExtension/testm/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/testExtension/testm/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/testExtension/testm/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tests/testExtension/testm/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,7 +1,7 @@
-/uetest-areg/1.2.4.1/Wed Apr 14 16:57:59 2004//Tcyrus-release-2-3-7
-/uetest-asub/1.2.4.1/Wed Apr 14 16:57:59 2004//Tcyrus-release-2-3-7
-/uetest-count/1.2.4.1/Wed Apr 14 16:57:59 2004//Tcyrus-release-2-3-7
-/uetest-envelope/1.2.4.1/Wed Apr 14 16:57:59 2004//Tcyrus-release-2-3-7
-/uetest-hreg/1.2.4.1/Wed Apr 14 16:57:59 2004//Tcyrus-release-2-3-7
-/uetest-value/1.2.4.1/Wed Apr 14 16:57:59 2004//Tcyrus-release-2-3-7
+/uetest-areg/1.2/Wed Oct 22 18:03:43 2003//
+/uetest-asub/1.2/Wed Oct 22 18:03:43 2003//
+/uetest-count/1.2/Wed Oct 22 18:03:43 2003//
+/uetest-envelope/1.2/Wed Oct 22 18:03:43 2003//
+/uetest-hreg/1.2/Wed Oct 22 18:03:43 2003//
+/uetest-value/1.2/Wed Oct 22 18:03:43 2003//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tree.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tree.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tree.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tree.c Tue Feb 27 04:17:11 2007
@@ -1,6 +1,6 @@
/* tree.c -- abstract syntax tree handling
* Larry Greenfield
- * $Id: tree.c,v 1.11.2.3 2005/03/12 03:30:13 ken3 Exp $
+ * $Id: tree.c,v 1.12 2006/11/30 17:11:25 murch Exp $
*/
/***********************************************************
Copyright 1999 by Carnegie Mellon University
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tree.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tree.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tree.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/sieve/tree.h Tue Feb 27 04:17:11 2007
@@ -1,6 +1,6 @@
/* tree.h -- abstract syntax tree
* Larry Greenfield
- * $Id: tree.h,v 1.8.2.5 2005/10/05 15:56:26 ken3 Exp $
+ * $Id: tree.h,v 1.10 2006/11/30 17:11:25 murch Exp $
*/
/***********************************************************
Copyright 1999 by Carnegie Mellon University
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/snmp/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/snmp/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/snmp/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/snmp/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,3 +1,3 @@
-/.cvsignore/1.1/Sun Jan 6 02:03:33 2002//Tcyrus-release-2-3-7
-/snmpgen/1.15.4.3/Mon Apr 11 06:09:27 2005//Tcyrus-release-2-3-7
+/.cvsignore/1.1/Sun Jan 6 02:03:33 2002//
+/snmpgen/1.19/Thu Nov 30 17:11:25 2006//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/snmp/snmpgen
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/snmp/snmpgen?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/snmp/snmpgen (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/snmp/snmpgen Tue Feb 27 04:17:11 2007
@@ -40,7 +40,7 @@
#
exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
#!perl -w
-# $Id: snmpgen,v 1.15.4.3 2005/04/11 06:09:27 shadow Exp $
+# $Id: snmpgen,v 1.19 2006/11/30 17:11:25 murch Exp $
if ($] !~ /^5\..*/) {
# uh-oh. this isn't perl 5.
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/syslog/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/syslog/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/syslog/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/syslog/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,11 +1,11 @@
-/Makefile.in/1.10/Tue May 23 20:56:48 2000//Tcyrus-release-2-3-7
-/README/1.1/Tue Mar 15 23:27:25 1994//Tcyrus-release-2-3-7
-/logger.1/1.2/Tue May 23 20:56:48 2000//Tcyrus-release-2-3-7
-/logger.c/1.3/Thu Feb 13 20:15:57 2003//Tcyrus-release-2-3-7
-/syslog.3/1.2/Tue May 23 20:56:48 2000//Tcyrus-release-2-3-7
-/syslog.c/1.4/Wed Jun 4 03:27:56 2003//Tcyrus-release-2-3-7
-/syslog.conf/1.2/Wed Oct 19 15:57:13 1994//Tcyrus-release-2-3-7
-/syslog.h/1.3/Thu Feb 13 20:15:57 2003//Tcyrus-release-2-3-7
-/syslogd.8/1.2/Tue May 23 20:56:49 2000//Tcyrus-release-2-3-7
-/syslogd.c/1.3/Thu Feb 13 20:15:57 2003//Tcyrus-release-2-3-7
+/Makefile.in/1.10/Tue May 23 20:56:48 2000//
+/README/1.1/Tue Mar 15 23:27:25 1994//
+/logger.1/1.2/Tue May 23 20:56:48 2000//
+/logger.c/1.3/Thu Feb 13 20:15:57 2003//
+/syslog.3/1.2/Tue May 23 20:56:48 2000//
+/syslog.c/1.4/Wed Jun 4 03:27:56 2003//
+/syslog.conf/1.2/Wed Oct 19 15:57:13 1994//
+/syslog.h/1.3/Thu Feb 13 20:15:57 2003//
+/syslogd.8/1.2/Tue May 23 20:56:49 2000//
+/syslogd.c/1.3/Thu Feb 13 20:15:57 2003//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,17 +1,17 @@
-/.cvsignore/1.2/Wed Oct 22 18:03:46 2003//Tcyrus-release-2-3-7
-/Makefile.in/1.20.2.4/Tue Jun 27 15:58:43 2006//Tcyrus-release-2-3-7
-/TODO/1.5/Fri Aug 1 13:22:25 2003//Tcyrus-release-2-3-7
-/actions.c/1.36.2.6/Tue Jun 27 15:58:43 2006//Tcyrus-release-2-3-7
-/actions.h/1.11/Tue Jun 24 15:34:00 2003//Tcyrus-release-2-3-7
-/codes.h/1.6/Thu Feb 13 20:15:58 2003//Tcyrus-release-2-3-7
-/exitcodes.h/1.4/Thu Feb 13 20:15:59 2003//Tcyrus-release-2-3-7
-/lex.c/1.24/Wed Oct 22 18:50:31 2003//Tcyrus-release-2-3-7
-/lex.h/1.11/Thu Feb 13 20:15:59 2003//Tcyrus-release-2-3-7
-/mystring.c/1.6.8.1/Fri Feb 27 21:17:48 2004//Tcyrus-release-2-3-7
-/mystring.h/1.6/Thu Feb 13 20:15:59 2003//Tcyrus-release-2-3-7
-/parser.c/1.33.2.8/Tue Jun 27 15:58:43 2006//Tcyrus-release-2-3-7
-/parser.h/1.4/Thu Feb 13 20:15:59 2003//Tcyrus-release-2-3-7
-/scripttest.c/1.21.2.5/Thu Aug 5 16:23:52 2004//Tcyrus-release-2-3-7
-/scripttest.h/1.9.2.1/Wed Jun 23 20:15:20 2004//Tcyrus-release-2-3-7
-/timsieved.c/1.48.2.12/Tue Jun 27 15:58:43 2006//Tcyrus-release-2-3-7
+/.cvsignore/1.2/Wed Oct 22 18:03:46 2003//
+/Makefile.in/1.26/Thu Nov 30 17:11:25 2006//
+/TODO/1.5/Fri Aug 1 13:22:25 2003//
+/actions.c/1.40/Thu Nov 30 17:11:25 2006//
+/actions.h/1.11/Tue Jun 24 15:34:00 2003//
+/codes.h/1.6/Thu Feb 13 20:15:58 2003//
+/exitcodes.h/1.4/Thu Feb 13 20:15:59 2003//
+/lex.c/1.25/Thu Nov 30 17:11:25 2006//
+/lex.h/1.11/Thu Feb 13 20:15:59 2003//
+/mystring.c/1.8/Thu Nov 30 17:11:25 2006//
+/mystring.h/1.6/Thu Feb 13 20:15:59 2003//
+/parser.c/1.41/Thu Nov 30 17:11:25 2006//
+/parser.h/1.4/Thu Feb 13 20:15:59 2003//
+/scripttest.c/1.24/Thu Nov 30 17:11:25 2006//
+/scripttest.h/1.10/Thu Nov 30 17:11:25 2006//
+/timsieved.c/1.58/Thu Nov 30 17:11:25 2006//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/Makefile.in
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/Makefile.in?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/Makefile.in (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/Makefile.in Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
# Makefile.in - timsieved makefile
-# $Id: Makefile.in,v 1.20.2.4 2006/06/27 15:58:43 murch Exp $
+# $Id: Makefile.in,v 1.26 2006/11/30 17:11:25 murch Exp $
# @configure_input@
#
# Copyright (c) 1998-2000 Carnegie Mellon University. All rights reserved.
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/actions.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/actions.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/actions.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/actions.c Tue Feb 27 04:17:11 2007
@@ -1,6 +1,6 @@
/* actions.c -- executes the commands for timsieved
* Tim Martin
- * $Id: actions.c,v 1.36.2.6 2006/06/27 15:58:43 murch Exp $
+ * $Id: actions.c,v 1.40 2006/11/30 17:11:25 murch Exp $
*/
/*
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/lex.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/lex.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/lex.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/lex.c Tue Feb 27 04:17:11 2007
@@ -1,7 +1,7 @@
/* lex.c -- lexer for timsieved
* Tim Martin
* 9/21/99
- * $Id: lex.c,v 1.24 2003/10/22 18:50:31 rjs3 Exp $
+ * $Id: lex.c,v 1.25 2006/11/30 17:11:25 murch Exp $
*/
/*
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
@@ -381,11 +381,9 @@
break;
}
-
-
} /* while (1) */
- return 0;
-}
-
-
+ /* never reached */
+}
+
+
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/mystring.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/mystring.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/mystring.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/mystring.c Tue Feb 27 04:17:11 2007
@@ -1,4 +1,4 @@
-/* $Id: mystring.c,v 1.6.8.1 2004/02/27 21:17:48 ken3 Exp $ */
+/* $Id: mystring.c,v 1.8 2006/11/30 17:11:25 murch Exp $ */
#ifdef HAVE_CONFIG_H
#include <config.h>
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/parser.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/parser.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/parser.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/parser.c Tue Feb 27 04:17:11 2007
@@ -1,7 +1,7 @@
/* parser.c -- parser used by timsieved
* Tim Martin
* 9/21/99
- * $Id: parser.c,v 1.33.2.8 2006/06/27 15:58:43 murch Exp $
+ * $Id: parser.c,v 1.41 2006/11/30 17:11:25 murch Exp $
*/
/*
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/scripttest.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/scripttest.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/scripttest.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/scripttest.c Tue Feb 27 04:17:11 2007
@@ -1,6 +1,6 @@
/* scripttest.c -- test wheather the sieve script is valid
* Tim Martin
- * $Id: scripttest.c,v 1.21.2.5 2004/08/05 16:23:52 ken3 Exp $
+ * $Id: scripttest.c,v 1.24 2006/11/30 17:11:25 murch Exp $
*/
/*
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/scripttest.h
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/scripttest.h?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/scripttest.h (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/scripttest.h Tue Feb 27 04:17:11 2007
@@ -1,6 +1,6 @@
/* scripttest.h -- test whether the sieve script is valid
* Tim Martin
- * $Id: scripttest.h,v 1.9.2.1 2004/06/23 20:15:20 ken3 Exp $
+ * $Id: scripttest.h,v 1.10 2006/11/30 17:11:25 murch Exp $
*/
/*
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/timsieved.c
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/timsieved.c?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/timsieved.c (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/timsieved/timsieved.c Tue Feb 27 04:17:11 2007
@@ -1,7 +1,7 @@
/* timsieved.c -- main file for timsieved (sieve script accepting program)
* Tim Martin
* 9/21/99
- * $Id: timsieved.c,v 1.48.2.12 2006/06/27 15:58:43 murch Exp $
+ * $Id: timsieved.c,v 1.58 2006/11/30 17:11:25 murch Exp $
*/
/*
* Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
@@ -86,6 +86,7 @@
#include "acl.h"
#include "backend.h"
#include "mboxlist.h"
+#include "proxy.h"
#include "util.h"
#include "scripttest.h"
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/CVS/Entries
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/CVS/Entries?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/CVS/Entries (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/CVS/Entries Tue Feb 27 04:17:11 2007
@@ -1,16 +1,16 @@
-/arbitronsort.pl/1.2/Mon Aug 4 17:13:24 2003//Tcyrus-release-2-3-7
-/config2header/1.2.2.12/Wed Apr 13 15:43:33 2005//Tcyrus-release-2-3-7
-/config2man/1.2.2.1/Fri Dec 19 18:33:58 2003//Tcyrus-release-2-3-7
-/convert-sieve.pl/1.2/Wed Oct 22 18:03:47 2003//Tcyrus-release-2-3-7
-/dohash/1.10.18.1/Thu Dec 1 22:30:21 2005//Tcyrus-release-2-3-7
-/masssievec/1.2.2.3/Thu Dec 1 22:30:21 2005//Tcyrus-release-2-3-7
-/migrate-metadata/1.1.2.3/Thu Dec 1 22:30:22 2005//Tcyrus-release-2-3-7
-/mkimap/1.15.2.4/Thu Dec 1 22:30:22 2005//Tcyrus-release-2-3-7
-/mknewsgroups/1.2/Wed Oct 22 18:03:47 2003//Tcyrus-release-2-3-7
-/mupdate-loadgen.pl/1.2/Wed Oct 22 18:03:47 2003//Tcyrus-release-2-3-7
-/not-mkdep/1.3/Tue May 23 20:56:53 2000//Tcyrus-release-2-3-7
-/rehash/1.7.2.1/Thu Dec 1 22:30:22 2005//Tcyrus-release-2-3-7
-/translatesieve/1.6.8.1/Thu Dec 1 22:30:22 2005//Tcyrus-release-2-3-7
-/undohash/1.7.8.1/Thu Dec 1 22:30:23 2005//Tcyrus-release-2-3-7
-/upgradesieve/1.6.18.1/Thu Dec 1 22:30:23 2005//Tcyrus-release-2-3-7
+/arbitronsort.pl/1.2/Mon Aug 4 17:13:24 2003//
+/config2header/1.13/Thu Nov 30 17:11:25 2006//
+/config2man/1.4/Thu Nov 30 17:11:25 2006//
+/convert-sieve.pl/1.2/Wed Oct 22 18:03:47 2003//
+/dohash/1.12/Thu Nov 30 17:11:25 2006//
+/masssievec/1.6/Thu Nov 30 17:11:25 2006//
+/migrate-metadata/1.2/Thu Nov 30 17:11:25 2006//
+/mkimap/1.18/Thu Nov 30 17:11:25 2006//
+/mknewsgroups/1.2/Wed Oct 22 18:03:47 2003//
+/mupdate-loadgen.pl/1.2/Wed Oct 22 18:03:47 2003//
+/not-mkdep/1.3/Tue May 23 20:56:53 2000//
+/rehash/1.9/Thu Nov 30 17:11:25 2006//
+/translatesieve/1.8/Thu Nov 30 17:11:25 2006//
+/undohash/1.9/Thu Nov 30 17:11:25 2006//
+/upgradesieve/1.8/Thu Nov 30 17:11:25 2006//
D
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/config2header
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/config2header?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/config2header (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/config2header Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: config2header,v 1.2.2.12 2005/04/13 15:43:33 shadow Exp $
+# $Id: config2header,v 1.13 2006/11/30 17:11:25 murch Exp $
#
# Copyright (c) 2001 Carnegie Mellon University. All rights reserved.
#
@@ -84,7 +84,7 @@
open HFILE, ">$hfile";
my $blank = "";
-my $version = "\$Revision: 1.2.2.12 $blank";
+my $version = "\$Revision: 1.13 $blank";
$version =~ s/.Revision: (.*) /$1/;
print HFILE "/* auto-generated by config2header $version */\n";
print CFILE "/* auto-generated by config2header $version */\n";
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/config2man
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/config2man?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/config2man (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/config2man Tue Feb 27 04:17:11 2007
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: config2man,v 1.2.2.1 2003/12/19 18:33:58 ken3 Exp $
+# $Id: config2man,v 1.4 2006/11/30 17:11:25 murch Exp $
#
# Copyright (c) 2001 Carnegie Mellon University. All rights reserved.
#
@@ -79,7 +79,7 @@
my $enums = "";
my $blank = "";
-my $version = "\$Revision: 1.2.2.1 $blank";
+my $version = "\$Revision: 1.4 $blank";
$version =~ s/.Revision: (.*) /$1/;
print ".\\\" -*- nroff -*-\n";
print ".\\\" auto-generated by config2man $version\n";
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/dohash
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/dohash?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/dohash (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/dohash Tue Feb 27 04:17:11 2007
@@ -42,7 +42,7 @@
#!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.18.1 2005/12/01 22:30:21 murch Exp $
+# $Id: dohash,v 1.12 2006/11/30 17:11:25 murch Exp $
if ($] !~ /^5\..*/) {
# uh-oh. this isn't perl 5.
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/masssievec
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/masssievec?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/masssievec (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/masssievec Tue Feb 27 04:17:11 2007
@@ -43,7 +43,7 @@
#
# Script for mass compilation of sieve scripts.
#
-# $Id: masssievec,v 1.2.2.3 2005/12/01 22:30:21 murch Exp $
+# $Id: masssievec,v 1.6 2006/11/30 17:11:25 murch Exp $
if ($] !~ /^5\..*/) {
# uh-oh. this isn't perl 5.
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/migrate-metadata
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/migrate-metadata?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/migrate-metadata (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/migrate-metadata Tue Feb 27 04:17:11 2007
@@ -42,7 +42,7 @@
#!perl -w
# script to upgrade from versions of imapd previous to 1.6.2
# make sure you run it as the cyrus user
-# $Id: migrate-metadata,v 1.1.2.3 2005/12/01 22:30:22 murch Exp $
+# $Id: migrate-metadata,v 1.2 2006/11/30 17:11:25 murch Exp $
if ($] !~ /^5\..*/) {
# uh-oh. this isn't perl 5.
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/mkimap
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/mkimap?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/mkimap (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/mkimap Tue Feb 27 04:17:11 2007
@@ -40,7 +40,7 @@
#
exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
#!perl -w
-# $Id: mkimap,v 1.15.2.4 2005/12/01 22:30:22 murch Exp $
+# $Id: mkimap,v 1.18 2006/11/30 17:11:25 murch Exp $
if ($] !~ /^5\..*/) {
# uh-oh. this isn't perl 5.
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/rehash
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/rehash?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/rehash (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/rehash Tue Feb 27 04:17:11 2007
@@ -45,7 +45,7 @@
#
# Written by Gary Mills <mills at cc.UManitoba.CA>
#
-# $Id: rehash,v 1.7.2.1 2005/12/01 22:30:22 murch Exp $
+# $Id: rehash,v 1.9 2006/11/30 17:11:25 murch Exp $
if ($] !~ /^5\..*/) {
# uh-oh. this isn't perl 5.
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/translatesieve
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/translatesieve?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/translatesieve (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/translatesieve Tue Feb 27 04:17:11 2007
@@ -4,7 +4,7 @@
# script to translate sieve scripts to use unixhierarchysep and/or altnamespace
# make sure you run it as the cyrus user
#!/usr/bin/perl
-# $Id: translatesieve,v 1.6.8.1 2005/12/01 22:30:22 murch Exp $
+# $Id: translatesieve,v 1.8 2006/11/30 17:11:25 murch Exp $
#
# Copyright (c) 2001 Carnegie Mellon University. All rights reserved.
#
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/undohash
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/undohash?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/undohash (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/undohash Tue Feb 27 04:17:11 2007
@@ -1,7 +1,7 @@
#!/usr/bin/perl
# 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.8.1 2005/12/01 22:30:23 murch Exp $
+# $Id: undohash,v 1.9 2006/11/30 17:11:25 murch Exp $
#
# Copyright (c) 2000 Carnegie Mellon University. All rights reserved.
#
Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/upgradesieve
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/upgradesieve?rev=702&root=cyrus22&r1=688&r2=702&view=diff
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/upgradesieve (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/tools/upgradesieve Tue Feb 27 04:17:11 2007
@@ -4,7 +4,7 @@
# script to upgrade sievedir from imapd 1.6.13
# make sure you run it as the cyrus user
#!/usr/bin/perl
-# $Id: upgradesieve,v 1.6.18.1 2005/12/01 22:30:23 murch Exp $
+# $Id: upgradesieve,v 1.8 2006/11/30 17:11:25 murch Exp $
#
# Copyright (c) 2000 Carnegie Mellon University. All rights reserved.
#
Added: branches/cyrus23/cyrus-imapd-2.3_2.3.8.orig.tar.gz
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3_2.3.8.orig.tar.gz?rev=702&root=cyrus22&view=auto
==============================================================================
--- branches/cyrus23/cyrus-imapd-2.3_2.3.8.orig.tar.gz (added)
+++ branches/cyrus23/cyrus-imapd-2.3_2.3.8.orig.tar.gz Tue Feb 27 04:17:11 2007
@@ -1,0 +1,1 @@
+link ../../tarballs/cyrus-imapd-2.3_2.3.8.orig.tar.gz
Propchange: branches/cyrus23/cyrus-imapd-2.3_2.3.8.orig.tar.gz
------------------------------------------------------------------------------
svn:special = *
More information about the Pkg-Cyrus-imapd-Debian-devel
mailing list