[SVN] r873 - /trunk/cyrus-imapd-2.2.13/debian/patches/
debian at incase.de
debian at incase.de
Fri Jan 22 21:07:03 UTC 2010
Author: myon
Date: Fri Jan 22 22:07:03 2010
New Revision: 873
URL: https://mail.incase.de/viewcvs?rev=873&root=cyrus22&view=rev
Log:
remove dpatch path names so they apply cleanly
Modified:
trunk/cyrus-imapd-2.2.13/debian/patches/0001-upstream-fix-segfault.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/0002-allow_invalid_id_acl_removal.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/0003-upstream_disallow_userprobes.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/0004-upstream-fetchnews-timezone-dst-fix.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/0005-upstream-fix-ctl_mboxlist-dump-undump.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/0006-upstream-free-backend-fix.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/0007-upstream-remove-undump-size-limit.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/0008-upstream-better-message-track-logging.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/0009-upstream-remove-redundant-wildcard-check.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/0010-upstream-fix-libRSAglue-linkage.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/0011-upstream-allow-compile-with-krb5-1.4.3.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/0013-upstream-allow-report-above-4GB-mboxsize.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/0014-upstream-fix-locks-during-reconstruction.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/0015-upstream-fix-logic-error-in-imapoptions.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/0016-upstream-fix-typos.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/0017-upstream-no-body-empty-string-instead-of-null.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/0018-upstream-ntohl-instead-of-htonl.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/0019-upstream-sieve_allowreferrals.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/0020-upstream-client-literal-prefix.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/0021-upstream-applied_RFC4314_READ-ONLY_logic.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/0022-upstream-dont-send-empty-literal-response.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/0023-sort-illegal-dates-first.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/0090-fix-casts.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/01-fix_Makefile.in.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/02-add_mkinstalldirs.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/03-fix_docs.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/04-add_autogen.sh.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/05-fix_programnames.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/06-disable_runpath.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/07-update_aclocal_and_configure.in.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/08-clean_socket_closes.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/09-kerberos-ipv4-ipv6-kludge-removal.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/10-fix_potential_overflows.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/11-fix_syslog_prefix.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/12-fix_timeout_handling.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/14-xmalloc.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/15-munge_8bit.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/16-fix_mib.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/17-fix_tail_syntax_in_xversion.h.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/19-fix_tls_ssl.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/23-configurable_idled.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/30-update_perlcalling.sh.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/35-masssievec_remove_unused_variable.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/40-rehash_fix_pathes.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/45-kolab2-annotations.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/61-64bit-quota.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/65-sieveshell-enhancements.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/70-allow-larger-buffers.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/72-faster-isdigit.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/75-update-imapd.conf-documentation.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/77-change-missing-sieve-notice.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/80-kbsd-no-psstrings.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/82-allow-from_-header.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/99-update-autoconf.dpatch
trunk/cyrus-imapd-2.2.13/debian/patches/series
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/0001-upstream-fix-segfault.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/0001-upstream-fix-segfault.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/0001-upstream-fix-segfault.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/0001-upstream-fix-segfault.dpatch Fri Jan 22 22:07:03 2010
@@ -5,9 +5,9 @@
## DP: Fix for imap/backend.c, upstream CVS edition 1.40
@DPATCH@
-diff -urNad cyrus-imapd-2.2.13/imap/backend.c /tmp/dpep.NeVG3m/cyrus-imapd-2.2.13/imap/backend.c
+diff -urNad cyrus-imapd-2.2.13/imap/backend.c cyrus-imapd-2.2.13/imap/backend.c
--- cyrus-imapd-2.2.13/imap/backend.c 2006-04-22 17:18:39.000000000 +0200
-+++ /tmp/dpep.NeVG3m/cyrus-imapd-2.2.13/imap/backend.c 2006-05-02 22:08:32.024194651 +0200
++++ cyrus-imapd-2.2.13/imap/backend.c 2006-05-02 22:08:32.024194651 +0200
@@ -271,7 +271,7 @@
/* need to (re)establish connection to server or create one */
int sock = -1;
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/0002-allow_invalid_id_acl_removal.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/0002-allow_invalid_id_acl_removal.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/0002-allow_invalid_id_acl_removal.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/0002-allow_invalid_id_acl_removal.dpatch Fri Jan 22 22:07:03 2010
@@ -5,9 +5,9 @@
## DP: Upstream: Allow removal of invalid ID ACLs
@DPATCH@
-diff -urNad cyrus-imapd-2.2.13/lib/acl_afs.c /tmp/dpep.4TxSCg/cyrus-imapd-2.2.13/lib/acl_afs.c
+diff -urNad cyrus-imapd-2.2.13/lib/acl_afs.c cyrus-imapd-2.2.13/lib/acl_afs.c
--- cyrus-imapd-2.2.13/lib/acl_afs.c 2005-03-12 23:09:22.000000000 +0100
-+++ /tmp/dpep.4TxSCg/cyrus-imapd-2.2.13/lib/acl_afs.c 2006-05-03 15:27:47.049193574 +0200
++++ cyrus-imapd-2.2.13/lib/acl_afs.c 2006-05-03 15:27:47.049193574 +0200
@@ -114,6 +114,7 @@
cyrus_acl_canonproc_t *canonproc;
void *canonrock;
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/0003-upstream_disallow_userprobes.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/0003-upstream_disallow_userprobes.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/0003-upstream_disallow_userprobes.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/0003-upstream_disallow_userprobes.dpatch Fri Jan 22 22:07:03 2010
@@ -7,9 +7,9 @@
## DP: "Unknown user" for unknown user names.
@DPATCH@
-diff -urNad cyrus-imapd-2.2.13/imap/imapd.c /tmp/dpep.556KMT/cyrus-imapd-2.2.13/imap/imapd.c
+diff -urNad cyrus-imapd-2.2.13/imap/imapd.c cyrus-imapd-2.2.13/imap/imapd.c
--- cyrus-imapd-2.2.13/imap/imapd.c 2006-03-31 20:18:13.000000000 +0200
-+++ /tmp/dpep.556KMT/cyrus-imapd-2.2.13/imap/imapd.c 2006-05-03 16:02:02.685827405 +0200
++++ cyrus-imapd-2.2.13/imap/imapd.c 2006-05-03 16:02:02.685827405 +0200
@@ -1785,6 +1785,9 @@
sleep(3);
@@ -40,9 +40,9 @@
if (errorstring) {
prot_printf(imapd_out, "%s NO %s\r\n", tag, errorstring);
} else {
-diff -urNad cyrus-imapd-2.2.13/imap/nntpd.c /tmp/dpep.556KMT/cyrus-imapd-2.2.13/imap/nntpd.c
+diff -urNad cyrus-imapd-2.2.13/imap/nntpd.c cyrus-imapd-2.2.13/imap/nntpd.c
--- cyrus-imapd-2.2.13/imap/nntpd.c 2006-03-31 20:18:13.000000000 +0200
-+++ /tmp/dpep.556KMT/cyrus-imapd-2.2.13/imap/nntpd.c 2006-05-03 16:02:02.678828066 +0200
++++ cyrus-imapd-2.2.13/imap/nntpd.c 2006-05-03 16:02:02.678828066 +0200
@@ -2140,13 +2140,16 @@
default:
code = 481;
@@ -61,9 +61,9 @@
if (errorstring) {
prot_printf(nntp_out, "%d %s\r\n", code, errorstring);
} else {
-diff -urNad cyrus-imapd-2.2.13/imap/pop3d.c /tmp/dpep.556KMT/cyrus-imapd-2.2.13/imap/pop3d.c
+diff -urNad cyrus-imapd-2.2.13/imap/pop3d.c cyrus-imapd-2.2.13/imap/pop3d.c
--- cyrus-imapd-2.2.13/imap/pop3d.c 2006-03-31 20:18:13.000000000 +0200
-+++ /tmp/dpep.556KMT/cyrus-imapd-2.2.13/imap/pop3d.c 2006-05-03 16:02:02.679827971 +0200
++++ cyrus-imapd-2.2.13/imap/pop3d.c 2006-05-03 16:02:02.679827971 +0200
@@ -1027,15 +1027,18 @@
/* failed authentication */
if (sasl_result != SASL_OK)
@@ -114,9 +114,9 @@
}
reset_saslconn(&popd_saslconn);
-diff -urNad cyrus-imapd-2.2.13/imap/proxyd.c /tmp/dpep.556KMT/cyrus-imapd-2.2.13/imap/proxyd.c
+diff -urNad cyrus-imapd-2.2.13/imap/proxyd.c cyrus-imapd-2.2.13/imap/proxyd.c
--- cyrus-imapd-2.2.13/imap/proxyd.c 2006-03-31 20:18:13.000000000 +0200
-+++ /tmp/dpep.556KMT/cyrus-imapd-2.2.13/imap/proxyd.c 2006-05-03 16:02:02.681827782 +0200
++++ cyrus-imapd-2.2.13/imap/proxyd.c 2006-05-03 16:02:02.681827782 +0200
@@ -2106,7 +2106,7 @@
char c;
struct buf passwdbuf;
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/0004-upstream-fetchnews-timezone-dst-fix.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/0004-upstream-fetchnews-timezone-dst-fix.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/0004-upstream-fetchnews-timezone-dst-fix.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/0004-upstream-fetchnews-timezone-dst-fix.dpatch Fri Jan 22 22:07:03 2010
@@ -6,9 +6,9 @@
## DP: (daylight saving time)
@DPATCH@
-diff -urNad cyrus-imapd-2.2.13/imap/fetchnews.c /tmp/dpep.KgQkoe/cyrus-imapd-2.2.13/imap/fetchnews.c
+diff -urNad cyrus-imapd-2.2.13/imap/fetchnews.c cyrus-imapd-2.2.13/imap/fetchnews.c
--- cyrus-imapd-2.2.13/imap/fetchnews.c 2006-03-31 20:18:13.000000000 +0200
-+++ /tmp/dpep.KgQkoe/cyrus-imapd-2.2.13/imap/fetchnews.c 2006-05-03 16:07:42.020785607 +0200
++++ cyrus-imapd-2.2.13/imap/fetchnews.c 2006-05-03 16:07:42.020785607 +0200
@@ -60,6 +60,7 @@
#include "cyrusdb.h"
#include "exitcodes.h"
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/0005-upstream-fix-ctl_mboxlist-dump-undump.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/0005-upstream-fix-ctl_mboxlist-dump-undump.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/0005-upstream-fix-ctl_mboxlist-dump-undump.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/0005-upstream-fix-ctl_mboxlist-dump-undump.dpatch Fri Jan 22 22:07:03 2010
@@ -6,9 +6,9 @@
## DP: and undumps mailbox type flags)
@DPATCH@
-diff -urNad cyrus-imapd-2.2.13/doc/changes.html /tmp/dpep.C9eSTj/cyrus-imapd-2.2.13/doc/changes.html
+diff -urNad cyrus-imapd-2.2.13/doc/changes.html cyrus-imapd-2.2.13/doc/changes.html
--- cyrus-imapd-2.2.13/doc/changes.html 2006-05-03 17:19:51.000000000 +0200
-+++ /tmp/dpep.C9eSTj/cyrus-imapd-2.2.13/doc/changes.html 2006-05-03 17:26:24.115155499 +0200
++++ cyrus-imapd-2.2.13/doc/changes.html 2006-05-03 17:26:24.115155499 +0200
@@ -8,6 +8,12 @@
</head>
<body>
@@ -22,9 +22,9 @@
<h1>Changes to the Cyrus IMAP Server since 2.2.12</h1>
<ul>
<li>Allow sieve scripts to be run on shared mailboxes (via <tt>sieve</tt>
-diff -urNad cyrus-imapd-2.2.13/imap/ctl_mboxlist.c /tmp/dpep.C9eSTj/cyrus-imapd-2.2.13/imap/ctl_mboxlist.c
+diff -urNad cyrus-imapd-2.2.13/imap/ctl_mboxlist.c cyrus-imapd-2.2.13/imap/ctl_mboxlist.c
--- cyrus-imapd-2.2.13/imap/ctl_mboxlist.c 2006-05-03 17:19:51.000000000 +0200
-+++ /tmp/dpep.C9eSTj/cyrus-imapd-2.2.13/imap/ctl_mboxlist.c 2006-05-03 17:26:24.129154183 +0200
++++ cyrus-imapd-2.2.13/imap/ctl_mboxlist.c 2006-05-03 17:26:24.129154183 +0200
@@ -187,7 +187,7 @@
switch (d->op) {
case DUMP:
@@ -65,9 +65,9 @@
tries = 0;
retry:
-diff -urNad cyrus-imapd-2.2.13/man/ctl_mboxlist.8 /tmp/dpep.C9eSTj/cyrus-imapd-2.2.13/man/ctl_mboxlist.8
+diff -urNad cyrus-imapd-2.2.13/man/ctl_mboxlist.8 cyrus-imapd-2.2.13/man/ctl_mboxlist.8
--- cyrus-imapd-2.2.13/man/ctl_mboxlist.8 2006-05-03 17:19:51.000000000 +0200
-+++ /tmp/dpep.C9eSTj/cyrus-imapd-2.2.13/man/ctl_mboxlist.8 2006-05-03 17:26:24.125154559 +0200
++++ cyrus-imapd-2.2.13/man/ctl_mboxlist.8 2006-05-03 17:26:24.125154559 +0200
@@ -104,7 +104,9 @@
.TP
.B \-d
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/0006-upstream-free-backend-fix.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/0006-upstream-free-backend-fix.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/0006-upstream-free-backend-fix.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/0006-upstream-free-backend-fix.dpatch Fri Jan 22 22:07:03 2010
@@ -6,9 +6,9 @@
## DP: (don't free cached connections)
@DPATCH@
-diff -urNad cyrus-imapd-2.2.13/imap/backend.c /tmp/dpep.78gN6M/cyrus-imapd-2.2.13/imap/backend.c
+diff -urNad cyrus-imapd-2.2.13/imap/backend.c cyrus-imapd-2.2.13/imap/backend.c
--- cyrus-imapd-2.2.13/imap/backend.c 2006-05-12 12:01:09.000000000 +0200
-+++ /tmp/dpep.78gN6M/cyrus-imapd-2.2.13/imap/backend.c 2006-05-12 12:14:12.909137753 +0200
++++ cyrus-imapd-2.2.13/imap/backend.c 2006-05-12 12:14:12.909137753 +0200
@@ -39,7 +39,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/0007-upstream-remove-undump-size-limit.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/0007-upstream-remove-undump-size-limit.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/0007-upstream-remove-undump-size-limit.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/0007-upstream-remove-undump-size-limit.dpatch Fri Jan 22 22:07:03 2010
@@ -6,9 +6,9 @@
## DP: (write file directly to disk rather than reading the literal into memory)
@DPATCH@
-diff -urNad cyrus-imapd-2.2.13/imap/mbdump.c /tmp/dpep.ttpH40/cyrus-imapd-2.2.13/imap/mbdump.c
+diff -urNad cyrus-imapd-2.2.13/imap/mbdump.c cyrus-imapd-2.2.13/imap/mbdump.c
--- cyrus-imapd-2.2.13/imap/mbdump.c 2006-05-12 12:15:44.000000000 +0200
-+++ /tmp/dpep.ttpH40/cyrus-imapd-2.2.13/imap/mbdump.c 2006-05-12 12:17:32.871354378 +0200
++++ cyrus-imapd-2.2.13/imap/mbdump.c 2006-05-12 12:17:32.871354378 +0200
@@ -1,5 +1,5 @@
/* mbdump.c -- Mailbox dump routines
- * $Id: mbdump.c,v 1.30 2004/05/22 03:45:51 rjs3 Exp $
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/0008-upstream-better-message-track-logging.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/0008-upstream-better-message-track-logging.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/0008-upstream-better-message-track-logging.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/0008-upstream-better-message-track-logging.dpatch Fri Jan 22 22:07:03 2010
@@ -5,9 +5,9 @@
## DP: better logging to facilitate message tracking (Wes Craig <wes at umich.edu>)
@DPATCH@
-diff -urNad cyrus-imapd-2.2.13/imap/lmtp_sieve.c /tmp/dpep.Onc5tY/cyrus-imapd-2.2.13/imap/lmtp_sieve.c
+diff -urNad cyrus-imapd-2.2.13/imap/lmtp_sieve.c cyrus-imapd-2.2.13/imap/lmtp_sieve.c
--- cyrus-imapd-2.2.13/imap/lmtp_sieve.c 2006-03-31 20:18:13.000000000 +0200
-+++ /tmp/dpep.Onc5tY/cyrus-imapd-2.2.13/imap/lmtp_sieve.c 2006-05-12 12:17:52.579503152 +0200
++++ cyrus-imapd-2.2.13/imap/lmtp_sieve.c 2006-05-12 12:17:52.579503152 +0200
@@ -1,6 +1,6 @@
/* lmtp_sieve.c -- Sieve implementation for lmtpd
*
@@ -63,9 +63,9 @@
return SIEVE_OK;
} else {
if (res == -1) {
-diff -urNad cyrus-imapd-2.2.13/imap/lmtpd.c /tmp/dpep.Onc5tY/cyrus-imapd-2.2.13/imap/lmtpd.c
+diff -urNad cyrus-imapd-2.2.13/imap/lmtpd.c cyrus-imapd-2.2.13/imap/lmtpd.c
--- cyrus-imapd-2.2.13/imap/lmtpd.c 2006-05-06 10:34:48.000000000 +0200
-+++ /tmp/dpep.Onc5tY/cyrus-imapd-2.2.13/imap/lmtpd.c 2006-05-12 12:17:52.578503246 +0200
++++ cyrus-imapd-2.2.13/imap/lmtpd.c 2006-05-12 12:17:52.578503246 +0200
@@ -1,6 +1,6 @@
/* lmtpd.c -- Program to deliver mail to a mailbox
*
@@ -82,9 +82,9 @@
}
}
-diff -urNad cyrus-imapd-2.2.13/imap/mailbox.c /tmp/dpep.Onc5tY/cyrus-imapd-2.2.13/imap/mailbox.c
+diff -urNad cyrus-imapd-2.2.13/imap/mailbox.c cyrus-imapd-2.2.13/imap/mailbox.c
--- cyrus-imapd-2.2.13/imap/mailbox.c 2006-05-06 10:34:48.000000000 +0200
-+++ /tmp/dpep.Onc5tY/cyrus-imapd-2.2.13/imap/mailbox.c 2006-05-12 12:17:52.581502964 +0200
++++ cyrus-imapd-2.2.13/imap/mailbox.c 2006-05-12 12:17:52.581502964 +0200
@@ -1,5 +1,5 @@
/* mailbox.c -- Mailbox manipulation routines
- * $Id: mailbox.c,v 1.159 2005/04/07 00:25:52 shadow Exp $
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/0009-upstream-remove-redundant-wildcard-check.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/0009-upstream-remove-redundant-wildcard-check.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/0009-upstream-remove-redundant-wildcard-check.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/0009-upstream-remove-redundant-wildcard-check.dpatch Fri Jan 22 22:07:03 2010
@@ -7,9 +7,9 @@
## DP: (Wes Craig <wes at umich.edu>)
@DPATCH@
-diff -urNad cyrus-imapd-2.2.13/imap/imapd.c /tmp/dpep.3mRazZ/cyrus-imapd-2.2.13/imap/imapd.c
+diff -urNad cyrus-imapd-2.2.13/imap/imapd.c cyrus-imapd-2.2.13/imap/imapd.c
--- cyrus-imapd-2.2.13/imap/imapd.c 2006-05-12 12:18:02.000000000 +0200
-+++ /tmp/dpep.3mRazZ/cyrus-imapd-2.2.13/imap/imapd.c 2006-05-12 12:18:43.442725508 +0200
++++ cyrus-imapd-2.2.13/imap/imapd.c 2006-05-12 12:18:43.442725508 +0200
@@ -38,7 +38,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
@@ -31,9 +31,9 @@
/* attempt to rename the base mailbox */
if (!r) {
r = mboxlist_renamemailbox(oldmailboxname, newmailboxname, partition,
-diff -urNad cyrus-imapd-2.2.13/imap/mboxlist.c /tmp/dpep.3mRazZ/cyrus-imapd-2.2.13/imap/mboxlist.c
+diff -urNad cyrus-imapd-2.2.13/imap/mboxlist.c cyrus-imapd-2.2.13/imap/mboxlist.c
--- cyrus-imapd-2.2.13/imap/mboxlist.c 2006-05-06 10:34:48.000000000 +0200
-+++ /tmp/dpep.3mRazZ/cyrus-imapd-2.2.13/imap/mboxlist.c 2006-05-12 12:18:12.192660857 +0200
++++ cyrus-imapd-2.2.13/imap/mboxlist.c 2006-05-12 12:18:12.192660857 +0200
@@ -40,7 +40,7 @@
*
*/
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/0010-upstream-fix-libRSAglue-linkage.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/0010-upstream-fix-libRSAglue-linkage.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/0010-upstream-fix-libRSAglue-linkage.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/0010-upstream-fix-libRSAglue-linkage.dpatch Fri Jan 22 22:07:03 2010
@@ -6,9 +6,9 @@
## DP: Upstream committer: murch
@DPATCH@
-diff -urNad cyrus-imapd-2.2.13/cmulocal/openssl.m4 /tmp/dpep.JZkfga/cyrus-imapd-2.2.13/cmulocal/openssl.m4
+diff -urNad cyrus-imapd-2.2.13/cmulocal/openssl.m4 cyrus-imapd-2.2.13/cmulocal/openssl.m4
--- cyrus-imapd-2.2.13/cmulocal/openssl.m4 2006-03-31 20:18:13.000000000 +0200
-+++ /tmp/dpep.JZkfga/cyrus-imapd-2.2.13/cmulocal/openssl.m4 2006-05-17 21:06:43.162414202 +0200
++++ cyrus-imapd-2.2.13/cmulocal/openssl.m4 2006-05-17 21:06:43.162414202 +0200
@@ -1,6 +1,6 @@
dnl
dnl macros for configure.in to detect openssl
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/0011-upstream-allow-compile-with-krb5-1.4.3.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/0011-upstream-allow-compile-with-krb5-1.4.3.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/0011-upstream-allow-compile-with-krb5-1.4.3.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/0011-upstream-allow-compile-with-krb5-1.4.3.dpatch Fri Jan 22 22:07:03 2010
@@ -5,9 +5,9 @@
## DP: patch to compile with MIT krb5 1.4.3 (Philip Guenther <guenther at sendmail.com>)
@DPATCH@
-diff -urNad cyrus-imapd-2.2.13/cmulocal/sasl2.m4 /tmp/dpep.YFbKHG/cyrus-imapd-2.2.13/cmulocal/sasl2.m4
+diff -urNad cyrus-imapd-2.2.13/cmulocal/sasl2.m4 cyrus-imapd-2.2.13/cmulocal/sasl2.m4
--- cyrus-imapd-2.2.13/cmulocal/sasl2.m4 2006-03-31 20:18:13.000000000 +0200
-+++ /tmp/dpep.YFbKHG/cyrus-imapd-2.2.13/cmulocal/sasl2.m4 2006-05-19 15:18:35.458325180 +0200
++++ cyrus-imapd-2.2.13/cmulocal/sasl2.m4 2006-05-19 15:18:35.458325180 +0200
@@ -1,6 +1,6 @@
# sasl2.m4--sasl2 libraries and includes
# Rob Siemborski
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/0013-upstream-allow-report-above-4GB-mboxsize.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/0013-upstream-allow-report-above-4GB-mboxsize.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/0013-upstream-allow-report-above-4GB-mboxsize.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/0013-upstream-allow-report-above-4GB-mboxsize.dpatch Fri Jan 22 22:07:03 2010
@@ -5,9 +5,9 @@
## DP: Upstream patch to allow reporting of mailbox sizes above 4GB
@DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./imap/annotate.c /tmp/dpep-work.Lq66kS/cyrus-imapd-2.2.13/imap/annotate.c
+diff -urNad --exclude=CVS --exclude=.svn ./imap/annotate.c 66kS/cyrus-imapd-2.2.13/imap/annotate.c
--- ./imap/annotate.c 2006-04-25 17:28:58.000000000 +0200
-+++ /tmp/dpep-work.Lq66kS/cyrus-imapd-2.2.13/imap/annotate.c 2006-06-08 13:46:52.018338460 +0200
++++ 66kS/cyrus-imapd-2.2.13/imap/annotate.c 2006-06-08 13:46:52.018338460 +0200
@@ -703,7 +703,13 @@
struct mailbox mailbox;
struct index_record record;
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/0014-upstream-fix-locks-during-reconstruction.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/0014-upstream-fix-locks-during-reconstruction.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/0014-upstream-fix-locks-during-reconstruction.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/0014-upstream-fix-locks-during-reconstruction.dpatch Fri Jan 22 22:07:03 2010
@@ -5,9 +5,9 @@
## DP: Upstream: don't lock/unlock_pop when reconstructing
@DPATCH@
-diff -urNad cyrus-imapd-2.2.13/imap/mailbox.c /tmp/dpep.ifqqjz/cyrus-imapd-2.2.13/imap/mailbox.c
+diff -urNad cyrus-imapd-2.2.13/imap/mailbox.c cyrus-imapd-2.2.13/imap/mailbox.c
--- cyrus-imapd-2.2.13/imap/mailbox.c 2006-06-08 12:59:59.000000000 +0200
-+++ /tmp/dpep.ifqqjz/cyrus-imapd-2.2.13/imap/mailbox.c 2006-06-08 13:00:01.083767966 +0200
++++ cyrus-imapd-2.2.13/imap/mailbox.c 2006-06-08 13:00:01.083767966 +0200
@@ -1,5 +1,5 @@
/* mailbox.c -- Mailbox manipulation routines
- * $Id: mailbox.c,v 1.160 2006/05/10 16:27:18 murch Exp $
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/0015-upstream-fix-logic-error-in-imapoptions.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/0015-upstream-fix-logic-error-in-imapoptions.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/0015-upstream-fix-logic-error-in-imapoptions.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/0015-upstream-fix-logic-error-in-imapoptions.dpatch Fri Jan 22 22:07:03 2010
@@ -5,9 +5,9 @@
## DP: fix a small logical mistake in imapoptions description
@DPATCH@
-diff -urNad cyrus-imapd-2.2.13/lib/imapoptions /tmp/dpep.CwO4OZ/cyrus-imapd-2.2.13/lib/imapoptions
+diff -urNad cyrus-imapd-2.2.13/lib/imapoptions cyrus-imapd-2.2.13/lib/imapoptions
--- cyrus-imapd-2.2.13/lib/imapoptions 2006-06-04 21:47:19.000000000 +0200
-+++ /tmp/dpep.CwO4OZ/cyrus-imapd-2.2.13/lib/imapoptions 2006-06-06 17:51:14.392340472 +0200
++++ cyrus-imapd-2.2.13/lib/imapoptions 2006-06-06 17:51:14.392340472 +0200
@@ -42,7 +42,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/0016-upstream-fix-typos.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/0016-upstream-fix-typos.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/0016-upstream-fix-typos.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/0016-upstream-fix-typos.dpatch Fri Jan 22 22:07:03 2010
@@ -5,9 +5,9 @@
## DP: Upstream fix for some typos in manpages for reconstruct and chk_cyrus
@DPATCH@
-diff -urNad cyrus-imapd-2.2.13/man/chk_cyrus.8 /tmp/dpep.IOS55O/cyrus-imapd-2.2.13/man/chk_cyrus.8
+diff -urNad cyrus-imapd-2.2.13/man/chk_cyrus.8 cyrus-imapd-2.2.13/man/chk_cyrus.8
--- cyrus-imapd-2.2.13/man/chk_cyrus.8 2006-08-06 20:04:29.000000000 +0200
-+++ /tmp/dpep.IOS55O/cyrus-imapd-2.2.13/man/chk_cyrus.8 2006-08-06 20:08:15.026586061 +0200
++++ cyrus-imapd-2.2.13/man/chk_cyrus.8 2006-08-06 20:08:15.026586061 +0200
@@ -40,7 +40,7 @@
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
@@ -39,9 +39,9 @@
May not be specified with -P.
.SH FILES
.TP
-diff -urNad cyrus-imapd-2.2.13/man/reconstruct.8 /tmp/dpep.IOS55O/cyrus-imapd-2.2.13/man/reconstruct.8
+diff -urNad cyrus-imapd-2.2.13/man/reconstruct.8 cyrus-imapd-2.2.13/man/reconstruct.8
--- cyrus-imapd-2.2.13/man/reconstruct.8 2006-08-06 20:04:29.000000000 +0200
-+++ /tmp/dpep.IOS55O/cyrus-imapd-2.2.13/man/reconstruct.8 2006-08-06 20:10:35.754646314 +0200
++++ cyrus-imapd-2.2.13/man/reconstruct.8 2006-08-06 20:10:35.754646314 +0200
@@ -39,7 +39,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/0017-upstream-no-body-empty-string-instead-of-null.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/0017-upstream-no-body-empty-string-instead-of-null.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/0017-upstream-no-body-empty-string-instead-of-null.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/0017-upstream-no-body-empty-string-instead-of-null.dpatch Fri Jan 22 22:07:03 2010
@@ -5,9 +5,9 @@
## DP: return an empty string for empty body parts instead of NULL
@DPATCH@
-diff -urNad cyrus-imapd-2.2.13/lib/charset.c /tmp/dpep.RuEsfH/cyrus-imapd-2.2.13/lib/charset.c
+diff -urNad cyrus-imapd-2.2.13/lib/charset.c cyrus-imapd-2.2.13/lib/charset.c
--- cyrus-imapd-2.2.13/lib/charset.c 2005-03-12 23:09:22.000000000 +0100
-+++ /tmp/dpep.RuEsfH/cyrus-imapd-2.2.13/lib/charset.c 2006-08-06 19:55:36.020854674 +0200
++++ cyrus-imapd-2.2.13/lib/charset.c 2006-08-06 19:55:36.020854674 +0200
@@ -39,7 +39,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/0018-upstream-ntohl-instead-of-htonl.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/0018-upstream-ntohl-instead-of-htonl.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/0018-upstream-ntohl-instead-of-htonl.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/0018-upstream-ntohl-instead-of-htonl.dpatch Fri Jan 22 22:07:03 2010
@@ -5,9 +5,9 @@
## DP: use ntohl() instead of htonl() in mailbox_read_index_record()
@DPATCH@
-diff -urNad cyrus-imapd-2.2.13/imap/mailbox.c /tmp/dpep.20jd7v/cyrus-imapd-2.2.13/imap/mailbox.c
+diff -urNad cyrus-imapd-2.2.13/imap/mailbox.c cyrus-imapd-2.2.13/imap/mailbox.c
--- cyrus-imapd-2.2.13/imap/mailbox.c 2006-08-06 20:03:02.000000000 +0200
-+++ /tmp/dpep.20jd7v/cyrus-imapd-2.2.13/imap/mailbox.c 2006-08-06 20:03:13.168502599 +0200
++++ cyrus-imapd-2.2.13/imap/mailbox.c 2006-08-06 20:03:13.168502599 +0200
@@ -1,5 +1,5 @@
/* mailbox.c -- Mailbox manipulation routines
- * $Id: mailbox.c,v 1.161 2006/06/02 18:56:52 murch Exp $
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/0019-upstream-sieve_allowreferrals.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/0019-upstream-sieve_allowreferrals.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/0019-upstream-sieve_allowreferrals.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/0019-upstream-sieve_allowreferrals.dpatch Fri Jan 22 22:07:03 2010
@@ -5,9 +5,9 @@
## DP: Upstream: patch sieve to allow referrals
@DPATCH@
-diff -urNad cyrus-imapd-2.2.13/doc/changes.html /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/doc/changes.html
+diff -urNad cyrus-imapd-2.2.13/doc/changes.html cyrus-imapd-2.2.13/doc/changes.html
--- cyrus-imapd-2.2.13/doc/changes.html 2006-08-31 16:46:21.000000000 +0200
-+++ /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/doc/changes.html 2006-08-31 16:53:15.970326054 +0200
++++ cyrus-imapd-2.2.13/doc/changes.html 2006-08-31 16:53:15.970326054 +0200
@@ -1,6 +1,6 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -40,9 +40,9 @@
<a href="index.html">Return</a> to the Cyrus IMAP Server Home Page
</body>
</html>
-diff -urNad cyrus-imapd-2.2.13/imap/backend.c /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/imap/backend.c
+diff -urNad cyrus-imapd-2.2.13/imap/backend.c cyrus-imapd-2.2.13/imap/backend.c
--- cyrus-imapd-2.2.13/imap/backend.c 2006-08-31 16:46:21.000000000 +0200
-+++ /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/imap/backend.c 2006-08-31 16:55:26.609576327 +0200
++++ cyrus-imapd-2.2.13/imap/backend.c 2006-08-31 16:55:26.609576327 +0200
@@ -39,7 +39,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
@@ -115,9 +115,9 @@
/* now need to authenticate to backend server,
unless we're doing LMTP on a UNIX socket (deliver) */
-diff -urNad cyrus-imapd-2.2.13/imap/protocol.c /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/imap/protocol.c
+diff -urNad cyrus-imapd-2.2.13/imap/protocol.c cyrus-imapd-2.2.13/imap/protocol.c
--- cyrus-imapd-2.2.13/imap/protocol.c 2006-08-31 16:44:13.000000000 +0200
-+++ /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/imap/protocol.c 2006-08-31 16:53:15.973325759 +0200
++++ cyrus-imapd-2.2.13/imap/protocol.c 2006-08-31 16:53:15.973325759 +0200
@@ -39,7 +39,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
@@ -200,9 +200,9 @@
+ { NULL, NULL, NULL },
+ { "LOGOUT", NULL, "OK" } }
};
-diff -urNad cyrus-imapd-2.2.13/imap/protocol.h /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/imap/protocol.h
+diff -urNad cyrus-imapd-2.2.13/imap/protocol.h cyrus-imapd-2.2.13/imap/protocol.h
--- cyrus-imapd-2.2.13/imap/protocol.h 2006-08-31 16:44:13.000000000 +0200
-+++ /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/imap/protocol.h 2006-08-31 16:53:15.973325759 +0200
++++ cyrus-imapd-2.2.13/imap/protocol.h 2006-08-31 16:53:15.973325759 +0200
@@ -39,7 +39,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
@@ -246,9 +246,9 @@
};
#endif /* _INCLUDED_PROTOCOL_H */
-diff -urNad cyrus-imapd-2.2.13/imap/saslclient.c /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/imap/saslclient.c
+diff -urNad cyrus-imapd-2.2.13/imap/saslclient.c cyrus-imapd-2.2.13/imap/saslclient.c
--- cyrus-imapd-2.2.13/imap/saslclient.c 2006-08-31 16:44:13.000000000 +0200
-+++ /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/imap/saslclient.c 2006-08-31 16:53:15.972325858 +0200
++++ cyrus-imapd-2.2.13/imap/saslclient.c 2006-08-31 16:53:15.972325858 +0200
@@ -39,7 +39,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
@@ -315,9 +315,9 @@
else {
/* unknown response */
if (status) *status = buf;
-diff -urNad cyrus-imapd-2.2.13/lib/imapoptions /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/lib/imapoptions
+diff -urNad cyrus-imapd-2.2.13/lib/imapoptions cyrus-imapd-2.2.13/lib/imapoptions
--- cyrus-imapd-2.2.13/lib/imapoptions 2006-08-31 16:46:22.000000000 +0200
-+++ /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/lib/imapoptions 2006-08-31 16:53:44.074560998 +0200
++++ cyrus-imapd-2.2.13/lib/imapoptions 2006-08-31 16:53:44.074560998 +0200
@@ -42,7 +42,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
.\" OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -339,9 +339,9 @@
# xxx badly worded
{ "unix_group_enable", 1, SWITCH }
/* Should we look up groups when using auth_unix (disable this if you are
-diff -urNad cyrus-imapd-2.2.13/timsieved/Makefile.in /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/timsieved/Makefile.in
+diff -urNad cyrus-imapd-2.2.13/timsieved/Makefile.in cyrus-imapd-2.2.13/timsieved/Makefile.in
--- cyrus-imapd-2.2.13/timsieved/Makefile.in 2006-08-31 16:44:13.000000000 +0200
-+++ /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/timsieved/Makefile.in 2006-08-31 16:53:15.967326349 +0200
++++ cyrus-imapd-2.2.13/timsieved/Makefile.in 2006-08-31 16:53:15.967326349 +0200
@@ -1,5 +1,5 @@
# Makefile.in - timsieved makefile
-# $Id: Makefile.in,v 1.24 2004/05/28 18:03:10 rjs3 Exp $
@@ -358,9 +358,9 @@
timsieved: $(OBJS) $(SERVICE)
$(CC) $(LDFLAGS) -o timsieved \
-diff -urNad cyrus-imapd-2.2.13/timsieved/actions.c /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/timsieved/actions.c
+diff -urNad cyrus-imapd-2.2.13/timsieved/actions.c cyrus-imapd-2.2.13/timsieved/actions.c
--- cyrus-imapd-2.2.13/timsieved/actions.c 2006-08-31 16:44:13.000000000 +0200
-+++ /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/timsieved/actions.c 2006-08-31 16:53:15.967326349 +0200
++++ cyrus-imapd-2.2.13/timsieved/actions.c 2006-08-31 16:53:15.967326349 +0200
@@ -1,6 +1,6 @@
/* actions.c -- executes the commands for timsieved
* Tim Martin
@@ -381,9 +381,9 @@
/* SASL */
if (!authenticated &&
-diff -urNad cyrus-imapd-2.2.13/timsieved/parser.c /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/timsieved/parser.c
+diff -urNad cyrus-imapd-2.2.13/timsieved/parser.c cyrus-imapd-2.2.13/timsieved/parser.c
--- cyrus-imapd-2.2.13/timsieved/parser.c 2006-08-31 16:44:13.000000000 +0200
-+++ /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/timsieved/parser.c 2006-08-31 16:53:15.968326251 +0200
++++ cyrus-imapd-2.2.13/timsieved/parser.c 2006-08-31 16:53:15.968326251 +0200
@@ -1,7 +1,7 @@
/* parser.c -- parser used by timsieved
* Tim Martin
@@ -499,9 +499,9 @@
} else if (actions_setuser(username) != TIMSIEVE_OK) {
*errmsg = "internal error";
syslog(LOG_ERR, "error in actions_setuser()");
-diff -urNad cyrus-imapd-2.2.13/timsieved/timsieved.c /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/timsieved/timsieved.c
+diff -urNad cyrus-imapd-2.2.13/timsieved/timsieved.c cyrus-imapd-2.2.13/timsieved/timsieved.c
--- cyrus-imapd-2.2.13/timsieved/timsieved.c 2006-08-31 16:44:13.000000000 +0200
-+++ /tmp/dpep.LH0NPR/cyrus-imapd-2.2.13/timsieved/timsieved.c 2006-08-31 16:53:15.968326251 +0200
++++ cyrus-imapd-2.2.13/timsieved/timsieved.c 2006-08-31 16:53:15.968326251 +0200
@@ -1,7 +1,7 @@
/* timsieved.c -- main file for timsieved (sieve script accepting program)
* Tim Martin
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/0020-upstream-client-literal-prefix.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/0020-upstream-client-literal-prefix.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/0020-upstream-client-literal-prefix.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/0020-upstream-client-literal-prefix.dpatch Fri Jan 22 22:07:03 2010
@@ -5,9 +5,9 @@
## DP: Upstream patch: Prefix client responses by C:
@DPATCH@
-diff -urNad cyrus-imapd-2.2.13/imtest/imtest.c /tmp/dpep.GMHaSr/cyrus-imapd-2.2.13/imtest/imtest.c
+diff -urNad cyrus-imapd-2.2.13/imtest/imtest.c cyrus-imapd-2.2.13/imtest/imtest.c
--- cyrus-imapd-2.2.13/imtest/imtest.c 2006-10-03 20:48:22.000000000 +0200
-+++ /tmp/dpep.GMHaSr/cyrus-imapd-2.2.13/imtest/imtest.c 2006-10-03 20:55:16.098628728 +0200
++++ cyrus-imapd-2.2.13/imtest/imtest.c 2006-10-03 20:55:16.098628728 +0200
@@ -1,7 +1,7 @@
/* imtest.c -- IMAP/POP3/NNTP/LMTP/SMTP/MUPDATE/MANAGESIEVE test client
* Ken Murchison (multi-protocol implementation)
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/0021-upstream-applied_RFC4314_READ-ONLY_logic.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/0021-upstream-applied_RFC4314_READ-ONLY_logic.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/0021-upstream-applied_RFC4314_READ-ONLY_logic.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/0021-upstream-applied_RFC4314_READ-ONLY_logic.dpatch Fri Jan 22 22:07:03 2010
@@ -5,9 +5,9 @@
## DP: Upstream: applied RFC4314 READ-ONLY logic (by murch)
@DPATCH@
-diff -urNad cyrus-imapd-2.2.13/imap/imapd.c /tmp/dpep.eY5bnj/cyrus-imapd-2.2.13/imap/imapd.c
+diff -urNad cyrus-imapd-2.2.13/imap/imapd.c cyrus-imapd-2.2.13/imap/imapd.c
--- cyrus-imapd-2.2.13/imap/imapd.c 2006-11-13 19:25:43.000000000 +0100
-+++ /tmp/dpep.eY5bnj/cyrus-imapd-2.2.13/imap/imapd.c 2006-11-13 19:25:48.253689109 +0100
++++ cyrus-imapd-2.2.13/imap/imapd.c 2006-11-13 19:25:48.253689109 +0100
@@ -38,7 +38,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
@@ -35,9 +35,9 @@
"WRITE" : "ONLY", error_message(IMAP_OK_COMPLETED));
proc_register("imapd", imapd_clienthost, imapd_userid, mailboxname);
-diff -urNad cyrus-imapd-2.2.13/lib/acl.h /tmp/dpep.eY5bnj/cyrus-imapd-2.2.13/lib/acl.h
+diff -urNad cyrus-imapd-2.2.13/lib/acl.h cyrus-imapd-2.2.13/lib/acl.h
--- cyrus-imapd-2.2.13/lib/acl.h 2005-03-12 23:09:22.000000000 +0100
-+++ /tmp/dpep.eY5bnj/cyrus-imapd-2.2.13/lib/acl.h 2006-11-13 19:22:53.756725336 +0100
++++ cyrus-imapd-2.2.13/lib/acl.h 2006-11-13 19:22:53.756725336 +0100
@@ -42,7 +42,7 @@
* Start Date: 6/28/93
*/
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/0022-upstream-dont-send-empty-literal-response.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/0022-upstream-dont-send-empty-literal-response.dpatch?rev=873&root=3Dcyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/0022-upstream-dont-send-empty-literal-response.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/0022-upstream-dont-send-empty-literal-response.dpatch Fri Jan 22 22:07:03 2010
@@ -5,9 +5,9 @@
## DP: No description.
@DPATCH@
-diff -urNad cyrus-imapd-2.2.13/imap/saslclient.c /tmp/dpep.8onULu/cyrus-imapd-2.2.13/imap/saslclient.c
+diff -urNad cyrus-imapd-2.2.13/imap/saslclient.c cyrus-imapd-2.2.13/imap/saslclient.c
--- cyrus-imapd-2.2.13/imap/saslclient.c 2007-02-27 05:01:09.000000000 +0100
-+++ /tmp/dpep.8onULu/cyrus-imapd-2.2.13/imap/saslclient.c 2007-02-27 05:03:11.579096512 +0100
++++ cyrus-imapd-2.2.13/imap/saslclient.c 2007-02-27 05:03:11.579096512 +0100
@@ -39,7 +39,7 @@
* OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/0023-sort-illegal-dates-first.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/0023-sort-illegal-dates-first.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/0023-sort-illegal-dates-first.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/0023-sort-illegal-dates-first.dpatch Fri Jan 22 22:07:03 2010
@@ -5,9 +5,9 @@
## DP: No description.
@DPATCH@
-diff -urNad cyrus-imapd-2.2.13/imap/index.c /tmp/dpep.EY7gp1/cyrus-imapd-2.2.13/imap/index.c
+diff -urNad cyrus-imapd-2.2.13/imap/index.c cyrus-imapd-2.2.13/imap/index.c
--- cyrus-imapd-2.2.13/imap/index.c 2007-02-27 05:01:09.000000000 +0100
-+++ /tmp/dpep.EY7gp1/cyrus-imapd-2.2.13/imap/index.c 2007-02-27 05:03:44.276846274 +0100
++++ cyrus-imapd-2.2.13/imap/index.c 2007-02-27 05:03:44.276846274 +0100
@@ -41,7 +41,7 @@
*
*/
@@ -43,9 +43,9 @@
case SORT_FROM:
ret = strcmp(md1->from, md2->from);
break;
-diff -urNad cyrus-imapd-2.2.13/imap/message.c /tmp/dpep.EY7gp1/cyrus-imapd-2.2.13/imap/message.c
+diff -urNad cyrus-imapd-2.2.13/imap/message.c cyrus-imapd-2.2.13/imap/message.c
--- cyrus-imapd-2.2.13/imap/message.c 2007-02-27 05:01:09.000000000 +0100
-+++ /tmp/dpep.EY7gp1/cyrus-imapd-2.2.13/imap/message.c 2007-02-27 05:03:44.277846175 +0100
++++ cyrus-imapd-2.2.13/imap/message.c 2007-02-27 05:03:44.277846175 +0100
@@ -41,7 +41,7 @@
*/
@@ -64,9 +64,9 @@
}
/*
-diff -urNad cyrus-imapd-2.2.13/imap/message.h /tmp/dpep.EY7gp1/cyrus-imapd-2.2.13/imap/message.h
+diff -urNad cyrus-imapd-2.2.13/imap/message.h cyrus-imapd-2.2.13/imap/message.h
--- cyrus-imapd-2.2.13/imap/message.h 2007-02-27 05:01:09.000000000 +0100
-+++ /tmp/dpep.EY7gp1/cyrus-imapd-2.2.13/imap/message.h 2007-02-27 05:03:44.278846076 +0100
++++ cyrus-imapd-2.2.13/imap/message.h 2007-02-27 05:03:44.278846076 +0100
@@ -1,5 +1,5 @@
/* message.h -- Message parsing
- $Id: message.h,v 1.6 2003/02/13 20:15:28 rjs3 Exp $
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/0090-fix-casts.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/0090-fix-casts.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/0090-fix-casts.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/0090-fix-casts.dpatch Fri Jan 22 22:07:03 2010
@@ -6,9 +6,9 @@
## DP: of different size.
@DPATCH@
-diff -urNad --exclude=CVS --exclude=.svn ./imap/squat_build.c /tmp/dpep-work.MJclMQ/cyrus-imapd-2.2.13/imap/squat_build.c
+diff -urNad --exclude=CVS --exclude=.svn ./imap/squat_build.c cyrus-imapd-2.2.13/imap/squat_build.c
--- ./imap/squat_build.c 2006-04-25 17:28:58.000000000 +0200
-+++ /tmp/dpep-work.MJclMQ/cyrus-imapd-2.2.13/imap/squat_build.c 2006-06-08 14:33:06.966146056 +0200
++++ cyrus-imapd-2.2.13/imap/squat_build.c 2006-06-08 14:33:06.966146056 +0200
@@ -479,7 +479,7 @@
for (i = 0; i < VECTOR_SIZE(t->entries); i++) {
SquatWordTableEntry* e = &(t->entries[i]);
@@ -36,9 +36,9 @@
/* Got a singleton at this branch point. Just output the single word. */
word[1] = (char)(e->leaf_presence_singleton >> 1);
e->leaf_presence = NULL; /* clear the leaf out */
-diff -urNad --exclude=CVS --exclude=.svn ./imap/tls.c /tmp/dpep-work.MJclMQ/cyrus-imapd-2.2.13/imap/tls.c
+diff -urNad --exclude=CVS --exclude=.svn ./imap/tls.c cyrus-imapd-2.2.13/imap/tls.c
--- ./imap/tls.c 2006-04-25 17:28:58.000000000 +0200
-+++ /tmp/dpep-work.MJclMQ/cyrus-imapd-2.2.13/imap/tls.c 2006-06-08 14:28:13.259629963 +0200
++++ cyrus-imapd-2.2.13/imap/tls.c 2006-06-08 14:28:13.259629963 +0200
@@ -717,14 +717,22 @@
return (ret);
@@ -66,9 +66,9 @@
argi, ret, (unsigned int) ret);
tls_dump(argp, (int) ret);
}
-diff -urNad --exclude=CVS --exclude=.svn ./master/master.c /tmp/dpep-work.MJclMQ/cyrus-imapd-2.2.13/master/master.c
+diff -urNad --exclude=CVS --exclude=.svn ./master/master.c cyrus-imapd-2.2.13/master/master.c
--- ./master/master.c 2006-04-25 17:28:58.000000000 +0200
-+++ /tmp/dpep-work.MJclMQ/cyrus-imapd-2.2.13/master/master.c 2006-06-08 14:28:13.259629963 +0200
++++ cyrus-imapd-2.2.13/master/master.c 2006-06-08 14:28:13.259629963 +0200
@@ -1304,7 +1304,6 @@
void add_service(const char *name, struct entry *e, void *rock)
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/01-fix_Makefile.in.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/01-fix_Makefile.in.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/01-fix_Makefile.in.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/01-fix_Makefile.in.dpatch Fri Jan 22 22:07:03 2010
@@ -5,9 +5,9 @@
## DP: Fix all Makefile.in files as necessary
@DPATCH@
-diff -urNad complete.dpatch/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/Makefile.in
+diff -urNad complete.dpatch/Makefile.in complete.dpatch/Makefile.in
--- complete.dpatch/Makefile.in 2005-02-14 17:43:44.000000000 +0100
-+++ /tmp/dpep.hthEz2/complete.dpatch/Makefile.in 2005-11-10 16:34:20.133821819 +0100
++++ complete.dpatch/Makefile.in 2005-11-10 16:34:20.133821819 +0100
@@ -41,7 +41,7 @@
#
@@ -17,9 +17,9 @@
DISTSUBDIRS = doc
srcdir = @srcdir@
-diff -urNad complete.dpatch/imap/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/imap/Makefile.in
+diff -urNad complete.dpatch/imap/Makefile.in complete.dpatch/imap/Makefile.in
--- complete.dpatch/imap/Makefile.in 2004-05-28 20:03:02.000000000 +0200
-+++ /tmp/dpep.hthEz2/complete.dpatch/imap/Makefile.in 2005-11-10 16:34:20.133821819 +0100
++++ complete.dpatch/imap/Makefile.in 2005-11-10 16:34:20.133821819 +0100
@@ -72,7 +72,7 @@
LIBS = $(IMAP_LIBS) $(IMAP_COM_ERR_LIBS)
DEPLIBS = ../lib/libcyrus.a ../lib/libcyrus_min.a @DEPLIBS@
@@ -29,9 +29,9 @@
LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
SHELL = /bin/sh
-diff -urNad complete.dpatch/installsieve/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/installsieve/Makefile.in
+diff -urNad complete.dpatch/installsieve/Makefile.in complete.dpatch/installsieve/Makefile.in
--- complete.dpatch/installsieve/Makefile.in 2003-10-22 20:50:11.000000000 +0200
-+++ /tmp/dpep.hthEz2/complete.dpatch/installsieve/Makefile.in 2005-11-10 16:34:20.134821720 +0100
++++ complete.dpatch/installsieve/Makefile.in 2005-11-10 16:34:20.134821720 +0100
@@ -48,7 +48,7 @@
DEFS = @DEFS@
@@ -41,9 +41,9 @@
LDFLAGS = @LDFLAGS@
INSTALL = @INSTALL@
-diff -urNad complete.dpatch/lib/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/lib/Makefile.in
+diff -urNad complete.dpatch/lib/Makefile.in complete.dpatch/lib/Makefile.in
--- complete.dpatch/lib/Makefile.in 2004-05-28 20:03:04.000000000 +0200
-+++ /tmp/dpep.hthEz2/complete.dpatch/lib/Makefile.in 2005-11-10 16:34:20.134821720 +0100
++++ complete.dpatch/lib/Makefile.in 2005-11-10 16:34:20.134821720 +0100
@@ -62,7 +62,7 @@
LIBS = @LIBS@
@@ -53,9 +53,9 @@
LDFLAGS = @LDFLAGS@
SHELL = /bin/sh
-diff -urNad complete.dpatch/master/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/master/Makefile.in
+diff -urNad complete.dpatch/master/Makefile.in complete.dpatch/master/Makefile.in
--- complete.dpatch/master/Makefile.in 2004-12-17 17:32:24.000000000 +0100
-+++ /tmp/dpep.hthEz2/complete.dpatch/master/Makefile.in 2005-11-10 16:34:20.134821720 +0100
++++ complete.dpatch/master/Makefile.in 2005-11-10 16:34:20.134821720 +0100
@@ -57,7 +57,7 @@
CPPFLAGS = -I.. -I$(srcdir)/../lib -I$(srcdir)/../imap @CPPFLAGS@ @COM_ERR_CPPFLAGS@
DEPLIBS = @DEPLIBS@
@@ -65,9 +65,9 @@
LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
LIBS = ../lib/libcyrus_min.a @LIB_UCDSNMP@ @LIBS@ @COM_ERR_LIBS@
-diff -urNad complete.dpatch/notifyd/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/notifyd/Makefile.in
+diff -urNad complete.dpatch/notifyd/Makefile.in complete.dpatch/notifyd/Makefile.in
--- complete.dpatch/notifyd/Makefile.in 2004-05-28 20:03:06.000000000 +0200
-+++ /tmp/dpep.hthEz2/complete.dpatch/notifyd/Makefile.in 2005-11-10 16:34:20.135821621 +0100
++++ complete.dpatch/notifyd/Makefile.in 2005-11-10 16:34:20.135821621 +0100
@@ -54,7 +54,7 @@
DEFS = @DEFS@ @LOCALDEFS@
@@ -77,9 +77,9 @@
LDFLAGS = @LDFLAGS@
prefix = @prefix@
-diff -urNad complete.dpatch/perl/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/perl/Makefile.in
+diff -urNad complete.dpatch/perl/Makefile.in complete.dpatch/perl/Makefile.in
--- complete.dpatch/perl/Makefile.in 2003-10-22 20:50:17.000000000 +0200
-+++ /tmp/dpep.hthEz2/complete.dpatch/perl/Makefile.in 2005-11-10 16:34:20.135821621 +0100
++++ complete.dpatch/perl/Makefile.in 2005-11-10 16:34:20.135821621 +0100
@@ -82,9 +82,9 @@
BDB_LIB="$(BDB_LIB)" BDB_INC="$(BDB_INC)" \
OPENSSL_LIB="$(OPENSSL_LIB)" OPENSSL_INC="$(OPENSSL_INC)" \
@@ -92,9 +92,9 @@
done
install::
-diff -urNad complete.dpatch/perl/sieve/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/perl/sieve/Makefile.in
+diff -urNad complete.dpatch/perl/sieve/Makefile.in complete.dpatch/perl/sieve/Makefile.in
--- complete.dpatch/perl/sieve/Makefile.in 2003-10-22 20:50:24.000000000 +0200
-+++ /tmp/dpep.hthEz2/complete.dpatch/perl/sieve/Makefile.in 2005-11-10 16:34:20.135821621 +0100
++++ complete.dpatch/perl/sieve/Makefile.in 2005-11-10 16:34:20.135821621 +0100
@@ -84,9 +84,9 @@
BDB_LIB="$(BDB_LIB)" BDB_INC="$(BDB_INC)" \
OPENSSL_LIB="$(OPENSSL_LIB)" OPENSSL_INC="$(OPENSSL_INC)" \
@@ -107,9 +107,9 @@
done
install::
-diff -urNad complete.dpatch/perl/sieve/lib/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/perl/sieve/lib/Makefile.in
+diff -urNad complete.dpatch/perl/sieve/lib/Makefile.in complete.dpatch/perl/sieve/lib/Makefile.in
--- complete.dpatch/perl/sieve/lib/Makefile.in 2004-05-28 20:03:07.000000000 +0200
-+++ /tmp/dpep.hthEz2/complete.dpatch/perl/sieve/lib/Makefile.in 2005-11-10 16:34:20.136821523 +0100
++++ complete.dpatch/perl/sieve/lib/Makefile.in 2005-11-10 16:34:20.136821523 +0100
@@ -57,7 +57,7 @@
DEPLIBS = ../../../lib/libcyrus.a ../../../lib/libcyrus_min.a @DEPLIBS@
@@ -119,9 +119,9 @@
LDFLAGS = @LDFLAGS@
SHELL = /bin/sh
-diff -urNad complete.dpatch/sieve/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/sieve/Makefile.in
+diff -urNad complete.dpatch/sieve/Makefile.in complete.dpatch/sieve/Makefile.in
--- complete.dpatch/sieve/Makefile.in 2004-05-28 20:03:09.000000000 +0200
-+++ /tmp/dpep.hthEz2/complete.dpatch/sieve/Makefile.in 2005-11-10 16:34:20.136821523 +0100
++++ complete.dpatch/sieve/Makefile.in 2005-11-10 16:34:20.136821523 +0100
@@ -40,7 +40,7 @@
DEFS = @DEFS@
CPPFLAGS = -I.. -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
@@ -148,9 +148,9 @@
distclean: clean
rm -f Makefile
-diff -urNad complete.dpatch/timsieved/Makefile.in /tmp/dpep.hthEz2/complete.dpatch/timsieved/Makefile.in
+diff -urNad complete.dpatch/timsieved/Makefile.in complete.dpatch/timsieved/Makefile.in
--- complete.dpatch/timsieved/Makefile.in 2004-05-28 20:03:10.000000000 +0200
-+++ /tmp/dpep.hthEz2/complete.dpatch/timsieved/Makefile.in 2005-11-10 16:34:20.136821523 +0100
++++ complete.dpatch/timsieved/Makefile.in 2005-11-10 16:34:20.136821523 +0100
@@ -54,7 +54,7 @@
DEFS = @DEFS@ @LOCALDEFS@
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/02-add_mkinstalldirs.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/02-add_mkinstalldirs.dpatch?rev=873&root=cyrus22&r1=872&r2=3D873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/02-add_mkinstalldirs.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/02-add_mkinstalldirs.dpatch Fri Jan 22 22:07:03 2010
@@ -5,9 +5,8 @@
## DP: add mkinstalldirs
@DPATCH@
-diff -urNad complete.dpatch/mkinstalldirs /tmp/dpep.rSX3y1/complete.dpatch/mkinstalldirs
---- complete.dpatch/mkinstalldirs 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.rSX3y1/complete.dpatch/mkinstalldirs 2005-11-10 16:36:11.547841465 +0100
+--- /dev/null
++++ b/mkinstalldirs
@@ -0,0 +1,150 @@
+#! /bin/sh
+# mkinstalldirs --- make directory hierarchy
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/03-fix_docs.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/03-fix_docs.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/03-fix_docs.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/03-fix_docs.dpatch Fri Jan 22 22:07:03 2010
@@ -5,9 +5,9 @@
## DP: Fix FAQ and virtual domains installation docs
@DPATCH@
-diff -urNad cyrus-imapd-2.2.13/doc/faq.html /tmp/dpep.2Q9TK4/cyrus-imapd-2.2.13/doc/faq.html
+diff -urNad cyrus-imapd-2.2.13/doc/faq.html cyrus-imapd-2.2.13/doc/faq.html
--- cyrus-imapd-2.2.13/doc/faq.html 2007-02-27 05:01:09.000000000 +0100
-+++ /tmp/dpep.2Q9TK4/cyrus-imapd-2.2.13/doc/faq.html 2007-03-17 20:49:20.580803890 +0100
++++ cyrus-imapd-2.2.13/doc/faq.html 2007-03-17 20:49:20.580803890 +0100
@@ -111,7 +111,7 @@
</pre>
@@ -17,9 +17,9 @@
</dd>
-diff -urNad cyrus-imapd-2.2.13/doc/install-virtdomains.html /tmp/dpep.2Q9TK4/cyrus-imapd-2.2.13/doc/install-virtdomains.html
+diff -urNad cyrus-imapd-2.2.13/doc/install-virtdomains.html cyrus-imapd-2.2.13/doc/install-virtdomains.html
--- cyrus-imapd-2.2.13/doc/install-virtdomains.html 2007-02-27 05:01:09.000000000 +0100
-+++ /tmp/dpep.2Q9TK4/cyrus-imapd-2.2.13/doc/install-virtdomains.html 2007-03-17 20:49:20.581803792 +0100
++++ cyrus-imapd-2.2.13/doc/install-virtdomains.html 2007-03-17 20:49:20.581803792 +0100
@@ -99,6 +99,10 @@
to the <tt>defaultdomain</tt>. See <a href=#admins>Administrators</a>
below for further discussion.
@@ -31,9 +31,9 @@
<p>Here is a sample <tt>imapd.conf</tt> with a minimal set of configuration
options.</p>
-diff -urNad cyrus-imapd-2.2.13/lib/imapoptions /tmp/dpep.2Q9TK4/cyrus-imapd-2.2.13/lib/imapoptions
+diff -urNad cyrus-imapd-2.2.13/lib/imapoptions cyrus-imapd-2.2.13/lib/imapoptions
--- cyrus-imapd-2.2.13/lib/imapoptions 2007-03-17 20:49:15.000000000 +0100
-+++ /tmp/dpep.2Q9TK4/cyrus-imapd-2.2.13/lib/imapoptions 2007-03-17 20:49:20.584803499 +0100
++++ cyrus-imapd-2.2.13/lib/imapoptions 2007-03-17 20:49:20.584803499 +0100
@@ -187,7 +187,11 @@
mailbox that does not have a parent mailbox. */
@@ -59,9 +59,9 @@
{ "loginuseacl", 0, SWITCH }
/* If enabled, any authentication identity which has \fBa\fR rights on a
-diff -urNad cyrus-imapd-2.2.13/man/squatter.8 /tmp/dpep.2Q9TK4/cyrus-imapd-2.2.13/man/squatter.8
+diff -urNad cyrus-imapd-2.2.13/man/squatter.8 cyrus-imapd-2.2.13/man/squatter.8
--- cyrus-imapd-2.2.13/man/squatter.8 2005-03-12 23:09:22.000000000 +0100
-+++ /tmp/dpep.2Q9TK4/cyrus-imapd-2.2.13/man/squatter.8 2007-03-17 21:01:17.739413717 +0100
++++ cyrus-imapd-2.2.13/man/squatter.8 2007-03-17 21:01:17.739413717 +0100
@@ -83,6 +83,11 @@
.IR cyrus.conf (5)
.
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/04-add_autogen.sh.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/04-add_autogen.sh.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/04-add_autogen.sh.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/04-add_autogen.sh.dpatch Fri Jan 22 22:07:03 2010
@@ -5,9 +5,9 @@
## DP: Add autogen.sh
@DPATCH@
-diff -urNad cyrus-imapd-2.2.12/autogen.sh /tmp/dpep.Ck5bWN/cyrus-imapd-2.2.12/autogen.sh
+diff -urNad cyrus-imapd-2.2.12/autogen.sh cyrus-imapd-2.2.12/autogen.sh
--- cyrus-imapd-2.2.12/autogen.sh 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.Ck5bWN/cyrus-imapd-2.2.12/autogen.sh 2005-11-11 19:47:43.571058024 +0100
++++ cyrus-imapd-2.2.12/autogen.sh 2005-11-11 19:47:43.571058024 +0100
@@ -0,0 +1,77 @@
+#!/bin/sh
+#
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/05-fix_programnames.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/05-fix_programnames.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/05-fix_programnames.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/05-fix_programnames.dpatch Fri Jan 22 22:07:03 2010
@@ -6,9 +6,9 @@
## DP: program sources
@DPATCH@
-diff -urNad complete.dpatch/imap/deliver.c /tmp/dpep.8HKnp3/complete.dpatch/imap/deliver.c
+diff -urNad complete.dpatch/imap/deliver.c complete.dpatch/imap/deliver.c
--- complete.dpatch/imap/deliver.c 2005-11-11 15:33:59.000000000 +0100
-+++ /tmp/dpep.8HKnp3/complete.dpatch/imap/deliver.c 2005-11-11 15:34:00.393958651 +0100
++++ complete.dpatch/imap/deliver.c 2005-11-11 15:34:00.393958651 +0100
@@ -99,7 +99,7 @@
static void usage()
{
@@ -18,9 +18,9 @@
" [-a auth] [-r return_path] [-l] [-D]\r\n");
fprintf(stderr, "421 4.3.0 %s\n", CYRUS_VERSION);
exit(EC_USAGE);
-diff -urNad complete.dpatch/imap/quota.c /tmp/dpep.8HKnp3/complete.dpatch/imap/quota.c
+diff -urNad complete.dpatch/imap/quota.c complete.dpatch/imap/quota.c
--- complete.dpatch/imap/quota.c 2005-11-11 15:33:59.000000000 +0100
-+++ /tmp/dpep.8HKnp3/complete.dpatch/imap/quota.c 2005-11-11 15:34:00.393958651 +0100
++++ complete.dpatch/imap/quota.c 2005-11-11 15:34:00.393958651 +0100
@@ -208,7 +208,7 @@
void usage(void)
{
@@ -30,9 +30,9 @@
exit(EC_USAGE);
}
-diff -urNad complete.dpatch/imap/reconstruct.c /tmp/dpep.8HKnp3/complete.dpatch/imap/reconstruct.c
+diff -urNad complete.dpatch/imap/reconstruct.c complete.dpatch/imap/reconstruct.c
--- complete.dpatch/imap/reconstruct.c 2005-11-11 15:33:59.000000000 +0100
-+++ /tmp/dpep.8HKnp3/complete.dpatch/imap/reconstruct.c 2005-11-11 15:34:00.394958554 +0100
++++ complete.dpatch/imap/reconstruct.c 2005-11-11 15:34:00.394958554 +0100
@@ -345,8 +345,8 @@
void usage(void)
{
@@ -44,54 +44,54 @@
exit(EC_USAGE);
}
-diff -urNad complete.dpatch/man/chk_cyrus.8 /tmp/dpep.8HKnp3/complete.dpatch/man/chk_cyrus.8
+diff -urNad complete.dpatch/man/chk_cyrus.8 complete.dpatch/man/chk_cyrus.8
--- complete.dpatch/man/chk_cyrus.8 2005-11-11 15:33:59.000000000 +0100
-+++ /tmp/dpep.8HKnp3/complete.dpatch/man/chk_cyrus.8 2005-11-11 15:34:00.394958554 +0100
++++ complete.dpatch/man/chk_cyrus.8 2005-11-11 15:34:00.394958554 +0100
@@ -83,4 +83,4 @@
.B /etc/imapd.conf
.SH SEE ALSO
.PP
-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
+\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
-diff -urNad complete.dpatch/man/ctl_cyrusdb.8 /tmp/dpep.8HKnp3/complete.dpatch/man/ctl_cyrusdb.8
+diff -urNad complete.dpatch/man/ctl_cyrusdb.8 complete.dpatch/man/ctl_cyrusdb.8
--- complete.dpatch/man/ctl_cyrusdb.8 2005-11-11 15:33:59.000000000 +0100
-+++ /tmp/dpep.8HKnp3/complete.dpatch/man/ctl_cyrusdb.8 2005-11-11 15:34:00.394958554 +0100
++++ complete.dpatch/man/ctl_cyrusdb.8 2005-11-11 15:34:00.394958554 +0100
@@ -94,4 +94,4 @@
.B /etc/imapd.conf
.SH SEE ALSO
.PP
-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
+\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
-diff -urNad complete.dpatch/man/ctl_deliver.8 /tmp/dpep.8HKnp3/complete.dpatch/man/ctl_deliver.8
+diff -urNad complete.dpatch/man/ctl_deliver.8 complete.dpatch/man/ctl_deliver.8
--- complete.dpatch/man/ctl_deliver.8 2005-11-11 15:33:59.000000000 +0100
-+++ /tmp/dpep.8HKnp3/complete.dpatch/man/ctl_deliver.8 2005-11-11 15:34:00.395958456 +0100
++++ complete.dpatch/man/ctl_deliver.8 2005-11-11 15:34:00.395958456 +0100
@@ -78,4 +78,4 @@
.B /etc/imapd.conf
.SH SEE ALSO
.PP
-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
+\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
-diff -urNad complete.dpatch/man/ctl_mboxlist.8 /tmp/dpep.8HKnp3/complete.dpatch/man/ctl_mboxlist.8
+diff -urNad complete.dpatch/man/ctl_mboxlist.8 complete.dpatch/man/ctl_mboxlist.8
--- complete.dpatch/man/ctl_mboxlist.8 2005-11-11 15:33:59.000000000 +0100
-+++ /tmp/dpep.8HKnp3/complete.dpatch/man/ctl_mboxlist.8 2005-11-11 15:34:00.395958456 +0100
++++ complete.dpatch/man/ctl_mboxlist.8 2005-11-11 15:34:00.395958456 +0100
@@ -138,4 +138,4 @@
.B /etc/imapd.conf
.SH SEE ALSO
.PP
-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
+\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
-diff -urNad complete.dpatch/man/cyr_expire.8 /tmp/dpep.8HKnp3/complete.dpatch/man/cyr_expire.8
+diff -urNad complete.dpatch/man/cyr_expire.8 complete.dpatch/man/cyr_expire.8
--- complete.dpatch/man/cyr_expire.8 2005-11-11 15:33:59.000000000 +0100
-+++ /tmp/dpep.8HKnp3/complete.dpatch/man/cyr_expire.8 2005-11-11 15:34:00.395958456 +0100
++++ complete.dpatch/man/cyr_expire.8 2005-11-11 15:34:00.395958456 +0100
@@ -90,4 +90,4 @@
.B /etc/imapd.conf
.SH SEE ALSO
.PP
-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
+\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
-diff -urNad complete.dpatch/man/cyrus.conf.5 /tmp/dpep.8HKnp3/complete.dpatch/man/cyrus.conf.5
+diff -urNad complete.dpatch/man/cyrus.conf.5 complete.dpatch/man/cyrus.conf.5
--- complete.dpatch/man/cyrus.conf.5 2005-11-11 15:33:59.000000000 +0100
-+++ /tmp/dpep.8HKnp3/complete.dpatch/man/cyrus.conf.5 2005-11-11 15:34:00.396958358 +0100
++++ complete.dpatch/man/cyrus.conf.5 2005-11-11 15:34:00.396958358 +0100
@@ -44,9 +44,9 @@
cyrus.conf \- Cyrus configuration file
.SH DESCRIPTION
@@ -144,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 complete.dpatch/man/deliver.8 /tmp/dpep.8HKnp3/complete.dpatch/man/deliver.8
+diff -urNad complete.dpatch/man/deliver.8 complete.dpatch/man/deliver.8
--- complete.dpatch/man/deliver.8 2005-11-11 15:33:59.000000000 +0100
-+++ /tmp/dpep.8HKnp3/complete.dpatch/man/deliver.8 2005-11-11 15:34:00.396958358 +0100
++++ complete.dpatch/man/deliver.8 2005-11-11 15:34:00.396958358 +0100
@@ -1,5 +1,5 @@
.\" -*- nroff -*-
-.TH DELIVER 8 "Project Cyrus" CMU
@@ -184,9 +184,9 @@
either rejects messages with 8-bit-set characters in the headers or
changes these characters to `X'.
This is because such characters can't be interpreted since the
-diff -urNad complete.dpatch/man/fud.8 /tmp/dpep.8HKnp3/complete.dpatch/man/fud.8
+diff -urNad complete.dpatch/man/fud.8 complete.dpatch/man/fud.8
--- complete.dpatch/man/fud.8 2005-11-11 15:33:59.000000000 +0100
-+++ /tmp/dpep.8HKnp3/complete.dpatch/man/fud.8 2005-11-11 15:34:00.396958358 +0100
++++ complete.dpatch/man/fud.8 2005-11-11 15:34:00.396958358 +0100
@@ -61,7 +61,7 @@
]
.SH DESCRIPTION
@@ -196,9 +196,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 complete.dpatch/man/idled.8 /tmp/dpep.8HKnp3/complete.dpatch/man/idled.8
+diff -urNad complete.dpatch/man/idled.8 complete.dpatch/man/idled.8
--- complete.dpatch/man/idled.8 2005-11-11 15:33:59.000000000 +0100
-+++ /tmp/dpep.8HKnp3/complete.dpatch/man/idled.8 2005-11-11 15:34:00.397958261 +0100
++++ complete.dpatch/man/idled.8 2005-11-11 15:34:00.397958261 +0100
@@ -56,7 +56,7 @@
to report the changes to the client.
.I Idled
@@ -214,9 +214,9 @@
.PP
-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
+\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
-diff -urNad complete.dpatch/man/imapd.8 /tmp/dpep.8HKnp3/complete.dpatch/man/imapd.8
+diff -urNad complete.dpatch/man/imapd.8 complete.dpatch/man/imapd.8
--- complete.dpatch/man/imapd.8 2005-11-11 15:33:59.000000000 +0100
-+++ /tmp/dpep.8HKnp3/complete.dpatch/man/imapd.8 2005-11-11 15:34:00.397958261 +0100
++++ complete.dpatch/man/imapd.8 2005-11-11 15:34:00.397958261 +0100
@@ -72,7 +72,7 @@
is an IMAP4rev1 server.
It accepts commands on its standard input and responds on its standard output.
@@ -232,9 +232,9 @@
.PP
-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
+\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
-diff -urNad complete.dpatch/man/lmtpd.8 /tmp/dpep.8HKnp3/complete.dpatch/man/lmtpd.8
+diff -urNad complete.dpatch/man/lmtpd.8 complete.dpatch/man/lmtpd.8
--- complete.dpatch/man/lmtpd.8 2005-11-11 15:33:59.000000000 +0100
-+++ /tmp/dpep.8HKnp3/complete.dpatch/man/lmtpd.8 2005-11-11 15:34:00.397958261 +0100
++++ complete.dpatch/man/lmtpd.8 2005-11-11 15:34:00.397958261 +0100
@@ -68,7 +68,7 @@
is an LMTP server used to deliver mail to the IMAP mailstore.
It accepts commands on its standard input and responds on its standard output.
@@ -250,9 +250,9 @@
.PP
-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
+\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
-diff -urNad complete.dpatch/man/master.8 /tmp/dpep.8HKnp3/complete.dpatch/man/master.8
+diff -urNad complete.dpatch/man/master.8 complete.dpatch/man/master.8
--- complete.dpatch/man/master.8 2005-11-11 15:33:59.000000000 +0100
-+++ /tmp/dpep.8HKnp3/complete.dpatch/man/master.8 2005-11-11 15:34:00.398958163 +0100
++++ complete.dpatch/man/master.8 2005-11-11 15:34:00.398958163 +0100
@@ -1,5 +1,5 @@
.\" -*- nroff -*-
-.TH MASTER 8 "Project Cyrus" CMU
@@ -341,9 +341,9 @@
.SH SEE ALSO
.PP
\fBcyrus.conf(5)\fR, \fBimapd.conf(5)\fR, \fBimapd(8)\fR,
-diff -urNad complete.dpatch/man/nntpd.8 /tmp/dpep.8HKnp3/complete.dpatch/man/nntpd.8
+diff -urNad complete.dpatch/man/nntpd.8 complete.dpatch/man/nntpd.8
--- complete.dpatch/man/nntpd.8 2005-11-11 15:33:59.000000000 +0100
-+++ /tmp/dpep.8HKnp3/complete.dpatch/man/nntpd.8 2005-11-11 15:34:00.398958163 +0100
++++ complete.dpatch/man/nntpd.8 2005-11-11 15:34:00.398958163 +0100
@@ -74,7 +74,7 @@
is a NNTP server.
It accepts commands on its standard input and responds on its standard output.
@@ -359,9 +359,9 @@
.PP
-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
+\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
-diff -urNad complete.dpatch/man/notifyd.8 /tmp/dpep.8HKnp3/complete.dpatch/man/notifyd.8
+diff -urNad complete.dpatch/man/notifyd.8 complete.dpatch/man/notifyd.8
--- complete.dpatch/man/notifyd.8 2005-11-11 15:33:59.000000000 +0100
-+++ /tmp/dpep.8HKnp3/complete.dpatch/man/notifyd.8 2005-11-11 15:34:00.398958163 +0100
++++ complete.dpatch/man/notifyd.8 2005-11-11 15:34:00.398958163 +0100
@@ -62,7 +62,7 @@
]
.SH DESCRIPTION
@@ -377,9 +377,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 complete.dpatch/man/pop3d.8 /tmp/dpep.8HKnp3/complete.dpatch/man/pop3d.8
+diff -urNad complete.dpatch/man/pop3d.8 complete.dpatch/man/pop3d.8
--- complete.dpatch/man/pop3d.8 2005-11-11 15:33:59.000000000 +0100
-+++ /tmp/dpep.8HKnp3/complete.dpatch/man/pop3d.8 2005-11-11 15:34:00.399958065 +0100
++++ complete.dpatch/man/pop3d.8 2005-11-11 15:34:00.399958065 +0100
@@ -71,7 +71,7 @@
is a POP3 server.
It accepts commands on its standard input and responds on its standard output.
@@ -395,9 +395,9 @@
.PP
-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
+\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
-diff -urNad complete.dpatch/man/quota.8 /tmp/dpep.8HKnp3/complete.dpatch/man/quota.8
+diff -urNad complete.dpatch/man/quota.8 complete.dpatch/man/quota.8
--- complete.dpatch/man/quota.8 2005-11-11 15:33:59.000000000 +0100
-+++ /tmp/dpep.8HKnp3/complete.dpatch/man/quota.8 2005-11-11 15:34:00.399958065 +0100
++++ complete.dpatch/man/quota.8 2005-11-11 15:34:00.399958065 +0100
@@ -1,5 +1,5 @@
.\" -*- nroff -*-
-.TH QUOTA 8 "Project Cyrus" CMU
@@ -449,9 +449,9 @@
reads its configuration options out of the
.IR imapd.conf (5)
file unless specified otherwise by \fB-C\fR.
-diff -urNad complete.dpatch/man/reconstruct.8 /tmp/dpep.8HKnp3/complete.dpatch/man/reconstruct.8
+diff -urNad complete.dpatch/man/reconstruct.8 complete.dpatch/man/reconstruct.8
--- complete.dpatch/man/reconstruct.8 2005-11-11 15:33:59.000000000 +0100
-+++ /tmp/dpep.8HKnp3/complete.dpatch/man/reconstruct.8 2005-11-11 15:34:00.399958065 +0100
++++ complete.dpatch/man/reconstruct.8 2005-11-11 15:34:00.399958065 +0100
@@ -1,5 +1,5 @@
.\" -*- nroff -*-
-.TH RECONSTRUCT 8 "Project Cyrus" CMU
@@ -526,9 +526,9 @@
with the
.I \-f
switch in order to fix the quota root files.
-diff -urNad complete.dpatch/man/smmapd.8 /tmp/dpep.8HKnp3/complete.dpatch/man/smmapd.8
+diff -urNad complete.dpatch/man/smmapd.8 complete.dpatch/man/smmapd.8
--- complete.dpatch/man/smmapd.8 2005-11-11 15:33:59.000000000 +0100
-+++ /tmp/dpep.8HKnp3/complete.dpatch/man/smmapd.8 2005-11-11 15:34:00.400957968 +0100
++++ complete.dpatch/man/smmapd.8 2005-11-11 15:34:00.400957968 +0100
@@ -67,7 +67,7 @@
It accepts commands on its standard input and responds on its standard
output.
@@ -538,9 +538,9 @@
with those descriptors attached to a remote client connection.
.PP
.B SMMAPD
-diff -urNad complete.dpatch/man/timsieved.8 /tmp/dpep.8HKnp3/complete.dpatch/man/timsieved.8
+diff -urNad complete.dpatch/man/timsieved.8 complete.dpatch/man/timsieved.8
--- complete.dpatch/man/timsieved.8 2005-11-11 15:33:59.000000000 +0100
-+++ /tmp/dpep.8HKnp3/complete.dpatch/man/timsieved.8 2005-11-11 15:34:00.400957968 +0100
++++ complete.dpatch/man/timsieved.8 2005-11-11 15:34:00.400957968 +0100
@@ -53,7 +53,7 @@
is a server that allows users to remotly manage their sieve scripts kept on the server.
It accepts commands on its standard input and responds on its standard output.
@@ -556,18 +556,18 @@
.PP
-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
+\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
-diff -urNad complete.dpatch/man/tls_prune.8 /tmp/dpep.8HKnp3/complete.dpatch/man/tls_prune.8
+diff -urNad complete.dpatch/man/tls_prune.8 complete.dpatch/man/tls_prune.8
--- complete.dpatch/man/tls_prune.8 2005-11-11 15:33:59.000000000 +0100
-+++ /tmp/dpep.8HKnp3/complete.dpatch/man/tls_prune.8 2005-11-11 15:34:00.400957968 +0100
++++ complete.dpatch/man/tls_prune.8 2005-11-11 15:34:00.400957968 +0100
@@ -67,4 +67,4 @@
.B /etc/imapd.conf
.SH SEE ALSO
.PP
-\fBimapd.conf(5)\fR, \fBmaster(8)\fR
+\fBimapd.conf(5)\fR, \fBcyrmaster(8)\fR
-diff -urNad complete.dpatch/sieve/md5.c /tmp/dpep.8HKnp3/complete.dpatch/sieve/md5.c
+diff -urNad complete.dpatch/sieve/md5.c complete.dpatch/sieve/md5.c
--- complete.dpatch/sieve/md5.c 2000-01-05 05:51:51.000000000 +0100
-+++ /tmp/dpep.8HKnp3/complete.dpatch/sieve/md5.c 2005-11-11 15:34:48.633248090 +0100
++++ complete.dpatch/sieve/md5.c 2005-11-11 15:34:48.633248090 +0100
@@ -31,7 +31,7 @@
#include "md5global.h"
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/06-disable_runpath.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/06-disable_runpath.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/06-disable_runpath.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/06-disable_runpath.dpatch Fri Jan 22 22:07:03 2010
@@ -5,9 +5,9 @@
## DP: disable runpath
@DPATCH@
-diff -urNad complete.dpatch/cmulocal/cyrus.m4 /tmp/dpep.1tmcI8/complete.dpatch/cmulocal/cyrus.m4
+diff -urNad complete.dpatch/cmulocal/cyrus.m4 complete.dpatch/cmulocal/cyrus.m4
--- complete.dpatch/cmulocal/cyrus.m4 2003-10-08 22:35:24.000000000 +0200
-+++ /tmp/dpep.1tmcI8/complete.dpatch/cmulocal/cyrus.m4 2005-11-10 18:33:44.832750394 +0100
++++ complete.dpatch/cmulocal/cyrus.m4 2005-11-10 18:33:44.832750394 +0100
@@ -3,6 +3,7 @@
dnl $Id: cyrus.m4,v 1.4 2003/10/08 20:35:24 rjs3 Exp $
dnl tjs at andrew.cmu.edu 6-may-1998
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/07-update_aclocal_and_configure.in.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/07-update_aclocal_and_configure.in.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/07-update_aclocal_and_configure.in.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/07-update_aclocal_and_configure.in.dpatch Fri Jan 22 22:07:03 2010
@@ -5,9 +5,9 @@
## DP: update aclocal.m4 and configure.in
@DPATCH@
-diff -urNad complete.dpatch/configure.in /tmp/dpep.IJ03bC/complete.dpatch/configure.in
+diff -urNad complete.dpatch/configure.in complete.dpatch/configure.in
--- complete.dpatch/configure.in 2005-01-19 00:46:00.000000000 +0100
-+++ /tmp/dpep.IJ03bC/complete.dpatch/configure.in 2005-11-10 18:42:37.579406942 +0100
++++ complete.dpatch/configure.in 2005-11-10 18:42:37.579406942 +0100
@@ -51,6 +51,11 @@
AC_CONFIG_HEADER(config.h)
AC_CANONICAL_HOST
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/08-clean_socket_closes.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/08-clean_socket_closes.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/08-clean_socket_closes.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/08-clean_socket_closes.dpatch Fri Jan 22 22:07:03 2010
@@ -5,9 +5,9 @@
## DP: Cleanly close sockets
@DPATCH@
-diff -urNad cyrus-imapd-2.2.13/imap/backend.c /tmp/dpep.L25TQ6/cyrus-imapd-2.2.13/imap/backend.c
+diff -urNad cyrus-imapd-2.2.13/imap/backend.c cyrus-imapd-2.2.13/imap/backend.c
--- cyrus-imapd-2.2.13/imap/backend.c 2006-05-12 12:20:40.000000000 +0200
-+++ /tmp/dpep.L25TQ6/cyrus-imapd-2.2.13/imap/backend.c 2006-05-12 12:22:01.565116257 +0200
++++ cyrus-imapd-2.2.13/imap/backend.c 2006-05-12 12:22:01.565116257 +0200
@@ -400,6 +400,7 @@
syslog(LOG_ERR, "couldn't authenticate to backend server: %s",
sasl_errstring(r, NULL, NULL));
@@ -16,9 +16,9 @@
close(sock);
ret = NULL;
}
-diff -urNad complete.dpatch/imap/fud.c /tmp/dpep.FbBq2t/complete.dpatch/imap/fud.c
+diff -urNad complete.dpatch/imap/fud.c complete.dpatch/imap/fud.c
--- complete.dpatch/imap/fud.c 2005-11-10 21:12:04.000000000 +0100
-+++ /tmp/dpep.FbBq2t/complete.dpatch/imap/fud.c 2005-11-11 00:01:58.076164940 +0100
++++ complete.dpatch/imap/fud.c 2005-11-11 00:01:58.076164940 +0100
@@ -158,6 +158,15 @@
mboxlist_done();
closelog();
@@ -35,9 +35,9 @@
exit(code);
}
-diff -urNad complete.dpatch/imap/imapd.c /tmp/dpep.FbBq2t/complete.dpatch/imap/imapd.c
+diff -urNad complete.dpatch/imap/imapd.c complete.dpatch/imap/imapd.c
--- complete.dpatch/imap/imapd.c 2005-11-10 21:12:04.000000000 +0100
-+++ /tmp/dpep.FbBq2t/complete.dpatch/imap/imapd.c 2005-11-11 00:04:47.146591300 +0100
++++ complete.dpatch/imap/imapd.c 2005-11-11 00:04:47.146591300 +0100
@@ -767,6 +767,10 @@
#ifdef HAVE_SSL
tls_shutdown_serverengine();
@@ -49,9 +49,9 @@
cyrus_done();
-diff -urNad complete.dpatch/imap/lmtpd.c /tmp/dpep.FbBq2t/complete.dpatch/imap/lmtpd.c
+diff -urNad complete.dpatch/imap/lmtpd.c complete.dpatch/imap/lmtpd.c
--- complete.dpatch/imap/lmtpd.c 2004-12-17 17:32:15.000000000 +0100
-+++ /tmp/dpep.FbBq2t/complete.dpatch/imap/lmtpd.c 2005-11-11 00:02:48.172254190 +0100
++++ complete.dpatch/imap/lmtpd.c 2005-11-11 00:02:48.172254190 +0100
@@ -553,6 +553,9 @@
cyrus_done();
@@ -62,9 +62,9 @@
exit(code);
}
-diff -urNad complete.dpatch/imap/pop3d.c /tmp/dpep.FbBq2t/complete.dpatch/imap/pop3d.c
+diff -urNad complete.dpatch/imap/pop3d.c complete.dpatch/imap/pop3d.c
--- complete.dpatch/imap/pop3d.c 2005-11-10 21:07:23.000000000 +0100
-+++ /tmp/dpep.FbBq2t/complete.dpatch/imap/pop3d.c 2005-11-11 00:03:22.702869236 +0100
++++ complete.dpatch/imap/pop3d.c 2005-11-11 00:03:22.702869236 +0100
@@ -496,6 +496,9 @@
#endif
@@ -75,9 +75,9 @@
exit(code);
}
-diff -urNad complete.dpatch/imap/proxyd.c /tmp/dpep.FbBq2t/complete.dpatch/imap/proxyd.c
+diff -urNad complete.dpatch/imap/proxyd.c complete.dpatch/imap/proxyd.c
--- complete.dpatch/imap/proxyd.c 2005-11-10 21:12:04.000000000 +0100
-+++ /tmp/dpep.FbBq2t/complete.dpatch/imap/proxyd.c 2005-11-11 00:04:04.761746266 +0100
++++ complete.dpatch/imap/proxyd.c 2005-11-11 00:04:04.761746266 +0100
@@ -1382,6 +1382,9 @@
#endif
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/09-kerberos-ipv4-ipv6-kludge-removal.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/09-kerberos-ipv4-ipv6-kludge-removal.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/09-kerberos-ipv4-ipv6-kludge-removal.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/09-kerberos-ipv4-ipv6-kludge-removal.dpatch Fri Jan 22 22:07:03 2010
@@ -6,9 +6,9 @@
## DP: into real IPv4 addresses.
@DPATCH@
-diff -urNad complete.dpatch/imap/pop3d.c /tmp/dpep.PeS97g/complete.dpatch/imap/pop3d.c
+diff -urNad complete.dpatch/imap/pop3d.c complete.dpatch/imap/pop3d.c
--- complete.dpatch/imap/pop3d.c 2005-11-11 00:11:13.000000000 +0100
-+++ /tmp/dpep.PeS97g/complete.dpatch/imap/pop3d.c 2005-11-11 00:15:17.166894681 +0100
++++ complete.dpatch/imap/pop3d.c 2005-11-11 00:15:17.166894681 +0100
@@ -522,41 +522,6 @@
}
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/10-fix_potential_overflows.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/10-fix_potential_overflows.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/10-fix_potential_overflows.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/10-fix_potential_overflows.dpatch Fri Jan 22 22:07:03 2010
@@ -5,9 +5,9 @@
## DP: fix potential buffer overflows
@DPATCH@
-diff -urNad complete.dpatch/imap/ctl_mboxlist.c /tmp/dpep.8ZEecd/complete.dpatch/imap/ctl_mboxlist.c
+diff -urNad complete.dpatch/imap/ctl_mboxlist.c complete.dpatch/imap/ctl_mboxlist.c
--- complete.dpatch/imap/ctl_mboxlist.c 2004-05-22 05:45:48.000000000 +0200
-+++ /tmp/dpep.8ZEecd/complete.dpatch/imap/ctl_mboxlist.c 2005-11-10 20:38:08.142040412 +0100
++++ complete.dpatch/imap/ctl_mboxlist.c 2005-11-10 20:38:08.142040412 +0100
@@ -479,7 +479,7 @@
int r = 0;
char buf[16384];
@@ -17,9 +17,9 @@
char *key=NULL, *data=NULL;
int keylen, datalen;
int untilCommit = PER_COMMIT;
-diff -urNad complete.dpatch/imap/fud.c /tmp/dpep.8ZEecd/complete.dpatch/imap/fud.c
+diff -urNad complete.dpatch/imap/fud.c complete.dpatch/imap/fud.c
--- complete.dpatch/imap/fud.c 2004-12-17 17:32:07.000000000 +0100
-+++ /tmp/dpep.8ZEecd/complete.dpatch/imap/fud.c 2005-11-10 20:38:44.863358638 +0100
++++ complete.dpatch/imap/fud.c 2005-11-10 20:38:44.863358638 +0100
@@ -119,9 +119,9 @@
while(1) {
@@ -33,9 +33,9 @@
if (signals_poll() == SIGHUP) {
/* caught a SIGHUP, return */
-diff -urNad complete.dpatch/imap/global.c /tmp/dpep.8ZEecd/complete.dpatch/imap/global.c
+diff -urNad complete.dpatch/imap/global.c complete.dpatch/imap/global.c
--- complete.dpatch/imap/global.c 2004-11-23 18:40:15.000000000 +0100
-+++ /tmp/dpep.8ZEecd/complete.dpatch/imap/global.c 2005-11-10 20:40:02.897537018 +0100
++++ complete.dpatch/imap/global.c 2005-11-10 20:40:02.897537018 +0100
@@ -467,7 +467,7 @@
{
struct namespace namespace;
@@ -45,9 +45,9 @@
int r;
/* Set namespace */
-diff -urNad complete.dpatch/imap/idle_idled.c /tmp/dpep.8ZEecd/complete.dpatch/imap/idle_idled.c
+diff -urNad complete.dpatch/imap/idle_idled.c complete.dpatch/imap/idle_idled.c
--- complete.dpatch/imap/idle_idled.c 2003-10-22 22:05:11.000000000 +0200
-+++ /tmp/dpep.8ZEecd/complete.dpatch/imap/idle_idled.c 2005-11-10 20:40:56.266272619 +0100
++++ complete.dpatch/imap/idle_idled.c 2005-11-10 20:40:56.266272619 +0100
@@ -109,11 +109,11 @@
idle_remote.sun_family = AF_UNIX;
idle_sock = config_getstring(IMAPOPT_IDLESOCKET);
@@ -63,9 +63,9 @@
}
idle_remote_len = sizeof(idle_remote.sun_family) +
strlen(idle_remote.sun_path) + 1;
-diff -urNad complete.dpatch/imap/index.c /tmp/dpep.8ZEecd/complete.dpatch/imap/index.c
+diff -urNad complete.dpatch/imap/index.c complete.dpatch/imap/index.c
--- complete.dpatch/imap/index.c 2005-02-14 17:42:08.000000000 +0100
-+++ /tmp/dpep.8ZEecd/complete.dpatch/imap/index.c 2005-11-10 20:42:49.720157772 +0100
++++ complete.dpatch/imap/index.c 2005-11-10 20:42:49.720157772 +0100
@@ -3278,9 +3278,17 @@
cur->from = get_localpart_addr(from + CACHE_ITEM_SIZE_SKIP);
break;
@@ -87,9 +87,9 @@
cur->xsubj_hash = strhash(cur->xsubj);
break;
case SORT_TO:
-diff -urNad complete.dpatch/imap/mboxlist.h /tmp/dpep.8ZEecd/complete.dpatch/imap/mboxlist.h
+diff -urNad complete.dpatch/imap/mboxlist.h complete.dpatch/imap/mboxlist.h
--- complete.dpatch/imap/mboxlist.h 2004-03-17 19:07:49.000000000 +0100
-+++ /tmp/dpep.8ZEecd/complete.dpatch/imap/mboxlist.h 2005-11-10 20:43:33.110906719 +0100
++++ complete.dpatch/imap/mboxlist.h 2005-11-10 20:43:33.110906719 +0100
@@ -73,7 +73,7 @@
/* each mailbox has the following data */
@@ -99,9 +99,9 @@
int mbtype;
char partition[MAX_PARTITION_LEN];
/* holds remote machine for REMOTE mailboxes */
-diff -urNad complete.dpatch/imap/message.c /tmp/dpep.8ZEecd/complete.dpatch/imap/message.c
+diff -urNad complete.dpatch/imap/message.c complete.dpatch/imap/message.c
--- complete.dpatch/imap/message.c 2005-11-10 18:19:03.000000000 +0100
-+++ /tmp/dpep.8ZEecd/complete.dpatch/imap/message.c 2005-11-10 20:44:17.400567516 +0100
++++ complete.dpatch/imap/message.c 2005-11-10 20:44:17.400567516 +0100
@@ -795,7 +795,7 @@
/* Save header value */
len = hdrend - hdr;
@@ -111,9 +111,9 @@
ibuf->end += len;
*(ibuf->end)++ = '\r';
*(ibuf->end)++ = '\n';
-diff -urNad complete.dpatch/imap/mupdate.h /tmp/dpep.8ZEecd/complete.dpatch/imap/mupdate.h
+diff -urNad complete.dpatch/imap/mupdate.h complete.dpatch/imap/mupdate.h
--- complete.dpatch/imap/mupdate.h 2003-12-10 17:07:03.000000000 +0100
-+++ /tmp/dpep.8ZEecd/complete.dpatch/imap/mupdate.h 2005-11-10 20:44:52.257152442 +0100
++++ complete.dpatch/imap/mupdate.h 2005-11-10 20:44:52.257152442 +0100
@@ -70,8 +70,8 @@
struct buf tag, cmd, arg1, arg2, arg3;
@@ -125,9 +125,9 @@
char *acl_buf;
size_t acl_buf_len;
struct mupdate_mailboxdata mailboxdata_buf;
-diff -urNad complete.dpatch/imap/proxyd.c /tmp/dpep.8ZEecd/complete.dpatch/imap/proxyd.c
+diff -urNad complete.dpatch/imap/proxyd.c complete.dpatch/imap/proxyd.c
--- complete.dpatch/imap/proxyd.c 2005-11-10 18:19:03.000000000 +0100
-+++ /tmp/dpep.8ZEecd/complete.dpatch/imap/proxyd.c 2005-11-10 20:46:06.823846583 +0100
++++ complete.dpatch/imap/proxyd.c 2005-11-10 20:46:06.823846583 +0100
@@ -1277,7 +1277,7 @@
char **envp __attribute__((unused)))
{
@@ -137,9 +137,9 @@
struct sockaddr_storage proxyd_localaddr, proxyd_remoteaddr;
char localip[60], remoteip[60];
int niflags;
-diff -urNad complete.dpatch/imtest/imtest.c /tmp/dpep.8ZEecd/complete.dpatch/imtest/imtest.c
+diff -urNad complete.dpatch/imtest/imtest.c complete.dpatch/imtest/imtest.c
--- complete.dpatch/imtest/imtest.c 2005-11-10 18:19:03.000000000 +0100
-+++ /tmp/dpep.8ZEecd/complete.dpatch/imtest/imtest.c 2005-11-10 20:47:18.417831766 +0100
++++ complete.dpatch/imtest/imtest.c 2005-11-10 20:47:18.417831766 +0100
@@ -1225,7 +1225,7 @@
/* can't have this and a file for input */
@@ -149,9 +149,9 @@
unlink(output_socket);
listen_sock = socket(AF_UNIX, SOCK_STREAM, 0);
-diff -urNad complete.dpatch/master/master.c /tmp/dpep.8ZEecd/complete.dpatch/master/master.c
+diff -urNad complete.dpatch/master/master.c complete.dpatch/master/master.c
--- complete.dpatch/master/master.c 2005-11-10 18:19:03.000000000 +0100
-+++ /tmp/dpep.8ZEecd/complete.dpatch/master/master.c 2005-11-10 20:50:59.813138032 +0100
++++ complete.dpatch/master/master.c 2005-11-10 20:50:59.813138032 +0100
@@ -222,13 +222,17 @@
return result;
}
@@ -172,9 +172,9 @@
}
void get_statsock(int filedes[2])
-diff -urNad complete.dpatch/master/masterconf.c /tmp/dpep.8ZEecd/complete.dpatch/master/masterconf.c
+diff -urNad complete.dpatch/master/masterconf.c complete.dpatch/master/masterconf.c
--- complete.dpatch/master/masterconf.c 2003-11-25 18:37:19.000000000 +0100
-+++ /tmp/dpep.8ZEecd/complete.dpatch/master/masterconf.c 2005-11-10 20:53:17.940602394 +0100
++++ complete.dpatch/master/masterconf.c 2005-11-10 20:53:17.940602394 +0100
@@ -133,7 +133,7 @@
} else {
/* one word */
@@ -184,9 +184,9 @@
v[i] = *p++;
}
}
-diff -urNad complete.dpatch/notifyd/notifyd.c /tmp/dpep.8ZEecd/complete.dpatch/notifyd/notifyd.c
+diff -urNad complete.dpatch/notifyd/notifyd.c complete.dpatch/notifyd/notifyd.c
--- complete.dpatch/notifyd/notifyd.c 2004-12-17 17:32:25.000000000 +0100
-+++ /tmp/dpep.8ZEecd/complete.dpatch/notifyd/notifyd.c 2005-11-10 20:55:15.058125035 +0100
++++ complete.dpatch/notifyd/notifyd.c 2005-11-10 20:55:15.058125035 +0100
@@ -143,7 +143,7 @@
if (cp) nopt = strtol(cp, NULL, 10);
if (nopt < 0 || errno == ERANGE) cp = NULL;
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/11-fix_syslog_prefix.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/11-fix_syslog_prefix.dpatch?rev=873&root=cyrus22&r1=872&r2=3D873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/11-fix_syslog_prefix.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/11-fix_syslog_prefix.dpatch Fri Jan 22 22:07:03 2010
@@ -6,9 +6,9 @@
## DP: log prefix.
@DPATCH@
-diff -urNad complete.dpatch/imap/global.c /tmp/dpep.rKpUur/complete.dpatch/imap/global.c
+diff -urNad complete.dpatch/imap/global.c complete.dpatch/imap/global.c
--- complete.dpatch/imap/global.c 2005-11-11 13:12:47.000000000 +0100
-+++ /tmp/dpep.rKpUur/complete.dpatch/imap/global.c 2005-11-11 13:13:53.042398971 +0100
++++ complete.dpatch/imap/global.c 2005-11-11 13:13:53.042398971 +0100
@@ -93,6 +93,9 @@
struct cyrusdb_backend *config_ptscache_db;
#endif
@@ -30,9 +30,9 @@
/* Load configuration file. This will set config_dir when it finds it */
config_read(alt_config);
-diff -urNad complete.dpatch/ptclient/ptexpire.c /tmp/dpep.rKpUur/complete.dpatch/ptclient/ptexpire.c
+diff -urNad complete.dpatch/ptclient/ptexpire.c complete.dpatch/ptclient/ptexpire.c
--- complete.dpatch/ptclient/ptexpire.c 2004-05-26 18:05:59.000000000 +0200
-+++ /tmp/dpep.rKpUur/complete.dpatch/ptclient/ptexpire.c 2005-11-11 13:15:41.839710005 +0100
++++ complete.dpatch/ptclient/ptexpire.c 2005-11-11 13:15:41.839710005 +0100
@@ -114,7 +114,7 @@
if (geteuid() == 0) fatal("must run as the Cyrus user", EC_USAGE);
@@ -42,9 +42,9 @@
while ((opt = getopt(argc, argv, "C:E:")) != EOF) {
switch (opt) {
-diff -urNad complete.dpatch/ptclient/test.c /tmp/dpep.rKpUur/complete.dpatch/ptclient/test.c
+diff -urNad complete.dpatch/ptclient/test.c complete.dpatch/ptclient/test.c
--- complete.dpatch/ptclient/test.c 2003-10-22 20:50:29.000000000 +0200
-+++ /tmp/dpep.rKpUur/complete.dpatch/ptclient/test.c 2005-11-11 13:16:19.409019154 +0100
++++ complete.dpatch/ptclient/test.c 2005-11-11 13:16:19.409019154 +0100
@@ -57,7 +57,7 @@
cacheid=cache;
} else
@@ -54,9 +54,9 @@
if (!auth_setid(argv[1],cacheid))
printf ("Auth_memberof(%s,%s) is %d\n", argv[1], argv[2],
-diff -urNad complete.dpatch/ptclient/test2.c /tmp/dpep.rKpUur/complete.dpatch/ptclient/test2.c
+diff -urNad complete.dpatch/ptclient/test2.c complete.dpatch/ptclient/test2.c
--- complete.dpatch/ptclient/test2.c 2003-10-22 20:50:29.000000000 +0200
-+++ /tmp/dpep.rKpUur/complete.dpatch/ptclient/test2.c 2005-11-11 13:16:39.749020971 +0100
++++ complete.dpatch/ptclient/test2.c 2005-11-11 13:16:39.749020971 +0100
@@ -46,7 +46,7 @@
int main(void) {
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/12-fix_timeout_handling.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/12-fix_timeout_handling.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/12-fix_timeout_handling.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/12-fix_timeout_handling.dpatch Fri Jan 22 22:07:03 2010
@@ -5,9 +5,9 @@
## DP: fixes timeout handling
@DPATCH@
-diff -urNad complete.dpatch/imap/signals.c /tmp/dpep.9pxAsS/complete.dpatch/imap/signals.c
+diff -urNad complete.dpatch/imap/signals.c complete.dpatch/imap/signals.c
--- complete.dpatch/imap/signals.c 2005-02-14 17:26:50.000000000 +0100
-+++ /tmp/dpep.9pxAsS/complete.dpatch/imap/signals.c 2005-11-11 14:10:07.056723830 +0100
++++ complete.dpatch/imap/signals.c 2005-11-11 14:10:07.056723830 +0100
@@ -50,7 +50,7 @@
#include "xmalloc.h"
#include "exitcodes.h"
@@ -17,9 +17,9 @@
static void sighandler(int sig)
{
-diff -urNad complete.dpatch/lib/lock.h /tmp/dpep.9pxAsS/complete.dpatch/lib/lock.h
+diff -urNad complete.dpatch/lib/lock.h complete.dpatch/lib/lock.h
--- complete.dpatch/lib/lock.h 2003-02-13 21:15:40.000000000 +0100
-+++ /tmp/dpep.9pxAsS/complete.dpatch/lib/lock.h 2005-11-11 14:10:07.056723830 +0100
++++ complete.dpatch/lib/lock.h 2005-11-11 14:10:07.056723830 +0100
@@ -53,6 +53,8 @@
#include <sys/stat.h>
@@ -29,9 +29,9 @@
extern const char *lock_method_desc;
extern int lock_reopen P((int fd, const char *filename,
-diff -urNad complete.dpatch/lib/lock_fcntl.c /tmp/dpep.9pxAsS/complete.dpatch/lib/lock_fcntl.c
+diff -urNad complete.dpatch/lib/lock_fcntl.c complete.dpatch/lib/lock_fcntl.c
--- complete.dpatch/lib/lock_fcntl.c 2003-02-13 21:15:40.000000000 +0100
-+++ /tmp/dpep.9pxAsS/complete.dpatch/lib/lock_fcntl.c 2005-11-11 14:10:07.057723732 +0100
++++ complete.dpatch/lib/lock_fcntl.c 2005-11-11 14:10:07.057723732 +0100
@@ -47,11 +47,43 @@
#include <unistd.h>
#include <fcntl.h>
@@ -254,9 +254,9 @@
+ return 0;
}
-diff -urNad complete.dpatch/lib/lock_flock.c /tmp/dpep.9pxAsS/complete.dpatch/lib/lock_flock.c
+diff -urNad complete.dpatch/lib/lock_flock.c complete.dpatch/lib/lock_flock.c
--- complete.dpatch/lib/lock_flock.c 2003-02-13 21:15:41.000000000 +0100
-+++ /tmp/dpep.9pxAsS/complete.dpatch/lib/lock_flock.c 2005-11-11 14:10:07.057723732 +0100
++++ complete.dpatch/lib/lock_flock.c 2005-11-11 14:10:07.057723732 +0100
@@ -46,6 +46,8 @@
#include <sys/stat.h>
#include <fcntl.h>
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/14-xmalloc.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/14-xmalloc.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/14-xmalloc.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/14-xmalloc.dpatch Fri Jan 22 22:07:03 2010
@@ -5,9 +5,9 @@
## DP: Fix xmalloc usage
@DPATCH@
-diff -urNad complete.dpatch/lib/map_stupidshared.c /tmp/dpep.1Bc5Yw/complete.dpatch/lib/map_stupidshared.c
+diff -urNad complete.dpatch/lib/map_stupidshared.c complete.dpatch/lib/map_stupidshared.c
--- complete.dpatch/lib/map_stupidshared.c 2003-10-22 20:50:12.000000000 +0200
-+++ /tmp/dpep.1Bc5Yw/complete.dpatch/lib/map_stupidshared.c 2005-11-11 14:29:02.586035529 +0100
++++ complete.dpatch/lib/map_stupidshared.c 2005-11-11 14:29:02.586035529 +0100
@@ -52,6 +52,7 @@
#include <sys/stat.h>
#include <syslog.h>
@@ -16,9 +16,9 @@
#include "map.h"
#include "exitcodes.h"
-diff -urNad complete.dpatch/lib/xmalloc.h /tmp/dpep.1Bc5Yw/complete.dpatch/lib/xmalloc.h
+diff -urNad complete.dpatch/lib/xmalloc.h complete.dpatch/lib/xmalloc.h
--- complete.dpatch/lib/xmalloc.h 2003-10-22 20:50:12.000000000 +0200
-+++ /tmp/dpep.1Bc5Yw/complete.dpatch/lib/xmalloc.h 2005-11-11 14:29:30.174327237 +0100
++++ complete.dpatch/lib/xmalloc.h 2005-11-11 14:29:30.174327237 +0100
@@ -65,7 +65,7 @@
/* Functions using xmalloc.h must provide a function called fatal() conforming
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/15-munge_8bit.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/15-munge_8bit.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/15-munge_8bit.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/15-munge_8bit.dpatch Fri Jan 22 22:07:03 2010
@@ -5,9 +5,9 @@
## DP: Add support for munge8bit
@DPATCH@
-diff -urNad complete.dpatch/imap/message.c /tmp/dpep.sh0ZiZ/complete.dpatch/imap/message.c
+diff -urNad complete.dpatch/imap/message.c complete.dpatch/imap/message.c
--- complete.dpatch/imap/message.c 2004-09-16 19:58:54.000000000 +0200
-+++ /tmp/dpep.sh0ZiZ/complete.dpatch/imap/message.c 2005-11-10 17:02:02.658034914 +0100
++++ complete.dpatch/imap/message.c 2005-11-10 17:02:02.658034914 +0100
@@ -227,6 +227,7 @@
int n;
int sawcr = 0, sawnl;
@@ -25,9 +25,9 @@
/* We have been configured to munge all mail of this
form. */
*p = 'X';
-diff -urNad complete.dpatch/imap/spool.c /tmp/dpep.sh0ZiZ/complete.dpatch/imap/spool.c
+diff -urNad complete.dpatch/imap/spool.c complete.dpatch/imap/spool.c
--- complete.dpatch/imap/spool.c 2004-10-27 22:40:50.000000000 +0200
-+++ /tmp/dpep.sh0ZiZ/complete.dpatch/imap/spool.c 2005-11-10 17:02:02.658034914 +0100
++++ complete.dpatch/imap/spool.c 2005-11-10 17:02:02.658034914 +0100
@@ -140,6 +140,7 @@
state s = NAME_START;
int r = 0;
@@ -45,9 +45,9 @@
/* We have been configured to munge all mail of this
form. */
c = 'X';
-diff -urNad complete.dpatch/lib/imapoptions /tmp/dpep.sh0ZiZ/complete.dpatch/lib/imapoptions
+diff -urNad complete.dpatch/lib/imapoptions complete.dpatch/lib/imapoptions
--- complete.dpatch/lib/imapoptions 2004-07-21 21:07:45.000000000 +0200
-+++ /tmp/dpep.sh0ZiZ/complete.dpatch/lib/imapoptions 2005-11-10 17:02:02.659034816 +0100
++++ complete.dpatch/lib/imapoptions 2005-11-10 17:02:02.659034816 +0100
@@ -458,6 +458,11 @@
{ "mboxlist_db", "skiplist", STRINGLIST("flat", "berkeley", "skiplist")}
/* The cyrusdb backend to use for the mailbox list. */
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/16-fix_mib.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/16-fix_mib.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/16-fix_mib.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/16-fix_mib.dpatch Fri Jan 22 22:07:03 2010
@@ -5,9 +5,9 @@
## DP: Fix MIB file for cyrus
@DPATCH@
-diff -urNad complete.dpatch/master/CYRUS-MASTER.mib /tmp/dpep.McEbU0/complete.dpatch/master/CYRUS-MASTER.mib
+diff -urNad complete.dpatch/master/CYRUS-MASTER.mib complete.dpatch/master/CYRUS-MASTER.mib
--- complete.dpatch/master/CYRUS-MASTER.mib 2001-08-14 18:11:26.000000000 +0200
-+++ /tmp/dpep.McEbU0/complete.dpatch/master/CYRUS-MASTER.mib 2005-11-10 17:11:15.237608454 +0100
++++ complete.dpatch/master/CYRUS-MASTER.mib 2005-11-10 17:11:15.237608454 +0100
@@ -1,12 +1,15 @@
CYRUS-MASTER-MIB DEFINITIONS ::= BEGIN
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/17-fix_tail_syntax_in_xversion.h.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/17-fix_tail_syntax_in_xversion.h.dpatch?rev=873&root=cyrus22&r1=
3D872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/17-fix_tail_syntax_in_xversion.h.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/17-fix_tail_syntax_in_xversion.h.dpatch Fri Jan 22 22:07:03 2010
@@ -5,9 +5,9 @@
## DP: fix tail syntax in xversion.h (use "tail -n 1" instead of "tail -1")
@DPATCH@
-diff -urNad complete.dpatch/imap/xversion.sh /tmp/dpep.gLdzBq/complete.dpatch/imap/xversion.sh
+diff -urNad complete.dpatch/imap/xversion.sh complete.dpatch/imap/xversion.sh
--- complete.dpatch/imap/xversion.sh 2003-10-22 20:03:00.000000000 +0200
-+++ /tmp/dpep.gLdzBq/complete.dpatch/imap/xversion.sh 2005-11-10 17:14:52.208238481 +0100
++++ complete.dpatch/imap/xversion.sh 2005-11-10 17:14:52.208238481 +0100
@@ -22,4 +22,4 @@
match ($0, pattern) {
printf "\"%s\"\n", substr($0, RSTART, RLENGTH)
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/19-fix_tls_ssl.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/19-fix_tls_ssl.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/19-fix_tls_ssl.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/19-fix_tls_ssl.dpatch Fri Jan 22 22:07:03 2010
@@ -5,9 +5,9 @@
## DP: Make TLS/SSL error message more informative
@DPATCH@
-diff -urNad complete.dpatch/imap/tls.c /tmp/dpep.uKZhrg/complete.dpatch/imap/tls.c
+diff -urNad complete.dpatch/imap/tls.c complete.dpatch/imap/tls.c
--- complete.dpatch/imap/tls.c 2005-11-11 15:31:40.000000000 +0100
-+++ /tmp/dpep.uKZhrg/complete.dpatch/imap/tls.c 2005-11-11 15:31:41.926478833 +0100
++++ complete.dpatch/imap/tls.c 2005-11-11 15:31:41.926478833 +0100
@@ -166,7 +166,7 @@
* tim - this seems to just be giving logging messages
*/
@@ -35,9 +35,9 @@
return (-1);
}
}
-diff -urNad complete.dpatch/imtest/imtest.c /tmp/dpep.uKZhrg/complete.dpatch/imtest/imtest.c
+diff -urNad complete.dpatch/imtest/imtest.c complete.dpatch/imtest/imtest.c
--- complete.dpatch/imtest/imtest.c 2005-11-11 15:31:41.000000000 +0100
-+++ /tmp/dpep.uKZhrg/complete.dpatch/imtest/imtest.c 2005-11-11 15:31:57.244983198 +0100
++++ complete.dpatch/imtest/imtest.c 2005-11-11 15:31:57.244983198 +0100
@@ -63,6 +63,7 @@
#include <limits.h>
@@ -64,9 +64,9 @@
return IMTEST_FAIL;
}
SSL_CTX_set_tmp_rsa_callback(tls_ctx, tmp_rsa_cb);
-diff -urNad complete.dpatch/lib/imclient.c /tmp/dpep.uKZhrg/complete.dpatch/lib/imclient.c
+diff -urNad complete.dpatch/lib/imclient.c complete.dpatch/lib/imclient.c
--- complete.dpatch/lib/imclient.c 2005-11-11 15:31:40.000000000 +0100
-+++ /tmp/dpep.uKZhrg/complete.dpatch/lib/imclient.c 2005-11-11 15:31:41.928478637 +0100
++++ complete.dpatch/lib/imclient.c 2005-11-11 15:31:41.928478637 +0100
@@ -1733,7 +1733,7 @@
if (c_cert_file || c_key_file)
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/23-configurable_idled.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/23-configurable_idled.dpatch?rev=873&root=cyrus22&r1=872&r2=
3D873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/23-configurable_idled.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/23-configurable_idled.dpatch Fri Jan 22 22:07:03 2010
@@ -5,9 +5,9 @@
## DP: Adds imapd.conf option to select IDLE method at runtime
@DPATCH@
-diff -urNad cyrus-imapd-2.2.13/configure.in /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/configure.in
+diff -urNad cyrus-imapd-2.2.13/configure.in cyrus-imapd-2.2.13/configure.in
--- cyrus-imapd-2.2.13/configure.in 2006-08-23 18:13:47.000000000 +0200
-+++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/configure.in 2006-08-23 18:13:56.178920138 +0200
++++ cyrus-imapd-2.2.13/configure.in 2006-08-23 18:13:56.178920138 +0200
@@ -760,9 +760,6 @@
METHOD is [poll], idled or no],
WITH_IDLE="${withval}",WITH_IDLE="poll")
@@ -18,9 +18,9 @@
dnl
dnl see if we're compiling with NNTP support
-diff -urNad cyrus-imapd-2.2.13/imap/Makefile.in /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/Makefile.in
+diff -urNad cyrus-imapd-2.2.13/imap/Makefile.in cyrus-imapd-2.2.13/imap/Makefile.in
--- cyrus-imapd-2.2.13/imap/Makefile.in 2006-08-23 18:13:47.000000000 +0200
-+++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/Makefile.in 2006-08-23 18:13:56.178920138 +0200
++++ cyrus-imapd-2.2.13/imap/Makefile.in 2006-08-23 18:13:56.178920138 +0200
@@ -47,9 +47,6 @@
# 'local' (legacy flat file).
SEEN=seen_db.o
@@ -50,9 +50,9 @@
fud smmapd reconstruct quota mbpath ipurge \
cyrdump chk_cyrus cvt_cyrusdb deliver ctl_mboxlist \
ctl_deliver ctl_cyrusdb squatter mbexamine cyr_expire arbitron \
-diff -urNad cyrus-imapd-2.2.13/imap/global.c /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/global.c
+diff -urNad cyrus-imapd-2.2.13/imap/global.c cyrus-imapd-2.2.13/imap/global.c
--- cyrus-imapd-2.2.13/imap/global.c 2006-08-23 18:13:47.000000000 +0200
-+++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/global.c 2006-08-23 18:28:28.243411698 +0200
++++ cyrus-imapd-2.2.13/imap/global.c 2006-08-23 18:28:28.243411698 +0200
@@ -72,6 +72,7 @@
#include "prot.h" /* for PROT_BUFSIZE */
#include "util.h"
@@ -81,9 +81,9 @@
/* configure libcyrus as needed */
libcyrus_config_setstring(CYRUSOPT_CONFIG_DIR, config_dir);
libcyrus_config_setswitch(CYRUSOPT_AUTH_UNIX_GROUP_ENABLE,
-diff -urNad cyrus-imapd-2.2.13/imap/global.h /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/global.h
+diff -urNad cyrus-imapd-2.2.13/imap/global.h cyrus-imapd-2.2.13/imap/global.h
--- cyrus-imapd-2.2.13/imap/global.h 2006-08-21 23:32:39.000000000 +0200
-+++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/global.h 2006-08-23 18:13:56.179920040 +0200
++++ cyrus-imapd-2.2.13/imap/global.h 2006-08-23 18:13:56.179920040 +0200
@@ -152,4 +152,6 @@
extern struct cyrusdb_backend *config_tlscache_db;
extern struct cyrusdb_backend *config_ptscache_db;
@@ -91,9 +91,9 @@
+extern struct idle_backend *config_idle;
+
#endif /* INCLUDED_GLOBAL_H */
-diff -urNad cyrus-imapd-2.2.13/imap/idle.c /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle.c
+diff -urNad cyrus-imapd-2.2.13/imap/idle.c cyrus-imapd-2.2.13/imap/idle.c
--- cyrus-imapd-2.2.13/imap/idle.c 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle.c 2006-08-23 18:13:56.179920040 +0200
++++ cyrus-imapd-2.2.13/imap/idle.c 2006-08-23 18:13:56.179920040 +0200
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 1998-2003 Carnegie Mellon University. All rights reserved.
@@ -182,9 +182,9 @@
+
+ return idle;
+}
-diff -urNad cyrus-imapd-2.2.13/imap/idle.h /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle.h
+diff -urNad cyrus-imapd-2.2.13/imap/idle.h cyrus-imapd-2.2.13/imap/idle.h
--- cyrus-imapd-2.2.13/imap/idle.h 2006-08-21 23:32:39.000000000 +0200
-+++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle.h 2006-08-23 18:13:56.180919942 +0200
++++ cyrus-imapd-2.2.13/imap/idle.h 2006-08-23 18:13:56.180919942 +0200
@@ -44,8 +44,7 @@
#define IDLE_H
@@ -250,9 +250,9 @@
+struct idle_backend *idle_fromname(const char *name);
#endif
-diff -urNad cyrus-imapd-2.2.13/imap/idle_idled.c /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle_idled.c
+diff -urNad cyrus-imapd-2.2.13/imap/idle_idled.c cyrus-imapd-2.2.13/imap/idle_idled.c
--- cyrus-imapd-2.2.13/imap/idle_idled.c 2006-08-23 18:13:47.000000000 +0200
-+++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle_idled.c 2006-08-23 18:13:56.180919942 +0200
++++ cyrus-imapd-2.2.13/imap/idle_idled.c 2006-08-23 18:13:56.180919942 +0200
@@ -58,8 +58,6 @@
#include "idled.h"
#include "global.h"
@@ -350,9 +350,9 @@
+ &idle_idled_start,
+ &idle_idled_done
+};
-diff -urNad cyrus-imapd-2.2.13/imap/idle_no.c /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle_no.c
+diff -urNad cyrus-imapd-2.2.13/imap/idle_no.c cyrus-imapd-2.2.13/imap/idle_no.c
--- cyrus-imapd-2.2.13/imap/idle_no.c 2006-08-21 23:32:39.000000000 +0200
-+++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle_no.c 2006-08-23 18:13:56.181919844 +0200
++++ cyrus-imapd-2.2.13/imap/idle_no.c 2006-08-23 18:13:56.181919844 +0200
@@ -42,23 +42,31 @@
#include "idle.h"
@@ -392,9 +392,9 @@
+ &idle_no_start,
+ &idle_no_done
+};
-diff -urNad cyrus-imapd-2.2.13/imap/idle_poll.c /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle_poll.c
+diff -urNad cyrus-imapd-2.2.13/imap/idle_poll.c cyrus-imapd-2.2.13/imap/idle_poll.c
--- cyrus-imapd-2.2.13/imap/idle_poll.c 2006-08-21 23:32:39.000000000 +0200
-+++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/idle_poll.c 2006-08-23 18:13:56.181919844 +0200
++++ cyrus-imapd-2.2.13/imap/idle_poll.c 2006-08-23 18:13:56.181919844 +0200
@@ -51,15 +51,13 @@
#include "idle.h"
#include "global.h"
@@ -461,9 +461,9 @@
+ &idle_poll_start,
+ &idle_poll_done
+};
-diff -urNad cyrus-imapd-2.2.13/imap/version.c /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/version.c
+diff -urNad cyrus-imapd-2.2.13/imap/version.c cyrus-imapd-2.2.13/imap/version.c
--- cyrus-imapd-2.2.13/imap/version.c 2006-08-21 23:32:39.000000000 +0200
-+++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/imap/version.c 2006-08-23 18:13:56.181919844 +0200
++++ cyrus-imapd-2.2.13/imap/version.c 2006-08-23 18:13:56.181919844 +0200
@@ -62,6 +62,7 @@
#include "map.h"
#include "lock.h"
@@ -472,9 +472,9 @@
#include "idle.h"
#ifdef USE_SIEVE
-diff -urNad cyrus-imapd-2.2.13/lib/Makefile.in /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/lib/Makefile.in
+diff -urNad cyrus-imapd-2.2.13/lib/Makefile.in cyrus-imapd-2.2.13/lib/Makefile.in
--- cyrus-imapd-2.2.13/lib/Makefile.in 2006-08-23 18:13:47.000000000 +0200
-+++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/lib/Makefile.in 2006-08-23 18:13:56.182919747 +0200
++++ cyrus-imapd-2.2.13/lib/Makefile.in 2006-08-23 18:13:56.182919747 +0200
@@ -74,6 +74,8 @@
libdir = @libdir@
@@ -493,9 +493,9 @@
imapopts.h: imapopts.c
-diff -urNad cyrus-imapd-2.2.13/lib/imapoptions /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/lib/imapoptions
+diff -urNad cyrus-imapd-2.2.13/lib/imapoptions cyrus-imapd-2.2.13/lib/imapoptions
--- cyrus-imapd-2.2.13/lib/imapoptions 2006-08-23 18:13:47.000000000 +0200
-+++ /tmp/dpep.7DrWs1/cyrus-imapd-2.2.13/lib/imapoptions 2006-08-23 18:13:56.182919747 +0200
++++ cyrus-imapd-2.2.13/lib/imapoptions 2006-08-23 18:13:56.182919747 +0200
@@ -248,6 +248,9 @@
/* The password to use for authentication to the backend server hostname
(where hostname is the short hostname of the server) - Cyrus Murder */
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/30-update_perlcalling.sh.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/30-update_perlcalling.sh.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/30-update_perlcalling.sh.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/30-update_perlcalling.sh.dpatch Fri Jan 22 22:07:03 2010
@@ -9,81 +9,81 @@
## DP: This should be the default actually.
@DPATCH@
-diff -urNad cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_master.pl /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_master.pl
+diff -urNad cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_master.pl cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_master.pl
--- cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_master.pl 2005-05-24 22:13:04.000000000 +0200
-+++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_master.pl 2005-05-24 22:44:39.039570899 +0200
++++ cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/cyrus_master.pl 2005-05-24 22:44:39.039570899 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl5
+#!/usr/bin/perl
#
# Created by Alison Greenwald <alison at andrew.cmu.edu> 21 Sep 2000
-diff -urNad cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db-sum.pl /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db-sum.pl
+diff -urNad cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db-sum.pl cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db-sum.pl
--- cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db-sum.pl 2005-05-24 22:13:04.000000000 +0200
-+++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db-sum.pl 2005-05-24 22:44:39.038570809 +0200
++++ cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db-sum.pl 2005-05-24 22:44:39.038570809 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl5
+#!/usr/bin/perl
#
# Created by Alison Greenwald 21 Sep 2000
-diff -urNad cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db.pl /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db.pl
+diff -urNad cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db.pl cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db.pl
--- cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db.pl 2005-05-24 22:13:04.000000000 +0200
-+++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db.pl 2005-05-24 22:44:39.038570809 +0200
++++ cyrus-imapd-2.2.12/contrib/cyrus-graphtools.1.0/cgi-bin/graph_cyrus_db.pl 2005-05-24 22:44:39.038570809 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl5
+#!/usr/bin/perl
#
# Created by Alison Greenwald <alison at andrew.cmu.edu> 21 Sep 2000
-diff -urNad cyrus-imapd-2.2.12/contrib/mupdate-test.pl /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/contrib/mupdate-test.pl
+diff -urNad cyrus-imapd-2.2.12/contrib/mupdate-test.pl cyrus-imapd-2.2.12/contrib/mupdate-test.pl
--- cyrus-imapd-2.2.12/contrib/mupdate-test.pl 2005-05-24 22:13:04.000000000 +0200
-+++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/contrib/mupdate-test.pl 2005-05-24 22:44:39.048571710 +0200
++++ cyrus-imapd-2.2.12/contrib/mupdate-test.pl 2005-05-24 22:44:39.048571710 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
# Create a workload against a murder frontend
# that will give the MUPDATE server a workout.
-diff -urNad cyrus-imapd-2.2.12/perl/imap/examples/auditmbox.pl /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/perl/imap/examples/auditmbox.pl
+diff -urNad cyrus-imapd-2.2.12/perl/imap/examples/auditmbox.pl cyrus-imapd-2.2.12/perl/imap/examples/auditmbox.pl
--- cyrus-imapd-2.2.12/perl/imap/examples/auditmbox.pl 2005-05-24 22:13:05.000000000 +0200
-+++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/perl/imap/examples/auditmbox.pl 2005-05-24 22:44:39.058572611 +0200
++++ cyrus-imapd-2.2.12/perl/imap/examples/auditmbox.pl 2005-05-24 22:44:39.058572611 +0200
@@ -1,4 +1,4 @@
-#! /usr/bin/perl -w
+#!/usr/bin/perl -w
#
# Copyright (c) 2000 Carnegie Mellon University. All rights reserved.
#
-diff -urNad cyrus-imapd-2.2.12/perl/imap/examples/imapcollate.pl /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/perl/imap/examples/imapcollate.pl
+diff -urNad cyrus-imapd-2.2.12/perl/imap/examples/imapcollate.pl cyrus-imapd-2.2.12/perl/imap/examples/imapcollate.pl
--- cyrus-imapd-2.2.12/perl/imap/examples/imapcollate.pl 2005-05-24 22:13:05.000000000 +0200
-+++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/perl/imap/examples/imapcollate.pl 2005-05-24 22:44:39.057572521 +0200
++++ cyrus-imapd-2.2.12/perl/imap/examples/imapcollate.pl 2005-05-24 22:44:39.057572521 +0200
@@ -1,4 +1,4 @@
-#! /usr/bin/perl -w
+#!/usr/bin/perl -w
#
# Copyright (c) 2000 Carnegie Mellon University. All rights reserved.
#
-diff -urNad cyrus-imapd-2.2.12/perl/imap/examples/imapdu.pl /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/perl/imap/examples/imapdu.pl
+diff -urNad cyrus-imapd-2.2.12/perl/imap/examples/imapdu.pl cyrus-imapd-2.2.12/perl/imap/examples/imapdu.pl
--- cyrus-imapd-2.2.12/perl/imap/examples/imapdu.pl 2005-05-24 22:13:05.000000000 +0200
-+++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/perl/imap/examples/imapdu.pl 2005-05-24 22:44:39.059572701 +0200
++++ cyrus-imapd-2.2.12/perl/imap/examples/imapdu.pl 2005-05-24 22:44:39.059572701 +0200
@@ -1,4 +1,4 @@
-#! /usr/local/bin/perl -w
+#!/usr/bin/perl -w
#
# $Id: imapdu.pl,v 1.8 2001/11/30 19:30:45 leg Exp $
#
-diff -urNad cyrus-imapd-2.2.12/perl/imap/examples/test-imsp.pl /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/perl/imap/examples/test-imsp.pl
+diff -urNad cyrus-imapd-2.2.12/perl/imap/examples/test-imsp.pl cyrus-imapd-2.2.12/perl/imap/examples/test-imsp.pl
--- cyrus-imapd-2.2.12/perl/imap/examples/test-imsp.pl 2005-05-24 22:13:05.000000000 +0200
-+++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/perl/imap/examples/test-imsp.pl 2005-05-24 22:44:39.057572521 +0200
++++ cyrus-imapd-2.2.12/perl/imap/examples/test-imsp.pl 2005-05-24 22:44:39.057572521 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl -w
+#!/usr/bin/perl -w
# test-imsp.pl
#
-diff -urNad cyrus-imapd-2.2.12/perl/sieve/scripts/installsieve.pl /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/perl/sieve/scripts/installsieve.pl
+diff -urNad cyrus-imapd-2.2.12/perl/sieve/scripts/installsieve.pl cyrus-imapd-2.2.12/perl/sieve/scripts/installsieve.pl
--- cyrus-imapd-2.2.12/perl/sieve/scripts/installsieve.pl 2005-05-24 22:13:05.000000000 +0200
-+++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/perl/sieve/scripts/installsieve.pl 2005-05-24 22:44:39.061572881 +0200
++++ cyrus-imapd-2.2.12/perl/sieve/scripts/installsieve.pl 2005-05-24 22:44:39.061572881 +0200
@@ -1,6 +1,4 @@
-#! /bin/sh
-exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
@@ -92,9 +92,9 @@
#
# Copyright (c) 2000 Carnegie Mellon University. All rights reserved.
#
-diff -urNad cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl
+diff -urNad cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl
--- cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl 2005-05-24 22:13:05.000000000 +0200
-+++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl 2005-05-24 22:44:39.062572971 +0200
++++ cyrus-imapd-2.2.12/perl/sieve/scripts/sieveshell.pl 2005-05-24 22:44:39.062572971 +0200
@@ -1,6 +1,4 @@
-#! /bin/sh
-exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
@@ -103,9 +103,9 @@
#
# Copyright (c) 2000 Carnegie Mellon University. All rights reserved.
#
-diff -urNad cyrus-imapd-2.2.12/snmp/snmpgen /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/snmp/snmpgen
+diff -urNad cyrus-imapd-2.2.12/snmp/snmpgen cyrus-imapd-2.2.12/snmp/snmpgen
--- cyrus-imapd-2.2.12/snmp/snmpgen 2005-05-24 22:13:05.000000000 +0200
-+++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/snmp/snmpgen 2005-05-24 22:44:39.073573962 +0200
++++ cyrus-imapd-2.2.12/snmp/snmpgen 2005-05-24 22:44:39.073573962 +0200
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/perl -w
@@ -138,18 +138,18 @@
require 5;
#Tim Martin
-diff -urNad cyrus-imapd-2.2.12/tools/arbitronsort.pl /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/arbitronsort.pl
+diff -urNad cyrus-imapd-2.2.12/tools/arbitronsort.pl cyrus-imapd-2.2.12/tools/arbitronsort.pl
--- cyrus-imapd-2.2.12/tools/arbitronsort.pl 2005-05-24 22:13:04.000000000 +0200
-+++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/arbitronsort.pl 2005-05-24 22:44:39.018569008 +0200
++++ cyrus-imapd-2.2.12/tools/arbitronsort.pl 2005-05-24 22:44:39.018569008 +0200
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
#
# This script takes the output of arbitron (run without the -o option)
-diff -urNad cyrus-imapd-2.2.12/tools/config2header /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/config2header
+diff -urNad cyrus-imapd-2.2.12/tools/config2header cyrus-imapd-2.2.12/tools/config2header
--- cyrus-imapd-2.2.12/tools/config2header 2005-05-24 22:13:04.000000000 +0200
-+++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/config2header 2005-05-24 22:44:39.017568918 +0200
++++ cyrus-imapd-2.2.12/tools/config2header 2005-05-24 22:44:39.017568918 +0200
@@ -1,4 +1,5 @@
-#!/bin/sh
+#!/usr/bin/perl -w
@@ -182,9 +182,9 @@
require 5;
use strict;
-diff -urNad cyrus-imapd-2.2.12/tools/config2man /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/config2man
+diff -urNad cyrus-imapd-2.2.12/tools/config2man cyrus-imapd-2.2.12/tools/config2man
--- cyrus-imapd-2.2.12/tools/config2man 2005-05-24 22:13:04.000000000 +0200
-+++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/config2man 2005-05-24 22:44:39.020569188 +0200
++++ cyrus-imapd-2.2.12/tools/config2man 2005-05-24 22:44:39.020569188 +0200
@@ -1,4 +1,5 @@
-#!/bin/sh
+#!/usr/bin/perl -w
@@ -217,9 +217,9 @@
require 5;
use strict;
-diff -urNad cyrus-imapd-2.2.12/tools/dohash /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/dohash
+diff -urNad cyrus-imapd-2.2.12/tools/dohash cyrus-imapd-2.2.12/tools/dohash
--- cyrus-imapd-2.2.12/tools/dohash 2005-05-24 22:13:04.000000000 +0200
-+++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/dohash 2005-05-24 22:44:39.023569458 +0200
++++ cyrus-imapd-2.2.12/tools/dohash 2005-05-24 22:44:39.023569458 +0200
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/perl -w
@@ -254,9 +254,9 @@
require 5;
$| = 1;
-diff -urNad cyrus-imapd-2.2.12/tools/masssievec /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/masssievec
+diff -urNad cyrus-imapd-2.2.12/tools/masssievec cyrus-imapd-2.2.12/tools/masssievec
--- cyrus-imapd-2.2.12/tools/masssievec 2005-05-24 22:13:04.000000000 +0200
-+++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/masssievec 2005-05-24 22:44:39.019569098 +0200
++++ cyrus-imapd-2.2.12/tools/masssievec 2005-05-24 22:44:39.019569098 +0200
@@ -1,4 +1,6 @@
-#!/bin/sh
+#!/usr/bin/perl -w
@@ -294,9 +294,9 @@
require 5;
$| = 1;
-diff -urNad cyrus-imapd-2.2.12/tools/mkimap /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/mkimap
+diff -urNad cyrus-imapd-2.2.12/tools/mkimap cyrus-imapd-2.2.12/tools/mkimap
--- cyrus-imapd-2.2.12/tools/mkimap 2005-05-24 22:13:04.000000000 +0200
-+++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/mkimap 2005-05-24 22:44:39.030570089 +0200
++++ cyrus-imapd-2.2.12/tools/mkimap 2005-05-24 22:44:39.030570089 +0200
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/perl
@@ -329,9 +329,9 @@
require 5;
sub read_conf {
-diff -urNad cyrus-imapd-2.2.12/tools/mknewsgroups /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/mknewsgroups
+diff -urNad cyrus-imapd-2.2.12/tools/mknewsgroups cyrus-imapd-2.2.12/tools/mknewsgroups
--- cyrus-imapd-2.2.12/tools/mknewsgroups 2005-05-24 22:13:04.000000000 +0200
-+++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/mknewsgroups 2005-05-24 22:44:39.022569368 +0200
++++ cyrus-imapd-2.2.12/tools/mknewsgroups 2005-05-24 22:44:39.022569368 +0200
@@ -1,5 +1,8 @@
-#!/bin/sh
+#!/usr/bin/perl -w
@@ -372,9 +372,9 @@
require 5;
use Getopt::Long;
-diff -urNad cyrus-imapd-2.2.12/tools/rehash /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/rehash
+diff -urNad cyrus-imapd-2.2.12/tools/rehash cyrus-imapd-2.2.12/tools/rehash
--- cyrus-imapd-2.2.12/tools/rehash 2005-05-24 22:13:04.000000000 +0200
-+++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/rehash 2005-05-24 22:44:39.029569999 +0200
++++ cyrus-imapd-2.2.12/tools/rehash 2005-05-24 22:44:39.029569999 +0200
@@ -1,4 +1,8 @@
-#!/bin/sh
+#!/usr/bin/perl
@@ -416,9 +416,9 @@
require 5;
$| = 1;
-diff -urNad cyrus-imapd-2.2.12/tools/translatesieve /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/translatesieve
+diff -urNad cyrus-imapd-2.2.12/tools/translatesieve cyrus-imapd-2.2.12/tools/translatesieve
--- cyrus-imapd-2.2.12/tools/translatesieve 2005-05-24 22:13:04.000000000 +0200
-+++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/translatesieve 2005-05-24 22:44:39.027569818 +0200
++++ cyrus-imapd-2.2.12/tools/translatesieve 2005-05-24 22:44:39.027569818 +0200
@@ -1,6 +1,4 @@
-#!/bin/sh
-exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
@@ -449,18 +449,18 @@
require 5;
$| = 1;
-diff -urNad cyrus-imapd-2.2.12/tools/undohash /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/undohash
+diff -urNad cyrus-imapd-2.2.12/tools/undohash cyrus-imapd-2.2.12/tools/undohash
--- cyrus-imapd-2.2.12/tools/undohash 2005-05-24 22:13:04.000000000 +0200
-+++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/undohash 2005-05-24 22:44:39.028569908 +0200
++++ cyrus-imapd-2.2.12/tools/undohash 2005-05-24 22:44:39.028569908 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!/usr/bin/perl -w
# script to downgrade from cyrus imapd 1.6.2+ to earlier.
# do NOT run this script while imapd's are running
# $Id: undohash,v 1.8 2005/12/01 22:01:13 murch Exp $
-diff -urNad cyrus-imapd-2.2.12/tools/upgradesieve /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/upgradesieve
+diff -urNad cyrus-imapd-2.2.12/tools/upgradesieve cyrus-imapd-2.2.12/tools/upgradesieve
--- cyrus-imapd-2.2.12/tools/upgradesieve 2005-05-24 22:13:04.000000000 +0200
-+++ /tmp/dpep.36VuGh/cyrus-imapd-2.2.12/tools/upgradesieve 2005-05-24 22:44:39.021569278 +0200
++++ cyrus-imapd-2.2.12/tools/upgradesieve 2005-05-24 22:44:39.021569278 +0200
@@ -1,6 +1,4 @@
-#!/bin/sh
-exec perl -x -S $0 ${1+"$@"} # -*-perl-*-
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/35-masssievec_remove_unused_variable.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/35-masssievec_remove_unused_variable.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/35-masssievec_remove_unused_variable.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/35-masssievec_remove_unused_variable.dpatch Fri Jan 22 22:07:03 2010
@@ -5,9 +5,9 @@
## DP: Remove the $nosievedir variable which is set once but never used.
@DPATCH@
-diff -urNad cyrus-imapd-2.2.12/tools/masssievec /tmp/dpep.jwVgoT/cyrus-imapd-2.2.12/tools/masssievec
+diff -urNad cyrus-imapd-2.2.12/tools/masssievec cyrus-imapd-2.2.12/tools/masssievec
--- cyrus-imapd-2.2.12/tools/masssievec 2005-05-24 22:52:49.000000000 +0200
-+++ /tmp/dpep.jwVgoT/cyrus-imapd-2.2.12/tools/masssievec 2005-05-24 22:53:24.124865338 +0200
++++ cyrus-imapd-2.2.12/tools/masssievec 2005-05-24 22:53:24.124865338 +0200
@@ -86,7 +86,6 @@
push @configs, $1;
}
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/40-rehash_fix_pathes.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/40-rehash_fix_pathes.dpatch?rev=873&root=cyrus22&r1=872&r2=3D873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/40-rehash_fix_pathes.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/40-rehash_fix_pathes.dpatch Fri Jan 22 22:07:03 2010
@@ -5,9 +5,9 @@
## DP: Fix paths in tools/rehash
@DPATCH@
-diff -urNad cyrus-imapd-2.2.12/tools/rehash /tmp/dpep.cNgMuy/cyrus-imapd-2.2.12/tools/rehash
+diff -urNad cyrus-imapd-2.2.12/tools/rehash cyrus-imapd-2.2.12/tools/rehash
--- cyrus-imapd-2.2.12/tools/rehash 2005-05-24 22:56:53.000000000 +0200
-+++ /tmp/dpep.cNgMuy/cyrus-imapd-2.2.12/tools/rehash 2005-05-24 22:57:53.429121575 +0200
++++ cyrus-imapd-2.2.12/tools/rehash 2005-05-24 22:57:53.429121575 +0200
@@ -170,7 +170,7 @@
$imapdconf = shift || "/etc/imapd.conf";
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/45-kolab2-annotations.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/45-kolab2-annotations.dpatch?rev=873&root=cyrus22&r1=872&r2=
3D873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/45-kolab2-annotations.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/45-kolab2-annotations.dpatch Fri Jan 22 22:07:03 2010
@@ -5,9 +5,9 @@
## DP: Add kolab2 compatible annotation functionality
@DPATCH@
-diff -urNad cyrus-imapd-2.2.13/imap/annotate.c /tmp/dpep.BSsfxj/cyrus-imapd-2.2.13/imap/annotate.c
+diff -urNad cyrus-imapd-2.2.13/imap/annotate.c cyrus-imapd-2.2.13/imap/annotate.c
--- cyrus-imapd-2.2.13/imap/annotate.c 2006-09-26 21:33:43.000000000 +0200
-+++ /tmp/dpep.BSsfxj/cyrus-imapd-2.2.13/imap/annotate.c 2006-09-26 21:33:53.973964626 +0200
++++ cyrus-imapd-2.2.13/imap/annotate.c 2006-09-26 21:33:53.973964626 +0200
@@ -1673,6 +1673,11 @@
{ NULL, 0, ANNOTATION_PROXY_T_INVALID, 0, 0, NULL, NULL }
};
@@ -123,9 +123,9 @@
sdata.entry_list = sdata.entry_list->next;
free(freeme);
}
-diff -urNad cyrus-imapd-2.2.13/perl/imap/IMAP/Admin.pm /tmp/dpep.BSsfxj/cyrus-imapd-2.2.13/perl/imap/IMAP/Admin.pm
+diff -urNad cyrus-imapd-2.2.13/perl/imap/IMAP/Admin.pm cyrus-imapd-2.2.13/perl/imap/IMAP/Admin.pm
--- cyrus-imapd-2.2.13/perl/imap/IMAP/Admin.pm 2006-09-25 20:41:19.000000000 +0200
-+++ /tmp/dpep.BSsfxj/cyrus-imapd-2.2.13/perl/imap/IMAP/Admin.pm 2006-09-26 21:34:36.112138623 +0200
++++ cyrus-imapd-2.2.13/perl/imap/IMAP/Admin.pm 2006-09-26 21:34:36.112138623 +0200
@@ -784,19 +784,21 @@
"news2mail" => "/vendor/cmu/cyrus-imapd/news2mail",
"expire" => "/vendor/cmu/cyrus-imapd/expire",
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/61-64bit-quota.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/61-64bit-quota.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/61-64bit-quota.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/61-64bit-quota.dpatch Fri Jan 22 22:07:03 2010
@@ -5,9 +5,9 @@
## DP: Add support for 64-bit quotas
@DPATCH@
-diff -urNad cyrus-imapd-2.2.13/configure.in /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/configure.in
+diff -urNad cyrus-imapd-2.2.13/configure.in cyrus-imapd-2.2.13/configure.in
--- cyrus-imapd-2.2.13/configure.in 2007-02-24 18:46:32.000000000 +0100
-+++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/configure.in 2007-02-24 18:46:35.598277322 +0100
++++ cyrus-imapd-2.2.13/configure.in 2007-02-24 18:46:35.598277322 +0100
@@ -107,6 +107,15 @@
dnl fi
AC_C_INLINE
@@ -24,9 +24,9 @@
CMU_C___ATTRIBUTE__
CMU_C_FPIC
-diff -urNad cyrus-imapd-2.2.13/imap/append.c /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/append.c
+diff -urNad cyrus-imapd-2.2.13/imap/append.c cyrus-imapd-2.2.13/imap/append.c
--- cyrus-imapd-2.2.13/imap/append.c 2006-11-13 19:21:27.000000000 +0100
-+++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/append.c 2007-02-24 18:46:35.599277223 +0100
++++ cyrus-imapd-2.2.13/imap/append.c 2007-02-24 18:46:35.599277223 +0100
@@ -140,7 +140,7 @@
if (!r) {
if (m.quota.limit >= 0 && quotacheck >= 0 &&
@@ -45,9 +45,9 @@
quota_abort(&as->tid);
mailbox_close(&as->m);
r = IMAP_QUOTA_EXCEEDED;
-diff -urNad cyrus-imapd-2.2.13/imap/imapd.c /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/imapd.c
+diff -urNad cyrus-imapd-2.2.13/imap/imapd.c cyrus-imapd-2.2.13/imap/imapd.c
--- cyrus-imapd-2.2.13/imap/imapd.c 2007-02-24 18:46:32.000000000 +0100
-+++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/imapd.c 2007-02-24 18:46:35.602276928 +0100
++++ cyrus-imapd-2.2.13/imap/imapd.c 2007-02-24 18:46:35.602276928 +0100
@@ -2664,10 +2664,10 @@
*/
int warnsize = config_getint(IMAPOPT_QUOTAWARNKB);
@@ -80,9 +80,9 @@
mailbox.quota.used/QUOTA_UNITS,
mailbox.quota.limit);
}
-diff -urNad cyrus-imapd-2.2.13/imap/mailbox.c /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/mailbox.c
+diff -urNad cyrus-imapd-2.2.13/imap/mailbox.c cyrus-imapd-2.2.13/imap/mailbox.c
--- cyrus-imapd-2.2.13/imap/mailbox.c 2007-02-24 18:46:31.000000000 +0100
-+++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/mailbox.c 2007-02-24 18:46:35.604276731 +0100
++++ cyrus-imapd-2.2.13/imap/mailbox.c 2007-02-24 18:46:35.604276731 +0100
@@ -84,6 +84,7 @@
#include "seen.h"
#include "util.h"
@@ -214,9 +214,9 @@
newmailbox.quota_mailbox_used, newmailbox.quota.root);
}
}
-diff -urNad cyrus-imapd-2.2.13/imap/mailbox.h /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/mailbox.h
+diff -urNad cyrus-imapd-2.2.13/imap/mailbox.h cyrus-imapd-2.2.13/imap/mailbox.h
--- cyrus-imapd-2.2.13/imap/mailbox.h 2006-11-13 19:21:27.000000000 +0100
-+++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/mailbox.h 2007-02-24 18:46:35.604276731 +0100
++++ cyrus-imapd-2.2.13/imap/mailbox.h 2007-02-24 18:46:35.604276731 +0100
@@ -45,6 +45,7 @@
#include <sys/types.h>
#include <sys/stat.h>
@@ -256,9 +256,9 @@
#define OFFSET_POP3_LAST_LOGIN 40
#define OFFSET_UIDVALIDITY 44
#define OFFSET_DELETED 48 /* added for ACAP */
-diff -urNad cyrus-imapd-2.2.13/imap/mbdump.c /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/mbdump.c
+diff -urNad cyrus-imapd-2.2.13/imap/mbdump.c cyrus-imapd-2.2.13/imap/mbdump.c
--- cyrus-imapd-2.2.13/imap/mbdump.c 2007-02-24 18:46:32.000000000 +0100
-+++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/mbdump.c 2007-02-24 18:46:35.605276633 +0100
++++ cyrus-imapd-2.2.13/imap/mbdump.c 2007-02-24 18:46:35.605276633 +0100
@@ -507,7 +507,7 @@
{
struct buf file, data;
@@ -268,9 +268,9 @@
int r = 0;
int curfile = -1;
const char *userid = NULL;
-diff -urNad cyrus-imapd-2.2.13/imap/mbexamine.c /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/mbexamine.c
+diff -urNad cyrus-imapd-2.2.13/imap/mbexamine.c cyrus-imapd-2.2.13/imap/mbexamine.c
--- cyrus-imapd-2.2.13/imap/mbexamine.c 2006-11-13 19:21:27.000000000 +0100
-+++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/mbexamine.c 2007-02-24 18:46:35.605276633 +0100
++++ cyrus-imapd-2.2.13/imap/mbexamine.c 2007-02-24 18:46:35.605276633 +0100
@@ -266,7 +266,7 @@
printf(" Minor Version: %d\n", mailbox.minor_version);
printf(" Header Size: %ld bytes Record Size: %ld bytes\n",
@@ -280,9 +280,9 @@
mailbox.exists, mailbox.quota_mailbox_used);
printf(" Last Append Date: (%ld) %s", mailbox.last_appenddate,
ctime(&mailbox.last_appenddate));
-diff -urNad cyrus-imapd-2.2.13/imap/mboxlist.c /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/mboxlist.c
+diff -urNad cyrus-imapd-2.2.13/imap/mboxlist.c cyrus-imapd-2.2.13/imap/mboxlist.c
--- cyrus-imapd-2.2.13/imap/mboxlist.c 2007-02-24 18:46:31.000000000 +0100
-+++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/mboxlist.c 2007-02-24 18:46:35.606276534 +0100
++++ cyrus-imapd-2.2.13/imap/mboxlist.c 2007-02-24 18:46:35.606276534 +0100
@@ -2536,7 +2536,7 @@
r = quota_write(&mailbox.quota, tid);
if (r) {
@@ -292,9 +292,9 @@
mailbox.quota_mailbox_used, mailbox.quota.root);
}
free(mailbox.quota.root);
-diff -urNad cyrus-imapd-2.2.13/imap/quota.c /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/quota.c
+diff -urNad cyrus-imapd-2.2.13/imap/quota.c cyrus-imapd-2.2.13/imap/quota.c
--- cyrus-imapd-2.2.13/imap/quota.c 2007-02-24 18:46:31.000000000 +0100
-+++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/quota.c 2007-02-24 18:46:35.607276436 +0100
++++ cyrus-imapd-2.2.13/imap/quota.c 2007-02-24 18:46:35.607276436 +0100
@@ -107,7 +107,7 @@
struct quota quota;
int refcount;
@@ -336,9 +336,9 @@
+ printf(" " QUOTA_REPORT_FMT " %s\n", quota[i].quota.used / QUOTA_UNITS, buf);
}
}
-diff -urNad cyrus-imapd-2.2.13/imap/quota.h /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/quota.h
+diff -urNad cyrus-imapd-2.2.13/imap/quota.h cyrus-imapd-2.2.13/imap/quota.h
--- cyrus-imapd-2.2.13/imap/quota.h 2006-11-13 19:21:27.000000000 +0100
-+++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/quota.h 2007-02-24 18:46:35.607276436 +0100
++++ cyrus-imapd-2.2.13/imap/quota.h 2007-02-24 18:46:35.607276436 +0100
@@ -45,18 +45,37 @@
#define INCLUDED_QUOTA_H
@@ -378,9 +378,9 @@
int limit; /* in QUOTA_UNITS */
};
-diff -urNad cyrus-imapd-2.2.13/imap/quota_db.c /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/quota_db.c
+diff -urNad cyrus-imapd-2.2.13/imap/quota_db.c cyrus-imapd-2.2.13/imap/quota_db.c
--- cyrus-imapd-2.2.13/imap/quota_db.c 2006-11-13 19:21:27.000000000 +0100
-+++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/quota_db.c 2007-02-24 18:46:35.608276338 +0100
++++ cyrus-imapd-2.2.13/imap/quota_db.c 2007-02-24 18:46:35.608276338 +0100
@@ -89,7 +89,7 @@
switch (r) {
@@ -399,9 +399,9 @@
r = QDB->store(qdb, quota->root, qrlen, buf, len, tid);
switch (r) {
-diff -urNad cyrus-imapd-2.2.13/imap/reconstruct.c /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/reconstruct.c
+diff -urNad cyrus-imapd-2.2.13/imap/reconstruct.c cyrus-imapd-2.2.13/imap/reconstruct.c
--- cyrus-imapd-2.2.13/imap/reconstruct.c 2007-02-24 18:46:31.000000000 +0100
-+++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/imap/reconstruct.c 2007-02-24 18:46:35.608276338 +0100
++++ cyrus-imapd-2.2.13/imap/reconstruct.c 2007-02-24 18:46:35.608276338 +0100
@@ -93,6 +93,7 @@
#include "retry.h"
#include "convert_code.h"
@@ -434,9 +434,9 @@
*((bit32 *)(buf+OFFSET_POP3_LAST_LOGIN)) = htonl(mailbox.pop3_last_login);
*((bit32 *)(buf+OFFSET_UIDVALIDITY)) = htonl(mailbox.uidvalidity);
*((bit32 *)(buf+OFFSET_DELETED)) = htonl(new_deleted);
-diff -urNad cyrus-imapd-2.2.13/lib/Makefile.in /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/lib/Makefile.in
+diff -urNad cyrus-imapd-2.2.13/lib/Makefile.in cyrus-imapd-2.2.13/lib/Makefile.in
--- cyrus-imapd-2.2.13/lib/Makefile.in 2007-02-24 18:46:32.000000000 +0100
-+++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/lib/Makefile.in 2007-02-24 18:46:35.609276239 +0100
++++ cyrus-imapd-2.2.13/lib/Makefile.in 2007-02-24 18:46:35.609276239 +0100
@@ -87,7 +87,7 @@
$(srcdir)/lsort.h $(srcdir)/stristr.h \
$(srcdir)/util.h $(srcdir)/xstrlcpy.h $(srcdir)/xstrlcat.h $(srcdir)/xmalloc.h $(srcdir)/imapurl.h \
@@ -455,9 +455,9 @@
LIBCYRM_HDRS = $(srcdir)/hash.h $(srcdir)/mpool.h $(srcdir)/xstrlcpy.h $(srcdir)/xstrlcat.h $(srcdir)/xmalloc.h \
$(srcdir)/strhash.o $(srcdir)/libconfig.h \
-diff -urNad cyrus-imapd-2.2.13/lib/byteorder64.c /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/lib/byteorder64.c
+diff -urNad cyrus-imapd-2.2.13/lib/byteorder64.c cyrus-imapd-2.2.13/lib/byteorder64.c
--- cyrus-imapd-2.2.13/lib/byteorder64.c 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/lib/byteorder64.c 2007-02-24 18:46:35.609276239 +0100
++++ cyrus-imapd-2.2.13/lib/byteorder64.c 2007-02-24 18:46:35.609276239 +0100
@@ -0,0 +1,95 @@
+/* byteorder64.c -- convert 64-bit values between host and network byte order
+ *
@@ -554,9 +554,9 @@
+}
+
+#endif /* defined(HAVE_LONG_LONG_INT) && !defined(WORDS_BIGENDIAN) */
-diff -urNad cyrus-imapd-2.2.13/lib/byteorder64.h /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/lib/byteorder64.h
+diff -urNad cyrus-imapd-2.2.13/lib/byteorder64.h cyrus-imapd-2.2.13/lib/byteorder64.h
--- cyrus-imapd-2.2.13/lib/byteorder64.h 1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/lib/byteorder64.h 2007-02-24 18:46:35.609276239 +0100
++++ cyrus-imapd-2.2.13/lib/byteorder64.h 2007-02-24 18:46:35.609276239 +0100
@@ -0,0 +1,65 @@
+/* byteorder64.h -- convert 64-bit values between host and network byte order
+ *
@@ -623,9 +623,9 @@
+#endif /* WORDS_BIGENDIAN */
+#endif /* HAVE_LONG_LONG_INT */
+#endif /* _BYTEORDER64_H */
-diff -urNad cyrus-imapd-2.2.13/lib/prot.c /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/lib/prot.c
+diff -urNad cyrus-imapd-2.2.13/lib/prot.c cyrus-imapd-2.2.13/lib/prot.c
--- cyrus-imapd-2.2.13/lib/prot.c 2006-11-13 19:21:27.000000000 +0100
-+++ /tmp/dpep.34sb5l/cyrus-imapd-2.2.13/lib/prot.c 2007-02-24 18:46:35.610276141 +0100
++++ cyrus-imapd-2.2.13/lib/prot.c 2007-02-24 18:46:35.610276141 +0100
@@ -871,6 +871,11 @@
char buf[30];
va_start(pvar, fmt);
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/65-sieveshell-enhancements.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/65-sieveshell-enhancements.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/65-sieveshell-enhancements.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/65-sieveshell-enhancements.dpatch Fri Jan 22 22:07:03 2010
@@ -5,9 +5,9 @@
## DP: Adds some enhancements to sieveshell and fixes some paths.
@DPATCH@
-diff -urNad cyrus-imapd-2.2.13/perl/imap/IMAP/Shell.pm /tmp/dpep.foG1lU/cyrus-imapd-2.2.13/perl/imap/IMAP/Shell.pm
+diff -urNad cyrus-imapd-2.2.13/perl/imap/IMAP/Shell.pm cyrus-imapd-2.2.13/perl/imap/IMAP/Shell.pm
--- cyrus-imapd-2.2.13/perl/imap/IMAP/Shell.pm 2006-04-18 18:24:55.000000000 +0200
-+++ /tmp/dpep.foG1lU/cyrus-imapd-2.2.13/perl/imap/IMAP/Shell.pm 2006-04-18 18:26:19.796548250 +0200
++++ cyrus-imapd-2.2.13/perl/imap/IMAP/Shell.pm 2006-04-18 18:26:19.796548250 +0200
@@ -126,7 +126,7 @@
[\&_sc_info, '[mailbox]',
'display mailbox/server metadata'],
@@ -53,9 +53,9 @@
}
if (!$cyrref || !$$cyrref) {
die "mboxconfig: no connection to server\n";
-diff -urNad cyrus-imapd-2.2.13/perl/sieve/lib/request.c /tmp/dpep.foG1lU/cyrus-imapd-2.2.13/perl/sieve/lib/request.c
+diff -urNad cyrus-imapd-2.2.13/perl/sieve/lib/request.c cyrus-imapd-2.2.13/perl/sieve/lib/request.c
--- cyrus-imapd-2.2.13/perl/sieve/lib/request.c 2006-04-18 18:24:55.000000000 +0200
-+++ /tmp/dpep.foG1lU/cyrus-imapd-2.2.13/perl/sieve/lib/request.c 2006-04-18 18:25:11.549208277 +0200
++++ cyrus-imapd-2.2.13/perl/sieve/lib/request.c 2006-04-18 18:25:11.549208277 +0200
@@ -560,7 +560,6 @@
char **refer_to, char **errstrp)
{
@@ -64,9 +64,9 @@
mystring_t *errstr=NULL;
lexstate_t state;
int ret = 0;
-diff -urNad cyrus-imapd-2.2.13/perl/sieve/scripts/sieveshell.pl /tmp/dpep.foG1lU/cyrus-imapd-2.2.13/perl/sieve/scripts/sieveshell.pl
+diff -urNad cyrus-imapd-2.2.13/perl/sieve/scripts/sieveshell.pl cyrus-imapd-2.2.13/perl/sieve/scripts/sieveshell.pl
--- cyrus-imapd-2.2.13/perl/sieve/scripts/sieveshell.pl 2006-04-18 18:25:07.000000000 +0200
-+++ /tmp/dpep.foG1lU/cyrus-imapd-2.2.13/perl/sieve/scripts/sieveshell.pl 2006-04-18 18:25:11.550208179 +0200
++++ cyrus-imapd-2.2.13/perl/sieve/scripts/sieveshell.pl 2006-04-18 18:25:11.550208179 +0200
@@ -60,7 +60,9 @@
my $username = $ENV{USER};
my $authname = $ENV{USER};
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/70-allow-larger-buffers.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/70-allow-larger-buffers.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/70-allow-larger-buffers.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/70-allow-larger-buffers.dpatch Fri Jan 22 22:07:03 2010
@@ -7,9 +7,9 @@
## 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.G4uvjC/cyrus-imapd-2.2.13/imap/imapparse.c
+diff -urNad cyrus-imapd-2.2.13/imap/imapparse.c cyrus-imapd-2.2.13/imap/imapparse.c
--- cyrus-imapd-2.2.13/imap/imapparse.c 2007-02-25 21:39:04.000000000 +0100
-+++ /tmp/dpep.G4uvjC/cyrus-imapd-2.2.13/imap/imapparse.c 2007-02-25 21:40:19.830078835 +0100
++++ cyrus-imapd-2.2.13/imap/imapparse.c 2007-02-25 21:40:19.830078835 +0100
@@ -52,9 +52,9 @@
#include "exitcodes.h"
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/72-faster-isdigit.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/72-faster-isdigit.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/72-faster-isdigit.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/72-faster-isdigit.dpatch Fri Jan 22 22:07:03 2010
@@ -7,9 +7,9 @@
## DP: http://cyrus.brong.fastmail.fm/patches/cyrus-isdigit-2.3.3.diff
@DPATCH@
-diff -urNad cyrus-imapd-2.2.13/imap/index.c /tmp/dpep.diZCKJ/cyrus-imapd-2.2.13/imap/index.c
+diff -urNad cyrus-imapd-2.2.13/imap/index.c cyrus-imapd-2.2.13/imap/index.c
--- cyrus-imapd-2.2.13/imap/index.c 2006-05-24 14:47:49.000000000 +0200
-+++ /tmp/dpep.diZCKJ/cyrus-imapd-2.2.13/imap/index.c 2006-05-24 14:49:15.509369880 +0200
++++ cyrus-imapd-2.2.13/imap/index.c 2006-05-24 14:49:15.509369880 +0200
@@ -490,8 +490,8 @@
*/
old = seenuids;
@@ -129,9 +129,9 @@
count = count * 10 + *x - '0';
if (count < 0) { /* overflow */
count = -1; /* abort counting */
-diff -urNad cyrus-imapd-2.2.13/lib/util.h /tmp/dpep.diZCKJ/cyrus-imapd-2.2.13/lib/util.h
+diff -urNad cyrus-imapd-2.2.13/lib/util.h cyrus-imapd-2.2.13/lib/util.h
--- cyrus-imapd-2.2.13/lib/util.h 2005-03-12 23:09:22.000000000 +0100
-+++ /tmp/dpep.diZCKJ/cyrus-imapd-2.2.13/lib/util.h 2006-05-24 14:48:36.634022360 +0200
++++ cyrus-imapd-2.2.13/lib/util.h 2006-05-24 14:48:36.634022360 +0200
@@ -107,4 +107,10 @@
*/
extern int cyrus_mkdir(const char *path, mode_t mode);
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/75-update-imapd.conf-documentation.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/75-update-imapd.conf-documentation.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/75-update-imapd.conf-documentation.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/75-update-imapd.conf-documentation.dpatch Fri Jan 22 22:07:03 2010
@@ -6,9 +6,9 @@
## DP: supported option names
@DPATCH@
-diff -urNad cyrus-imapd-2.2.13/lib/imapoptions /tmp/dpep.YhnBkx/cyrus-imapd-2.2.13/lib/imapoptions
+diff -urNad cyrus-imapd-2.2.13/lib/imapoptions cyrus-imapd-2.2.13/lib/imapoptions
--- cyrus-imapd-2.2.13/lib/imapoptions 2006-08-02 23:15:02.000000000 +0200
-+++ /tmp/dpep.YhnBkx/cyrus-imapd-2.2.13/lib/imapoptions 2006-08-02 23:17:59.362341706 +0200
++++ cyrus-imapd-2.2.13/lib/imapoptions 2006-08-02 23:17:59.362341706 +0200
@@ -69,7 +69,10 @@
\fB/etc/imapd.conf\fR file, and show each option's default value.
Some options have no default value, these are listed with
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/77-change-missing-sieve-notice.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/77-change-missing-sieve-notice.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/77-change-missing-sieve-notice.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/77-change-missing-sieve-notice.dpatch Fri Jan 22 22:07:03 2010
@@ -6,9 +6,9 @@
## DP: script is missing
@DPATCH@
-diff -urNad cyrus-imapd-2.2.13/sieve/script.c /tmp/dpep.ggizfh/cyrus-imapd-2.2.13/sieve/script.c
+diff -urNad cyrus-imapd-2.2.13/sieve/script.c cyrus-imapd-2.2.13/sieve/script.c
--- cyrus-imapd-2.2.13/sieve/script.c 2005-03-12 23:09:22.000000000 +0100
-+++ /tmp/dpep.ggizfh/cyrus-imapd-2.2.13/sieve/script.c 2006-08-21 23:31:25.979899091 +0200
++++ cyrus-imapd-2.2.13/sieve/script.c 2006-08-21 23:31:25.979899091 +0200
@@ -37,6 +37,7 @@
#include <sys/types.h>
#include <unistd.h>
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/80-kbsd-no-psstrings.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/80-kbsd-no-psstrings.dpatch?rev=873&root=cyrus22&r1=872&r2=3D873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/80-kbsd-no-psstrings.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/80-kbsd-no-psstrings.dpatch Fri Jan 22 22:07:03 2010
@@ -5,9 +5,9 @@
## DP: disable PS_STRINGS for GNU/kFreeBSD
@DPATCH@
-diff -urNad cyrus-imapd-2.2.13/configure.in /tmp/dpep.6LRag9/cyrus-imapd-2.2.13/configure.in
+diff -urNad cyrus-imapd-2.2.13/configure.in cyrus-imapd-2.2.13/configure.in
--- cyrus-imapd-2.2.13/configure.in 2006-09-25 20:13:04.000000000 +0200
-+++ /tmp/dpep.6LRag9/cyrus-imapd-2.2.13/configure.in 2006-09-25 20:13:06.102258297 +0200
++++ cyrus-imapd-2.2.13/configure.in 2006-09-25 20:13:06.102258297 +0200
@@ -297,16 +297,15 @@
fi
if test "$spt_type" = ""; then
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/82-allow-from_-header.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/82-allow-from_-header.dpatch?rev=873&root=cyrus22&r1=872&r2=
3D873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/82-allow-from_-header.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/82-allow-from_-header.dpatch Fri Jan 22 22:07:03 2010
@@ -6,9 +6,9 @@
## DP: Outlook sometimes tries (occured with Thunderbird as well)
@DPATCH@
-diff -urNad cyrus-imapd-2.2.13/imap/message.c /tmp/dpep.hKmCze/cyrus-imapd-2.2.13/imap/message.c
+diff -urNad cyrus-imapd-2.2.13/imap/message.c cyrus-imapd-2.2.13/imap/message.c
--- cyrus-imapd-2.2.13/imap/message.c 2007-02-25 21:28:42.000000000 +0100
-+++ /tmp/dpep.hKmCze/cyrus-imapd-2.2.13/imap/message.c 2007-02-25 21:29:40.841335772 +0100
++++ cyrus-imapd-2.2.13/imap/message.c 2007-02-25 21:29:40.841335772 +0100
@@ -296,6 +296,7 @@
/* Check for valid header name */
if (sawnl && buf[0] != ' ' && buf[0] != '\t') {
Modified: trunk/cyrus-imapd-2.2.13/debian/patches/99-update-autoconf.dpatch
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/99-update-autoconf.dpatch?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/99-update-autoconf.dpatch (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/99-update-autoconf.dpatch Fri Jan 22 22:07:03 2010
@@ -6,9 +6,8 @@
## DP: (64bit-quota and potentially DRAC)
@DPATCH@
-diff -urNad cyrus-imapd-2.2.13/config.guess /tmp/dpep.48WUNC/cyrus-imapd-2.2.13/config.guess
---- cyrus-imapd-2.2.13/config.guess 2006-10-10 17:24:32.000000000 +0200
-+++ /tmp/dpep.48WUNC/cyrus-imapd-2.2.13/config.guess 2007-02-24 20:51:40.439078754 +0100
+--- a/config.guess
++++ b/config.guess
@@ -1,8 +1,11 @@
#! /bin/sh
# Attempt to guess a canonical system name.
@@ -422,7 +421,7 @@
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 @@
+@@ -175,25 +312,32 @@ EOF
else
echo pyramid-pyramid-bsd
fi
@@ -461,7 +460,7 @@
sun4*:SunOS:*:*)
case "`/usr/bin/arch -k`" in
Series*|S4*)
-@@ -202,12 +346,12 @@
+@@ -202,12 +346,12 @@ EOF
esac
# Japanese Language versions have a version number like `4.1.3-JL'.
echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
@@ -477,7 +476,7 @@
test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
case "`/bin/arch`" in
sun3)
-@@ -217,19 +361,13 @@
+@@ -217,19 +361,13 @@ EOF
echo sparc-sun-sunos${UNAME_RELEASE}
;;
esac
@@ -500,7 +499,7 @@
# > 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 @@
+@@ -237,61 +375,45 @@ EOF
# be no problem.
atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
@@ -578,7 +577,7 @@
int main (int argc, char *argv[]) {
#else
int main (argc, argv) int argc; char *argv[]; {
-@@ -310,28 +432,37 @@
+@@ -310,28 +432,37 @@ EOF
exit (-1);
}
EOF
@@ -626,7 +625,7 @@
then
if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
[ ${TARGET_BINARY_INTERFACE}x = x ]
-@@ -343,31 +474,40 @@
+@@ -343,31 +474,40 @@ EOF
else
echo i586-dg-dgux${UNAME_RELEASE}
fi
@@ -677,7 +676,7 @@
sed 's/^ //' << EOF >$dummy.c
#include <sys/systemcfg.h>
-@@ -379,18 +519,21 @@
+@@ -379,18 +519,21 @@ EOF
exit(0);
}
EOF
@@ -706,7 +705,7 @@
IBM_ARCH=rs6000
else
IBM_ARCH=powerpc
-@@ -398,37 +541,56 @@
+@@ -398,37 +541,56 @@ EOF
if [ -x /usr/bin/oslevel ] ; then
IBM_REV=`/usr/bin/oslevel`
else
@@ -774,7 +773,7 @@
#include <stdlib.h>
#include <unistd.h>
-@@ -459,13 +621,39 @@
+@@ -459,13 +621,39 @@ EOF
exit (0);
}
EOF
@@ -818,7 +817,7 @@
sed 's/^ //' << EOF >$dummy.c
#include <unistd.h>
int
-@@ -491,434 +679,475 @@
+@@ -491,434 +679,475 @@ EOF
exit (0);
}
EOF
@@ -1591,7 +1590,7 @@
*:SINIX-*:*:*)
if uname -p 2>/dev/null >/dev/null ; then
UNAME_MACHINE=`(uname -p) 2>/dev/null`
-@@ -926,62 +1155,155 @@
+@@ -926,62 +1155,155 @@ EOF
else
echo ns32k-sni-sysv
fi
@@ -1766,7 +1765,7 @@
cat >$dummy.c <<EOF
#ifdef _SEQUENT_
# include <sys/types.h>
-@@ -1007,7 +1329,7 @@
+@@ -1007,7 +1329,7 @@ main ()
#endif
#if defined (__arm) && defined (__acorn) && defined (__unix)
@@ -1775,7 +1774,7 @@
#endif
#if defined (hp300) && !defined (hpux)
-@@ -1068,11 +1390,24 @@
+@@ -1068,11 +1390,24 @@ main ()
#endif
#if defined (vax)
@@ -1805,7 +1804,7 @@
#endif
#if defined (alliant) && defined (i860)
-@@ -1083,12 +1418,12 @@
+@@ -1083,12 +1418,12 @@ main ()
}
EOF
@@ -1821,7 +1820,7 @@
# Convex versions that predate uname can use getsysinfo(1)
-@@ -1097,25 +1432,69 @@
+@@ -1097,25 +1432,69 @@ then
case `getsysinfo -f cpu_type` in
c1*)
echo c1-convex-bsd
@@ -1897,9 +1896,8 @@
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
-diff -urNad cyrus-imapd-2.2.13/config.h.in /tmp/dpep.48WUNC/cyrus-imapd-2.2.13/config.h.in
---- cyrus-imapd-2.2.13/config.h.in 2006-04-18 18:07:03.000000000 +0200
-+++ /tmp/dpep.48WUNC/cyrus-imapd-2.2.13/config.h.in 2007-02-24 20:51:40.440078654 +0100
+--- a/config.h.in
++++ b/config.h.in
@@ -85,6 +85,10 @@
/* Define to 1 if you have the `daemon' function. */
#undef HAVE_DAEMON
@@ -1950,7 +1948,7 @@
/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
`char[]'. */
#undef YYTEXT_POINTER
-@@ -496,7 +510,11 @@
+@@ -496,7 +510,11 @@ enum {
SQUAT_ENGINE = 1,
/* should we have long LMTP error messages? */
@@ -1963,9 +1961,8 @@
};
#endif /* _CYRUS_IMAPD_CONFIG_H_ */
-diff -urNad cyrus-imapd-2.2.13/config.sub /tmp/dpep.48WUNC/cyrus-imapd-2.2.13/config.sub
---- cyrus-imapd-2.2.13/config.sub 2006-10-10 17:24:32.000000000 +0200
-+++ /tmp/dpep.48WUNC/cyrus-imapd-2.2.13/config.sub 2007-02-24 20:51:40.442078456 +0100
+--- a/config.sub
++++ b/config.sub
@@ -1,6 +1,11 @@
#! /bin/sh
-# Configuration validation subroutine script, version 1.1.
@@ -2095,7 +2092,7 @@
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
-@@ -94,7 +148,7 @@
+@@ -94,7 +148,7 @@ case $os in
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
@@ -2104,7 +2101,7 @@
os=
basic_machine=$1
;;
-@@ -108,9 +162,21 @@
+@@ -108,9 +162,21 @@ case $os in
os=-vxworks
basic_machine=$1
;;
@@ -2126,7 +2123,7 @@
-sco5)
os=-sco3.2v5
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-@@ -127,6 +193,10 @@
+@@ -127,6 +193,10 @@ case $os in
# Don't forget version if it is 3.2v4 or newer.
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
@@ -2137,7 +2134,7 @@
-sco*)
os=-sco3.2v2
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-@@ -166,27 +236,74 @@
+@@ -166,27 +236,74 @@ esac
case $basic_machine in
# Recognize the basic CPU types without company name.
# Some are omitted here because they have special meanings below.
@@ -2226,7 +2223,7 @@
basic_machine=$basic_machine-pc
;;
# Object if more than one company name word.
-@@ -195,24 +312,66 @@
+@@ -195,24 +312,66 @@ case $basic_machine in
exit 1
;;
# Recognize the basic CPU types with company name.
@@ -2311,7 +2308,7 @@
;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
-@@ -230,6 +389,9 @@
+@@ -230,6 +389,9 @@ case $basic_machine in
basic_machine=a29k-amd
os=-udi
;;
@@ -2321,7 +2318,7 @@
adobe68k)
basic_machine=m68010-adobe
os=-scout
-@@ -244,19 +406,25 @@
+@@ -244,19 +406,25 @@ case $basic_machine in
basic_machine=a29k-none
os=-bsd
;;
@@ -2350,7 +2347,7 @@
os=-sysv4
;;
apollo68)
-@@ -275,6 +443,10 @@
+@@ -275,6 +443,10 @@ case $basic_machine in
basic_machine=ns32k-sequent
os=-dynix
;;
@@ -2361,7 +2358,7 @@
convex-c1)
basic_machine=c1-convex
os=-bsd
-@@ -295,27 +467,45 @@
+@@ -295,27 +467,45 @@ case $basic_machine in
basic_machine=c38-convex
os=-bsd
;;
@@ -2415,7 +2412,7 @@
delta | 3300 | motorola-3300 | motorola-delta \
| 3300-motorola | delta-motorola)
basic_machine=m68k-motorola
-@@ -324,6 +514,10 @@
+@@ -324,6 +514,10 @@ case $basic_machine in
basic_machine=m88k-motorola
os=-sysv3
;;
@@ -2426,7 +2423,7 @@
dpx20 | dpx20-*)
basic_machine=rs6000-bull
os=-bosx
-@@ -357,6 +551,10 @@
+@@ -357,6 +551,10 @@ case $basic_machine in
basic_machine=tron-gmicro
os=-sysv
;;
@@ -2437,7 +2434,7 @@
h3050r* | hiux*)
basic_machine=hppa1.1-hitachi
os=-hiuxwe2
-@@ -432,19 +630,19 @@
+@@ -432,19 +630,19 @@ case $basic_machine in
basic_machine=i370-ibm
;;
# I'm not sure what "Sysv32" means. Should this be sysv3.2?
@@ -2461,7 +2458,7 @@
basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
os=-solaris2
;;
-@@ -456,17 +654,6 @@
+@@ -456,17 +654,6 @@ case $basic_machine in
basic_machine=i386-unknown
os=-vsta
;;
@@ -2479,7 +2476,7 @@
iris | iris4d)
basic_machine=mips-sgi
case $os in
-@@ -492,6 +679,10 @@
+@@ -492,6 +679,10 @@ case $basic_machine in
basic_machine=ns32k-utek
os=-sysv
;;
@@ -2490,7 +2487,7 @@
miniframe)
basic_machine=m68000-convergent
;;
-@@ -499,14 +690,6 @@
+@@ -499,14 +690,6 @@ case $basic_machine in
basic_machine=m68k-atari
os=-mint
;;
@@ -2505,7 +2502,7 @@
mips3*-*)
basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
;;
-@@ -517,10 +700,17 @@
+@@ -517,10 +700,17 @@ case $basic_machine in
basic_machine=m68k-rom68k
os=-coff
;;
@@ -2524,7 +2521,7 @@
mvs)
basic_machine=i370-ibm
os=-mvs
-@@ -582,13 +772,27 @@
+@@ -582,13 +772,27 @@ case $basic_machine in
basic_machine=i960-intel
os=-mon960
;;
@@ -2552,7 +2549,7 @@
OSE68000 | ose68000)
basic_machine=m68000-ericsson
os=-ose
-@@ -611,45 +815,75 @@
+@@ -611,45 +815,75 @@ case $basic_machine in
pbb)
basic_machine=m68k-tti
;;
@@ -2587,12 +2584,12 @@
;;
- pentiumpro-* | p6-* | 6x86-*)
+ pentiumpro-* | p6-* | 6x86-* | athlon-*)
++ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
++ ;;
++ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
- pentiumii-* | pentium2-*)
-+ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-+ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-+ ;;
+ pentium4-*)
basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
;;
@@ -2638,7 +2635,7 @@
rom68k)
basic_machine=m68k-rom68k
os=-coff
-@@ -660,10 +894,30 @@
+@@ -660,10 +894,30 @@ case $basic_machine in
rtpc | rtpc-*)
basic_machine=romp-ibm
;;
@@ -2669,7 +2666,7 @@
sequent)
basic_machine=i386-sequent
;;
-@@ -671,7 +925,10 @@
+@@ -671,7 +925,10 @@ case $basic_machine in
basic_machine=sh-hitachi
os=-hms
;;
@@ -2681,7 +2678,7 @@
basic_machine=sparclite-wrs
os=-vxworks
;;
-@@ -729,23 +986,51 @@
+@@ -729,23 +986,51 @@ case $basic_machine in
sun386 | sun386i | roadrunner)
basic_machine=i386-sun
;;
@@ -2696,12 +2693,12 @@
t3e)
- basic_machine=t3e-cray
+ basic_machine=alphaev5-cray
++ os=-unicos
++ ;;
++ t90)
++ basic_machine=t90-cray
os=-unicos
;;
-+ t90)
-+ basic_machine=t90-cray
-+ os=-unicos
-+ ;;
+ tic54x | c54x*)
+ basic_machine=tic54x-unknown
+ os=-coff
@@ -2734,7 +2731,7 @@
udi29k)
basic_machine=a29k-amd
os=-udi
-@@ -767,8 +1052,8 @@
+@@ -767,8 +1052,8 @@ case $basic_machine in
os=-vms
;;
vpp*|vx|vx-*)
@@ -2745,7 +2742,7 @@
vxworks960)
basic_machine=i960-wrs
os=-vxworks
-@@ -789,13 +1074,17 @@
+@@ -789,13 +1074,17 @@ case $basic_machine in
basic_machine=hppa1.1-winbond
os=-proelf
;;
@@ -2767,7 +2764,7 @@
z8k-*-coff)
basic_machine=z8k-unknown
os=-sim
-@@ -816,32 +1105,35 @@
+@@ -816,32 +1105,35 @@ case $basic_machine in
op60c)
basic_machine=hppa1.1-oki
;;
@@ -2812,7 +2809,7 @@
basic_machine=cydra-cydrome
;;
orion)
-@@ -856,9 +1148,8 @@
+@@ -856,9 +1148,8 @@ case $basic_machine in
pmac | pmac-mpw)
basic_machine=powerpc-apple
;;
@@ -2824,7 +2821,7 @@
;;
*)
echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-@@ -912,22 +1203,49 @@
+@@ -912,22 +1203,49 @@ case $os in
| -aos* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
@@ -2880,7 +2877,7 @@
-linux*)
os=`echo $os | sed -e 's|linux|linux-gnu|'`
;;
-@@ -940,6 +1258,12 @@
+@@ -940,6 +1258,12 @@ case $os in
-opened*)
os=-openedition
;;
@@ -2893,7 +2890,7 @@
-osfrose*)
os=-osfrose
;;
-@@ -955,14 +1279,26 @@
+@@ -955,14 +1279,26 @@ case $os in
-acis*)
os=-aos
;;
@@ -2921,7 +2918,7 @@
;;
# Preserve the version number of sinix5.
-sinix5.*)
-@@ -971,15 +1307,15 @@
+@@ -971,15 +1307,15 @@ case $os in
-sinix*)
os=-sysv4
;;
@@ -2940,7 +2937,7 @@
-svr4)
os=-sysv4
;;
-@@ -1001,8 +1337,17 @@
+@@ -1001,8 +1337,17 @@ case $os in
-xenix)
os=-xenix
;;
@@ -2960,7 +2957,7 @@
;;
-none)
;;
-@@ -1026,6 +1371,12 @@
+@@ -1026,6 +1371,12 @@ else
# system, and we'll never get to this point.
case $basic_machine in
@@ -2973,7 +2970,7 @@
*-acorn)
os=-riscix1.2
;;
-@@ -1035,7 +1386,14 @@
+@@ -1035,7 +1386,14 @@ case $basic_machine in
arm*-semi)
os=-aout
;;
@@ -2989,7 +2986,7 @@
os=-none
;;
*-dec | vax-*)
-@@ -1062,6 +1420,9 @@
+@@ -1062,6 +1420,9 @@ case $basic_machine in
mips*-*)
os=-elf
;;
@@ -2999,7 +2996,7 @@
*-tti) # must be before sparc entry or we get the wrong os.
os=-sysv3
;;
-@@ -1071,9 +1432,15 @@
+@@ -1071,9 +1432,15 @@ case $basic_machine in
*-be)
os=-beos
;;
@@ -3015,7 +3012,7 @@
*-wec)
os=-proelf
;;
-@@ -1125,25 +1492,25 @@
+@@ -1125,25 +1492,25 @@ case $basic_machine in
*-next)
os=-nextstep3
;;
@@ -3046,7 +3043,7 @@
os=-uxpv
;;
*-rom68k)
-@@ -1206,10 +1573,16 @@
+@@ -1206,10 +1573,16 @@ case $basic_machine in
-mvs* | -opened*)
vendor=ibm
;;
@@ -3064,7 +3061,7 @@
vendor=wrs
;;
-aux*)
-@@ -1221,12 +1594,23 @@
+@@ -1221,12 +1594,23 @@ case $basic_machine in
-mpw* | -macos*)
vendor=apple
;;
@@ -3089,9 +3086,8 @@
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
-diff -urNad cyrus-imapd-2.2.13/configure /tmp/dpep.48WUNC/cyrus-imapd-2.2.13/configure
---- cyrus-imapd-2.2.13/configure 2006-04-18 18:07:03.000000000 +0200
-+++ /tmp/dpep.48WUNC/cyrus-imapd-2.2.13/configure 2007-02-24 20:51:40.485074190 +0100
+--- a/configure
++++ b/configure
@@ -1,25 +1,54 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -3153,7 +3149,7 @@
# Support unset when possible.
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-@@ -29,8 +58,43 @@
+@@ -29,8 +58,43 @@ else
fi
@@ -3198,7 +3194,7 @@
PS1='$ '
PS2='> '
PS4='+ '
-@@ -44,18 +108,19 @@
+@@ -44,18 +108,19 @@ do
if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
@@ -3221,7 +3217,7 @@
as_basename=basename
else
as_basename=false
-@@ -63,157 +128,388 @@
+@@ -63,157 +128,388 @@ fi
# Name of the executable.
@@ -3250,10 +3246,9 @@
+ q
+ }
+ s/.*/./; q'`
-+
+
+# CDPATH.
+$as_unset CDPATH
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
@@ -3262,12 +3257,6 @@
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-+if test "x$CONFIG_SHELL" = x; then
-+ if (eval ":") 2>/dev/null; then
-+ as_have_required=yes
-+else
-+ as_have_required=no
-+fi
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
@@ -3280,6 +3269,13 @@
- 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)
@@ -3708,7 +3704,7 @@
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
-@@ -222,7 +518,28 @@
+@@ -222,7 +518,28 @@ else
as_mkdir_p=false
fi
@@ -3738,7 +3734,7 @@
# 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 +548,27 @@
+@@ -231,39 +548,27 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -3781,7 +3777,7 @@
# Identity of this package.
PACKAGE_NAME=
PACKAGE_TARNAME=
-@@ -275,42 +580,180 @@
+@@ -275,42 +580,180 @@ ac_unique_file="imap/imapd.c"
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
@@ -3976,7 +3972,7 @@
# Initialize some variables set by options.
ac_init_help=
-@@ -337,34 +780,48 @@
+@@ -337,34 +780,48 @@ x_libraries=NONE
# and all the variables that are supposed to be based on exec_prefix
# by default will actually change.
# Use braces instead of parens because sh, perl, etc. also accept them.
@@ -4032,7 +4028,7 @@
-bindir | --bindir | --bindi | --bind | --bin | --bi)
ac_prev=bindir ;;
-@@ -386,33 +843,45 @@
+@@ -386,33 +843,45 @@ do
--config-cache | -C)
cache_file=config.cache ;;
@@ -4091,7 +4087,7 @@
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -439,6 +908,12 @@
+@@ -439,6 +908,12 @@ do
-host=* | --host=* | --hos=* | --ho=*)
host_alias=$ac_optarg ;;
@@ -4104,7 +4100,7 @@
-includedir | --includedir | --includedi | --included | --include \
| --includ | --inclu | --incl | --inc)
ac_prev=includedir ;;
-@@ -463,13 +938,16 @@
+@@ -463,13 +938,16 @@ do
| --libexe=* | --libex=* | --libe=*)
libexecdir=$ac_optarg ;;
@@ -4125,7 +4121,7 @@
localstatedir=$ac_optarg ;;
-mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-@@ -534,6 +1012,16 @@
+@@ -534,6 +1012,16 @@ do
| --progr-tra=* | --program-tr=* | --program-t=*)
program_transform_name=$ac_optarg ;;
@@ -4142,7 +4138,7 @@
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
-@@ -586,24 +1074,20 @@
+@@ -586,24 +1074,20 @@ do
-with-* | --with-*)
ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
@@ -4173,7 +4169,7 @@
--x)
# Obsolete; use --with-x.
-@@ -634,8 +1118,7 @@
+@@ -634,8 +1118,7 @@ Try \`$0 --help' for more information."
expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid variable name: $ac_envvar" >&2
{ (exit 1); exit 1; }; }
@@ -4183,15 +4179,21 @@
export $ac_envvar ;;
*)
-@@ -655,27 +1138,19 @@
+@@ -655,27 +1138,19 @@ if test -n "$ac_prev"; then
{ (exit 1); exit 1; }; }
fi
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
--do
++# 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`
-- case $ac_val in
++ eval ac_val=\$$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; }; };;
@@ -4201,15 +4203,9 @@
-# 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
+-do
- eval ac_val=$`echo $ac_var`
-+ eval ac_val=\$$ac_var
- case $ac_val in
+- case $ac_val in
- [\\/$]* | ?:[\\/]* ) ;;
- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; };;
@@ -4221,7 +4217,7 @@
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -702,74 +1177,76 @@
+@@ -702,75 +1177,77 @@ test -n "$host_alias" && ac_tool_prefix=
test "$silent" = yes && exec 6>/dev/null
@@ -4282,13 +4278,13 @@
-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; }; }
+- else
+- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+- { (exit 1); exit 1; }; }
- fi
fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
@@ -4330,6 +4326,7 @@
-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
@@ -4347,10 +4344,11 @@
+ 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 +1275,6 @@
+ #
+@@ -798,9 +1275,6 @@ Configuration:
-n, --no-create do not create output files
--srcdir=DIR find the sources in DIR [configure dir or \`..']
@@ -4360,7 +4358,7 @@
Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
[$ac_default_prefix]
-@@ -818,15 +1292,22 @@
+@@ -818,15 +1292,22 @@ Fine tuning of the installation director
--bindir=DIR user executables [EPREFIX/bin]
--sbindir=DIR system admin executables [EPREFIX/sbin]
--libexecdir=DIR program executables [EPREFIX/libexec]
@@ -4386,7 +4384,7 @@
_ACEOF
cat <<\_ACEOF
-@@ -844,6 +1325,7 @@
+@@ -844,6 +1325,7 @@ if test -n "$ac_init_help"; then
Optional Features:
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
@@ -4394,7 +4392,7 @@
--disable-sieve disable Sieve support
--enable-krb5afspts compile afskrb PTS module with krb5 support
--disable-server disable compiling servers
-@@ -899,126 +1381,100 @@
+@@ -899,126 +1381,100 @@ Some influential environment variables:
CFLAGS C compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
@@ -4575,7 +4573,7 @@
{
cat <<_ASUNAME
## --------- ##
-@@ -1037,7 +1493,7 @@
+@@ -1037,7 +1493,7 @@ uname -v = `(uname -v) 2>/dev/null || ec
/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`
@@ -4584,7 +4582,7 @@
/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 +1507,7 @@
+@@ -1051,6 +1507,7 @@ do
test -z "$as_dir" && as_dir=.
echo "PATH: $as_dir"
done
@@ -4592,7 +4590,7 @@
} >&5
-@@ -1072,7 +1529,6 @@
+@@ -1072,7 +1529,6 @@ _ACEOF
ac_configure_args=
ac_configure_args0=
ac_configure_args1=
@@ -4600,7 +4598,7 @@
ac_must_keep_next=false
for ac_pass in 1 2
do
-@@ -1083,7 +1539,7 @@
+@@ -1083,7 +1539,7 @@ do
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil)
continue ;;
@@ -4609,7 +4607,7 @@
ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
-@@ -1105,9 +1561,7 @@
+@@ -1105,9 +1561,7 @@ do
-* ) ac_must_keep_next=true ;;
esac
fi
@@ -4620,7 +4618,7 @@
;;
esac
done
-@@ -1118,8 +1572,8 @@
+@@ -1118,8 +1572,8 @@ $as_unset ac_configure_args1 || test "${
# 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.
@@ -4631,7 +4629,7 @@
trap 'exit_status=$?
# Save into config.log some information that might help in debugging.
{
-@@ -1132,20 +1586,34 @@
+@@ -1132,20 +1586,34 @@ trap 'exit_status=$?
_ASBOX
echo
# The following way of writing the cache mishandles newlines in values,
@@ -4676,7 +4674,7 @@
echo
cat <<\_ASBOX
-@@ -1156,22 +1624,28 @@
+@@ -1156,22 +1624,28 @@ _ASBOX
echo
for ac_var in $ac_subst_vars
do
@@ -4712,7 +4710,7 @@
done | sort
echo
fi
-@@ -1183,26 +1657,24 @@
+@@ -1183,26 +1657,24 @@ _ASBOX
## ----------- ##
_ASBOX
echo
@@ -4744,7 +4742,7 @@
# Predefined preprocessor variables.
-@@ -1233,14 +1705,17 @@
+@@ -1233,14 +1705,17 @@ _ACEOF
# Let the site file select an alternate cache file if it wants to.
# Prefer explicitly selected file to automatically selected ones.
@@ -4769,7 +4767,7 @@
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 +1731,8 @@
+@@ -1256,8 +1731,8 @@ if test -r "$cache_file"; then
{ echo "$as_me:$LINENO: loading cache $cache_file" >&5
echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
@@ -4780,7 +4778,7 @@
esac
fi
else
-@@ -1269,12 +1744,11 @@
+@@ -1269,12 +1744,11 @@ fi
# Check that the precious variables saved in the cache have kept the same
# value.
ac_cache_corrupted=false
@@ -4796,7 +4794,7 @@
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 +1773,7 @@
+@@ -1299,8 +1773,7 @@ echo "$as_me: current value: $ac_new_v
# Pass precious variables to config.status.
if test "$ac_new_set" = set; then
case $ac_new_val in
@@ -4806,7 +4804,7 @@
*) ac_arg=$ac_var=$ac_new_val ;;
esac
case " $ac_configure_args " in
-@@ -1317,12 +1790,6 @@
+@@ -1317,12 +1790,6 @@ echo "$as_me: error: run \`make distclea
{ (exit 1); exit 1; }; }
fi
@@ -4819,7 +4817,7 @@
-@@ -1339,106 +1806,154 @@
+@@ -1339,106 +1806,154 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -4994,12 +4992,12 @@
+ 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;
@@ -5020,7 +5018,7 @@
if test "${ac_cv_prog_MAKEDEPEND+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -1451,50 +1966,52 @@
+@@ -1451,50 +1966,52 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -5069,10 +5067,10 @@
{ (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"
@@ -5086,7 +5084,7 @@
cat >>confdefs.h <<_ACEOF
-@@ -1502,13 +2019,13 @@
+@@ -1502,13 +2019,13 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
@@ -5104,7 +5102,7 @@
cat >>confdefs.h <<_ACEOF
-@@ -1516,13 +2033,13 @@
+@@ -1516,13 +2033,13 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
@@ -5122,7 +5120,7 @@
cat >>confdefs.h <<_ACEOF
-@@ -1530,13 +2047,13 @@
+@@ -1530,13 +2047,13 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
@@ -5140,7 +5138,7 @@
if test $sysconfdir = '${prefix}/etc'; then
-@@ -1556,8 +2073,8 @@
+@@ -1556,8 +2073,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -5151,7 +5149,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -1570,32 +2087,34 @@
+@@ -1570,32 +2087,34 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -5193,7 +5191,7 @@
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -1608,36 +2127,51 @@
+@@ -1608,36 +2127,51 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -5255,7 +5253,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -1650,74 +2184,34 @@
+@@ -1650,74 +2184,34 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -5339,7 +5337,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -1731,7 +2225,7 @@
+@@ -1731,7 +2225,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -5348,7 +5346,7 @@
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
-@@ -1742,6 +2236,7 @@
+@@ -1742,6 +2236,7 @@ do
fi
done
done
@@ -5356,7 +5354,7 @@
if test $ac_prog_rejected = yes; then
# We found a bogon in the path, so make sure we never use it.
-@@ -1759,22 +2254,23 @@
+@@ -1759,22 +2254,23 @@ fi
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -5387,7 +5385,7 @@
if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -1787,36 +2283,38 @@
+@@ -1787,36 +2283,38 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -5434,7 +5432,7 @@
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -1829,29 +2327,45 @@
+@@ -1829,29 +2327,45 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -5486,7 +5484,7 @@
fi
fi
-@@ -1864,21 +2378,35 @@
+@@ -1864,21 +2378,35 @@ See \`config.log' for more details." >&2
{ (exit 1); exit 1; }; }
# Provide some information about the compiler.
@@ -5530,7 +5528,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-@@ -1903,47 +2431,77 @@
+@@ -1903,47 +2431,77 @@ ac_clean_files="$ac_clean_files a.out a.
# 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.
@@ -5630,7 +5628,7 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -1955,19 +2513,21 @@
+@@ -1955,19 +2513,21 @@ See \`config.log' for more details." >&2
fi
ac_exeext=$ac_cv_exeext
@@ -5659,7 +5657,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -1986,22 +2546,27 @@
+@@ -1986,22 +2546,27 @@ See \`config.log' for more details." >&2
fi
fi
fi
@@ -5677,15 +5675,16 @@
-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 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"
@@ -5698,7 +5697,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
-@@ -2012,9 +2577,8 @@
+@@ -2012,9 +2577,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l
for ac_file in conftest.exe conftest conftest.*; do
test -f "$ac_file" || continue
case $ac_file in
@@ -5709,7 +5708,7 @@
break;;
* ) break;;
esac
-@@ -2028,14 +2592,14 @@
+@@ -2028,14 +2592,14 @@ See \`config.log' for more details." >&2
fi
rm -f conftest$ac_cv_exeext
@@ -5728,7 +5727,7 @@
if test "${ac_cv_objext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2055,14 +2619,20 @@
+@@ -2055,14 +2619,20 @@ main ()
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -5753,7 +5752,7 @@
*) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
break;;
esac
-@@ -2080,12 +2650,12 @@
+@@ -2080,12 +2650,12 @@ fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
@@ -5770,7 +5769,7 @@
if test "${ac_cv_c_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2108,50 +2678,49 @@
+@@ -2108,50 +2678,49 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
@@ -5844,7 +5843,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -2167,38 +2736,118 @@
+@@ -2167,38 +2736,118 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
@@ -5960,26 +5959,26 @@
-ac_cv_prog_cc_g=no
+
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++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
-+
-+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 +2863,12 @@
+@@ -2214,12 +2863,12 @@ else
CFLAGS=
fi
fi
@@ -5996,7 +5995,7 @@
ac_save_CC=$CC
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -2253,12 +2902,17 @@
+@@ -2253,12 +2902,17 @@ static char *f (char * (*g) (char **, in
/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
function prototypes and stuff, but not '\xHH' hex character constants.
These don't provoke an error unfortunately, instead are silently treated
@@ -6016,7 +6015,7 @@
int test (int i, double x);
struct s1 {int (*f) (int a);};
struct s2 {int (*f) (double a);};
-@@ -2273,205 +2927,57 @@
+@@ -2273,254 +2927,108 @@ return f (e, argv, 0) != argv[0] || f
return 0;
}
_ACEOF
@@ -6242,28 +6241,53 @@
- 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 +2987,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
+-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
+-
+-if test -n "$ac_tool_prefix"; then
+- # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+-if test "${ac_cv_prog_RANLIB+set}" = set; then
+- echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+- if test -n "$RANLIB"; then
+- ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
++
++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
++
++if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
++set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
- if test "${ac_cv_prog_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-@@ -2495,32 +3001,34 @@
++if test "${ac_cv_prog_RANLIB+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$RANLIB"; then
++ ac_cv_prog_RANLIB="$RANLIB" # 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
@@ -6305,7 +6329,7 @@
if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -2533,57 +3041,72 @@
+@@ -2533,57 +3041,72 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6401,7 +6425,7 @@
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2600,8 +3123,8 @@
+@@ -2600,8 +3123,8 @@ fi
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
@@ -6412,7 +6436,7 @@
if test -z "$INSTALL"; then
if test "${ac_cv_path_install+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2623,7 +3146,7 @@
+@@ -2623,7 +3146,7 @@ case $as_dir/ in
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6421,7 +6445,7 @@
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 +3165,22 @@
+@@ -2642,21 +3165,22 @@ case $as_dir/ in
;;
esac
done
@@ -6449,7 +6473,7 @@
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
# It thinks the first close brace ends the variable substitution.
-@@ -2672,8 +3196,8 @@
+@@ -2672,8 +3196,8 @@ 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
@@ -6460,7 +6484,7 @@
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
-@@ -2707,24 +3231,22 @@
+@@ -2707,24 +3231,22 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
@@ -6496,7 +6520,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -2733,9 +3255,10 @@
+@@ -2733,9 +3255,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
continue
fi
@@ -6508,7 +6532,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -2745,24 +3268,22 @@
+@@ -2745,24 +3268,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -6544,7 +6568,7 @@
# Broken: success on invalid input.
continue
else
-@@ -2773,6 +3294,7 @@
+@@ -2773,6 +3294,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_preproc_ok=:
break
fi
@@ -6552,7 +6576,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -2790,8 +3312,8 @@
+@@ -2790,8 +3312,8 @@ fi
else
ac_cv_prog_CPP=$CPP
fi
@@ -6563,7 +6587,7 @@
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
-@@ -2814,24 +3336,22 @@
+@@ -2814,24 +3336,22 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
Syntax error
_ACEOF
@@ -6599,7 +6623,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -2840,9 +3360,10 @@
+@@ -2840,9 +3360,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
continue
fi
@@ -6611,7 +6635,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -2852,24 +3373,22 @@
+@@ -2852,24 +3373,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -6647,7 +6671,7 @@
# Broken: success on invalid input.
continue
else
-@@ -2880,6 +3399,7 @@
+@@ -2880,6 +3399,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_preproc_ok=:
break
fi
@@ -6655,7 +6679,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -2902,24 +3422,171 @@
+@@ -2902,24 +3422,171 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -6665,11 +6689,8 @@
+{ 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'
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
+ # 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
@@ -6708,7 +6729,7 @@
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_GREP="$ac_path_GREP"
+ ac_path_GREP_max=$ac_count
- fi
++ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
@@ -6724,24 +6745,19 @@
+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
-
++fi
++
+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
@@ -6761,8 +6777,11 @@
+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
+ 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'
+ 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
@@ -6795,7 +6814,7 @@
+ # 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
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test $ac_count -gt 10 && break
+ done
@@ -6826,19 +6845,24 @@
+
+
+ fi
-+fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+- EGREP=$ac_cv_prog_egrep
+{ 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
+{ 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 +3600,25 @@
+@@ -2933,26 +3600,25 @@ cat >>conftest.$ac_ext <<_ACEOF
_ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "yes" >/dev/null 2>&1; then
@@ -6871,7 +6895,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -2960,115 +3626,73 @@
+@@ -2960,115 +3626,73 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -7028,7 +7052,7 @@
fi
-@@ -3076,8 +3700,8 @@
+@@ -3076,8 +3700,8 @@ for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -7039,7 +7063,7 @@
if test "${ac_cv_prog_AWK+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3090,30 +3714,32 @@
+@@ -3090,30 +3714,32 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7079,7 +7103,7 @@
if test "${ac_cv_c_const+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3131,10 +3757,10 @@
+@@ -3131,10 +3757,10 @@ main ()
#ifndef __cplusplus
/* Ultrix mips cc rejects this. */
typedef int charset[2];
@@ -7093,7 +7117,7 @@
/* NEC SVR4.0.2 mips cc rejects this. */
struct point {int x, y;};
static struct point const zero = {0,0};
-@@ -3143,16 +3769,17 @@
+@@ -3143,16 +3769,17 @@ main ()
an arm of an if-expression whose if-part is not a constant
expression */
const char *g = "string";
@@ -7115,7 +7139,7 @@
}
{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
int x[] = {25, 17};
-@@ -3171,7 +3798,9 @@
+@@ -3171,7 +3798,9 @@ main ()
}
{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
const int foo = 10;
@@ -7125,7 +7149,7 @@
#endif
;
-@@ -3179,38 +3808,34 @@
+@@ -3179,38 +3808,34 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
@@ -7180,7 +7204,7 @@
if test $ac_cv_c_const = no; then
cat >>confdefs.h <<\_ACEOF
-@@ -3219,62 +3844,8 @@
+@@ -3219,62 +3844,8 @@ _ACEOF
fi
@@ -7245,7 +7269,7 @@
if test "${ac_cv_c_inline+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3294,39 +3865,37 @@
+@@ -3294,39 +3865,37 @@ $ac_kw foo_t foo () {return 0; }
_ACEOF
rm -f conftest.$ac_objext
@@ -7303,7 +7327,7 @@
case $ac_cv_c_inline in
-@@ -3345,157 +3914,8 @@
+@@ -3345,157 +3914,8 @@ _ACEOF
esac
@@ -7463,7 +7487,7 @@
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3519,35 +3939,31 @@
+@@ -3519,35 +3939,31 @@ main ()
}
_ACEOF
rm -f conftest.$ac_objext
@@ -7513,7 +7537,7 @@
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -3603,6 +4019,7 @@
+@@ -3603,6 +4019,7 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
@@ -7521,7 +7545,7 @@
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -3622,18 +4039,27 @@
+@@ -3622,18 +4039,27 @@ main ()
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
@@ -7555,7 +7579,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3646,12 +4072,14 @@
+@@ -3646,12 +4072,14 @@ sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
ac_cv_header_stdc=no
fi
@@ -7573,7 +7597,7 @@
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -3674,9 +4102,9 @@
+@@ -3674,9 +4102,9 @@ for ac_header in sys/types.h sys/stat.h
inttypes.h stdint.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -7586,7 +7610,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -3690,38 +4118,35 @@
+@@ -3690,38 +4118,35 @@ $ac_includes_default
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -7642,7 +7666,7 @@
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -3732,9 +4157,9 @@
+@@ -3732,9 +4157,9 @@ fi
done
@@ -7655,7 +7679,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -3744,61 +4169,57 @@
+@@ -3744,61 +4169,57 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -7744,7 +7768,7 @@
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
cat >conftest.$ac_ext <<_ACEOF
-@@ -3808,10 +4229,11 @@
+@@ -3808,10 +4229,11 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -7757,7 +7781,7 @@
test_array [0] = 0
;
-@@ -3819,27 +4241,22 @@
+@@ -3819,27 +4241,22 @@ test_array [0] = 0
}
_ACEOF
rm -f conftest.$ac_objext
@@ -7796,7 +7820,7 @@
ac_lo=0 ac_mid=0
while :; do
cat >conftest.$ac_ext <<_ACEOF
-@@ -3849,10 +4266,11 @@
+@@ -3849,10 +4266,11 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -7809,7 +7833,7 @@
test_array [0] = 0
;
-@@ -3860,56 +4278,154 @@
+@@ -3860,56 +4278,53 @@ test_array [0] = 0
}
_ACEOF
rm -f conftest.$ac_objext
@@ -7832,145 +7856,47 @@
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
-+ ac_hi=$ac_mid; break
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+ ac_hi=$ac_mid; break
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-ac_lo=`expr $ac_mid + 1`
+- if test $ac_lo -le $ac_mid; then
+- ac_lo= ac_hi=
+- break
+- fi
+- ac_mid=`expr 2 '*' $ac_mid + 1`
+ 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
+ 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
-+/* 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 int) (sizeof (ac__type_sizeof_))) < 0)];
-+test_array [0] = 0
-+
-+ ;
-+ 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 -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_hi=-1 ac_mid=-1
-+ while :; do
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+ typedef long long int ac__type_sizeof_;
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+test_array [0] = 0
-+
-+ ;
-+ 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); }; }; then
-- ac_hi=$ac_mid; break
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_lo=$ac_mid; break
+ done
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
--ac_lo=`expr $ac_mid + 1`
-- if test $ac_lo -le $ac_mid; then
-- ac_lo= ac_hi=
-- break
-- fi
-- ac_mid=`expr 2 '*' $ac_mid + 1`
-+ 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
-
-cat >conftest.$ac_ext <<_ACEOF
-+ ac_lo= ac_hi=
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+# Binary search between lo and hi bounds.
-+while test "x$ac_lo" != "x$ac_hi"; do
-+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-+ cat >conftest.$ac_ext <<_ACEOF
++ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -7982,11 +7908,11 @@
main ()
{
-static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
test_array [0] = 0
;
-@@ -3917,28 +4433,236 @@
+@@ -3917,27 +4332,22 @@ test_array [0] = 0
}
_ACEOF
rm -f conftest.$ac_objext
@@ -8009,246 +7935,36 @@
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
-+ ac_hi=$ac_mid
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_lo=`expr '(' $ac_mid ')' + 1`
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+done
-+case $ac_lo in
-+?*) ac_cv_sizeof_long_long_int=$ac_lo;;
-+'') 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)
-+See \`config.log' for more details." >&2;}
-+ { (exit 77); exit 77; }; }
-+ else
-+ ac_cv_sizeof_long_long_int=0
-+ fi ;;
-+esac
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+ 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
-+main ()
-+{
-+
-+ FILE *f = fopen ("conftest.val", "w");
-+ if (! f)
-+ return 1;
-+ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+ {
-+ long int i = longval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
-+ fprintf (f, "%ld\n", i);
-+ }
-+ else
-+ {
-+ unsigned long int i = ulongval ();
-+ if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+ return 1;
-+ fprintf (f, "%lu\n", i);
-+ }
-+ return ferror (f) || fclose (f) != 0;
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f 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>&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
-+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-+ { (case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$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_hi=-1 ac_mid=-1
-+ ac_cv_sizeof_long_long_int=`cat conftest.val`
-+else
-+ echo "$as_me: program exited with status $ac_status" >&5
-+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+( exit $ac_status )
-+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)
-+See \`config.log' for more details." >&2;}
-+ { (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
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long_int" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_long_long_int" >&6; }
-+
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_LONG_LONG_INT $ac_cv_sizeof_long_long_int
-+_ACEOF
-+
-+
-+{ echo "$as_me:$LINENO: checking for unsigned long long int" >&5
-+echo $ECHO_N "checking for unsigned long long int... $ECHO_C" >&6; }
-+if test "${ac_cv_type_unsigned_long_long_int+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+typedef unsigned long long int ac__type_new_;
-+int
-+main ()
-+{
-+if ((ac__type_new_ *) 0)
-+ return 0;
-+if (sizeof (ac__type_new_))
-+ return 0;
-+ ;
-+ 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); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_cv_type_unsigned_long_long_int=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_cv_type_unsigned_long_long_int=no
-+fi
-+
-+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; }
-+
-+# 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 "$cross_compiling" = yes; then
-+ # Depending upon the size, compute the lo and hi bounds.
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+ typedef unsigned long long int ac__type_sizeof_;
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+test_array [0] = 0
-+
-+ ;
-+ 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); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_lo=0 ac_mid=0
+ ac_hi=-1 ac_mid=-1
while :; do
cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -3947,10 +4671,11 @@
+@@ -3947,10 +4357,11 @@ 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_;
++ typedef long long int 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)];
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
test_array [0] = 0
;
-@@ -3958,50 +4683,139 @@
+@@ -3958,50 +4369,48 @@ test_array [0] = 0
}
_ACEOF
rm -f conftest.$ac_objext
@@ -8271,101 +7987,14 @@
- || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_hi=$ac_mid; break
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_lo=`expr $ac_mid + 1`
-+ if test $ac_lo -le $ac_mid; then
-+ ac_lo= ac_hi=
-+ break
-+ fi
-+ ac_mid=`expr 2 '*' $ac_mid + 1`
-+fi
-+
-+rm -f 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
-+/* 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 int) (sizeof (ac__type_sizeof_))) < 0)];
-+test_array [0] = 0
-+
-+ ;
-+ 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
+- 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
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest.$ac_objext; then
-+ ac_hi=-1 ac_mid=-1
-+ while :; do
-+ cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+$ac_includes_default
-+ typedef unsigned long long int ac__type_sizeof_;
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+test_array [0] = 0
-+
-+ ;
-+ 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
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
@@ -8410,11 +8039,11 @@
# 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`
-@@ -4012,10 +4826,11 @@
+@@ -4012,10 +4421,11 @@ 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_;
++ typedef long long int ac__type_sizeof_;
int
main ()
{
@@ -8423,7 +8052,7 @@
test_array [0] = 0
;
-@@ -4023,52 +4838,45 @@
+@@ -4023,52 +4433,45 @@ test_array [0] = 0
}
_ACEOF
rm -f conftest.$ac_objext
@@ -8474,17 +8103,17 @@
case $ac_lo in
-?*) ac_cv_sizeof_long=$ac_lo;;
-'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-+?*) ac_cv_sizeof_unsigned_long_long_int=$ac_lo;;
-+'') if test "$ac_cv_type_unsigned_long_long_int" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long long int)
++?*) ac_cv_sizeof_long_long_int=$ac_lo;;
++'') 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), 77
-+echo "$as_me: error: cannot compute sizeof (unsigned long long int)
++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_unsigned_long_long_int=0
++ ac_cv_sizeof_long_long_int=0
+ fi ;;
esac
else
@@ -8498,19 +8127,19 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -4076,8 +4884,9 @@
+@@ -4076,8 +4479,9 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
-long longval () { return (long) (sizeof (long)); }
-unsigned long ulongval () { return (long) (sizeof (long)); }
-+ typedef unsigned long long int ac__type_sizeof_;
++ 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
-@@ -4086,177 +4895,874 @@
+@@ -4086,177 +4490,1279 @@ main ()
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -8569,7 +8198,7 @@
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_sizeof_long=`cat conftest.val`
-+ ac_cv_sizeof_unsigned_long_long_int=`cat conftest.val`
++ ac_cv_sizeof_long_long_int=`cat conftest.val`
else
echo "$as_me: program exited with status $ac_status" >&5
echo "$as_me: failed program was:" >&5
@@ -8577,18 +8206,18 @@
( exit $ac_status )
-{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
-+if test "$ac_cv_type_unsigned_long_long_int" = yes; then
-+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long long int)
++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), 77
-+echo "$as_me: error: cannot compute sizeof (unsigned long long int)
++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_unsigned_long_long_int=0
++ 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
@@ -8596,37 +8225,492 @@
rm -f conftest.val
-else
- ac_cv_sizeof_long=0
+ fi
-fi
- fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long" >&6
-+{ 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
+-cat >>confdefs.h <<_ACEOF
-#define SIZEOF_LONG $ac_cv_sizeof_long
-+#define SIZEOF_UNSIGNED_LONG_LONG_INT $ac_cv_sizeof_unsigned_long_long_int
- _ACEOF
-
-
-+if test "$ac_cv_sizeof_long_long_int" -eq 8 -a \
-+ "$ac_cv_sizeof_unsigned_long_long_int" -eq 8; then
-
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_LONG_LONG_INT
+-_ACEOF
++{ 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
++
- # CMU GUESS RUNPATH SWITCH
- echo "$as_me:$LINENO: checking for runpath switch" >&5
-echo $ECHO_N "checking for runpath switch... $ECHO_C" >&6
-if test "${andrew_runpath_switch+set}" = set; then
++{ echo "$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
+-
+- # first, try -R
+- SAVE_LDFLAGS="${LDFLAGS}"
+- LDFLAGS="-R /usr/lib"
+- 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_new_;
+ int
+ main ()
+ {
+-
++if ((ac__type_new_ *) 0)
++ return 0;
++if (sizeof (ac__type_new_))
++ return 0;
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>conftest.er1
++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'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- andrew_runpath_switch="-R"
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_cv_type_unsigned_long_long_int=yes
+ else
+ echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+
++ ac_cv_type_unsigned_long_long_int=no
++fi
+
+- LDFLAGS="-Wl,-rpath,/usr/lib"
+- cat >conftest.$ac_ext <<_ACEOF
++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; }
++
++# 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 "$cross_compiling" = yes; then
++ # Depending upon the size, compute the lo and hi bounds.
++cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h. */
+-
++$ac_includes_default
++ typedef unsigned long long int ac__type_sizeof_;
+ int
+ main ()
+ {
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
++test_array [0] = 0
+
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+- (eval $ac_link) 2>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
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } &&
+- { ac_try='test -z "$ac_c_werror_flag"
+- || test ! -s conftest.err'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; } &&
+- { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+- (eval $ac_try) 2>&5
+- ac_status=$?
+- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; }; then
+- andrew_runpath_switch="-Wl,-rpath,"
+-else
+- echo "$as_me: failed program was:" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_lo=0 ac_mid=0
++ while :; do
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++ typedef unsigned long long int ac__type_sizeof_;
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
++test_array [0] = 0
++
++ ;
++ 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); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_hi=$ac_mid; break
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_lo=`expr $ac_mid + 1`
++ if test $ac_lo -le $ac_mid; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid + 1`
++fi
++
++rm -f 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
++/* 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 int) (sizeof (ac__type_sizeof_))) < 0)];
++test_array [0] = 0
++
++ ;
++ 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); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_hi=-1 ac_mid=-1
++ while :; do
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++ typedef unsigned long long int ac__type_sizeof_;
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
++test_array [0] = 0
++
++ ;
++ 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); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_lo=$ac_mid; break
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_hi=`expr '(' $ac_mid ')' - 1`
++ if test $ac_mid -le $ac_hi; then
++ ac_lo= ac_hi=
++ break
++ fi
++ ac_mid=`expr 2 '*' $ac_mid`
++fi
++
++rm -f 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=
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++# Binary search between lo and hi bounds.
++while test "x$ac_lo" != "x$ac_hi"; do
++ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++ typedef unsigned long long int ac__type_sizeof_;
++int
++main ()
++{
++static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
++test_array [0] = 0
++
++ ;
++ 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); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest.$ac_objext; then
++ ac_hi=$ac_mid
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ ac_lo=`expr '(' $ac_mid ')' + 1`
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++done
++case $ac_lo in
++?*) ac_cv_sizeof_unsigned_long_long_int=$ac_lo;;
++'') 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)
++See \`config.log' for more details." >&2;}
++ { (exit 77); exit 77; }; }
++ else
++ ac_cv_sizeof_unsigned_long_long_int=0
++ fi ;;
++esac
++else
++ cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++$ac_includes_default
++ 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
++main ()
++{
++
++ FILE *f = fopen ("conftest.val", "w");
++ if (! f)
++ return 1;
++ if (((long int) (sizeof (ac__type_sizeof_))) < 0)
++ {
++ long int i = longval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
++ fprintf (f, "%ld\n", i);
++ }
++ else
++ {
++ unsigned long int i = ulongval ();
++ if (i != ((long int) (sizeof (ac__type_sizeof_))))
++ return 1;
++ fprintf (f, "%lu\n", i);
++ }
++ return ferror (f) || fclose (f) != 0;
++
++ ;
++ return 0;
++}
++_ACEOF
++rm -f 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>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
++ { (case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$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_sizeof_unsigned_long_long_int=`cat conftest.val`
++else
++ echo "$as_me: program exited with status $ac_status" >&5
++echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++( exit $ac_status )
++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)
++See \`config.log' for more details." >&2;}
++ { (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
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long_long_int" >&5
++echo "${ECHO_T}$ac_cv_sizeof_unsigned_long_long_int" >&6; }
++
++
++
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_UNSIGNED_LONG_LONG_INT $ac_cv_sizeof_unsigned_long_long_int
++_ACEOF
++
++
++if test "$ac_cv_sizeof_long_long_int" -eq 8 -a \
++ "$ac_cv_sizeof_unsigned_long_long_int" -eq 8; then
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_LONG_LONG_INT
++_ACEOF
++
+ { echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
+echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; }
+if test "${ac_cv_c_bigendian+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
+ # See if sys/param.h defines the BYTE_ORDER macro.
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
@@ -8636,11 +8720,7 @@
+/* end confdefs.h. */
+#include <sys/types.h>
+#include <sys/param.h>
-
-- # first, try -R
-- SAVE_LDFLAGS="${LDFLAGS}"
-- LDFLAGS="-R /usr/lib"
-- cat >conftest.$ac_ext <<_ACEOF
++
+int
+main ()
+{
@@ -8672,28 +8752,25 @@
+ } && test -s conftest.$ac_objext; then
+ # It does; now see whether it defined to BIG_ENDIAN or not.
+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
+#include <sys/types.h>
+#include <sys/param.h>
-
- int
- main ()
- {
++
++int
++main ()
++{
+#if BYTE_ORDER != BIG_ENDIAN
+ not big endian
+#endif
-
- ;
- 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
++
++ ;
++ return 0;
++}
++_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
@@ -8702,16 +8779,11 @@
+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_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
@@ -8761,15 +8833,11 @@
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
++ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
@@ -8835,10 +8903,9 @@
+esac
+eval "echo \"\$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
-- andrew_runpath_switch="-R"
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; }; then
+ ac_cv_c_bigendian=no
+else
+ echo "$as_me: program exited with status $ac_status" >&5
@@ -8927,15 +8994,13 @@
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv___attribute__=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_cv___attribute__=no
+fi
-
-- LDFLAGS="-Wl,-rpath,/usr/lib"
-- cat >conftest.$ac_ext <<_ACEOF
++
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+
@@ -8959,31 +9024,28 @@
+save_CFLAGS=$CFLAGS
+CFLAGS="${CFLAGS} -fPIC"
+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h. */
-
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
+#include <stdlib.h>
+
- int
- main ()
- {
-
++int
++main ()
++{
++
+static void
+foo(void)
+{
+ exit(1);
+}
+
- ;
- 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
++ ;
++ return 0;
++}
++_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
@@ -8992,16 +9054,11 @@
+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_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
@@ -9060,15 +9117,11 @@
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
++ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
@@ -9160,33 +9213,28 @@
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
- ac_status=$?
++ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- andrew_runpath_switch="-Wl,-rpath,"
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_hi=$ac_mid; break
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
--andrew_runpath_switch="none"
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
+ ac_lo=`expr $ac_mid + 1`
+ if test $ac_lo -le $ac_mid; then
+ ac_lo= ac_hi=
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid + 1`
- fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
-
++fi
++
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
@@ -9276,11 +9324,8 @@
+ break
+ fi
+ ac_mid=`expr 2 '*' $ac_mid`
- fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
-- LDFLAGS="${SAVE_LDFLAGS}"
-
++fi
++
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ done
+else
@@ -9288,9 +9333,7 @@
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_lo= ac_hi=
- fi
--echo "$as_me:$LINENO: result: $andrew_runpath_switch" >&5
--echo "${ECHO_T}$andrew_runpath_switch" >&6
++fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
@@ -9420,8 +9463,9 @@
+else
+ echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+ sed 's/^/| /' conftest.$ac_ext >&5
+
+-andrew_runpath_switch="none"
+( exit $ac_status )
+if test "$ac_cv_type_long" = yes; then
+ { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
@@ -9432,11 +9476,20 @@
+ else
+ ac_cv_sizeof_long=0
+ fi
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext \
+- conftest$ac_exeext 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_exeext conftest.$ac_ext
+- LDFLAGS="${SAVE_LDFLAGS}"
+-
+rm -f conftest.val
-+fi
+ fi
+-echo "$as_me:$LINENO: result: $andrew_runpath_switch" >&5
+-echo "${ECHO_T}$andrew_runpath_switch" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
+echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
+
@@ -9455,7 +9508,7 @@
-@@ -4265,18 +5771,19 @@
+@@ -4265,18 +5771,19 @@ echo "${ECHO_T}$andrew_runpath_switch" >
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`
@@ -9483,7 +9536,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -4287,41 +5794,37 @@
+@@ -4287,41 +5794,37 @@ $ac_includes_default
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -9543,7 +9596,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -4330,24 +5833,22 @@
+@@ -4330,24 +5833,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -9579,7 +9632,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -4355,9 +5856,10 @@
+@@ -4355,9 +5856,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
@@ -9592,7 +9645,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -4381,25 +5883,19 @@
+@@ -4381,25 +5883,19 @@ echo "$as_me: WARNING: $ac_header: s
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;}
@@ -9625,7 +9678,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -4418,9 +5914,9 @@
+@@ -4418,9 +5914,9 @@ done
for ac_func in memmove strcasecmp ftruncate strerror
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -9638,7 +9691,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -4446,80 +5942,70 @@
+@@ -4446,80 +5942,70 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef $ac_func
@@ -9745,7 +9798,7 @@
esac
fi
-@@ -4531,9 +6017,9 @@
+@@ -4531,9 +6017,9 @@ done
for ac_func in strlcat strlcpy
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -9758,7 +9811,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -4559,68 +6045,60 @@
+@@ -4559,68 +6045,60 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef $ac_func
@@ -9850,7 +9903,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -4637,9 +6115,9 @@
+@@ -4637,9 +6115,9 @@ done
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`
@@ -9863,7 +9916,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -4661,38 +6139,35 @@
+@@ -4661,38 +6139,35 @@ return 0;
}
_ACEOF
rm -f conftest.$ac_objext
@@ -9919,7 +9972,7 @@
if test `eval echo '${'$as_ac_Header'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-@@ -4704,13 +6179,12 @@
+@@ -4704,13 +6179,12 @@ fi
done
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
@@ -9935,7 +9988,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -4718,126 +6192,83 @@
+@@ -4718,126 +6192,83 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -10105,7 +10158,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -4845,115 +6276,73 @@
+@@ -4845,115 +6276,73 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -10262,7 +10315,7 @@
fi
-@@ -4963,8 +6352,8 @@
+@@ -4963,8 +6352,8 @@ fi
save_LIBS="$LIBS"
LIB_SOCKET=""
@@ -10273,7 +10326,7 @@
if test "${ac_cv_func_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -4991,73 +6380,64 @@
+@@ -4991,73 +6380,64 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef connect
@@ -10371,7 +10424,7 @@
if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5070,62 +6450,59 @@
+@@ -5070,62 +6450,59 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -10457,7 +10510,7 @@
if test "${ac_cv_lib_socket_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5138,56 +6515,53 @@
+@@ -5138,56 +6515,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -10535,7 +10588,7 @@
if test $ac_cv_lib_socket_connect = yes; then
LIB_SOCKET="-lsocket $LIB_SOCKET"
fi
-@@ -5196,8 +6570,8 @@
+@@ -5196,8 +6570,8 @@ fi
fi
LIBS="$LIB_SOCKET $save_LIBS"
@@ -10546,7 +10599,7 @@
if test "${ac_cv_func_res_search+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5224,68 +6598,59 @@
+@@ -5224,68 +6598,59 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef res_search
@@ -10637,7 +10690,7 @@
if test $ac_cv_func_res_search = yes; then
:
else
-@@ -5318,34 +6683,32 @@
+@@ -5318,34 +6683,32 @@ return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10687,7 +10740,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
-@@ -5356,9 +6719,9 @@
+@@ -5356,9 +6719,9 @@ fi
for ac_func in dn_expand dns_lookup
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -10700,7 +10753,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -5384,68 +6747,60 @@
+@@ -5384,68 +6747,60 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef $ac_func
@@ -10792,7 +10845,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -5461,8 +6816,8 @@
+@@ -5461,8 +6816,8 @@ LIBS="$LIBS ${LIB_SOCKET}"
cyrus_cv_getaddrinfo=yes
@@ -10803,7 +10856,7 @@
if test "${ac_cv_func_getaddrinfo+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5489,75 +6844,66 @@
+@@ -5489,75 +6844,66 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef getaddrinfo
@@ -10903,7 +10956,7 @@
if test "${ac_cv_lib_socket_getaddrinfo+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5570,63 +6916,60 @@
+@@ -5570,63 +6916,60 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -10990,7 +11043,7 @@
if test "${ipv6_cv_dir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5636,8 +6979,8 @@
+@@ -5636,8 +6979,8 @@ else
fi
done
fi
@@ -11001,7 +11054,7 @@
if test $ipv6_cv_dir = no; then
ac_cv_lib_inet6_getaddrinfo=no
else
-@@ -5646,8 +6989,8 @@
+@@ -5646,8 +6989,8 @@ echo "${ECHO_T}$ipv6_cv_dir" >&6
SAVELDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
fi
@@ -11012,7 +11065,7 @@
if test "${ac_cv_lib_inet6_getaddrinfo+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5660,56 +7003,53 @@
+@@ -5660,56 +7003,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -11090,7 +11143,7 @@
if test $ac_cv_lib_inet6_getaddrinfo = yes; then
if test $ipv6_libinet6 = no; then
ipv6_libinet6=yes
-@@ -5744,9 +7084,9 @@
+@@ -5744,9 +7084,9 @@ _ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "${ipv6_cv_pfx}getaddrinfo" >/dev/null 2>&1; then
as_ac_var=`echo "ac_cv_func_${ipv6_cv_pfx}getaddrinfo" | $as_tr_sh`
@@ -11103,7 +11156,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -5772,68 +7112,60 @@
+@@ -5772,68 +7112,60 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef ${ipv6_cv_pfx}getaddrinfo
@@ -11195,7 +11248,7 @@
fi
rm -f conftest*
-@@ -5852,8 +7184,8 @@
+@@ -5852,8 +7184,8 @@ _ACEOF
fi
if test $ipv6_cv_getaddrinfo = yes; then
@@ -11206,7 +11259,7 @@
if test "${ac_cv_func_gai_strerror+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5880,75 +7212,66 @@
+@@ -5880,75 +7212,66 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef gai_strerror
@@ -11306,7 +11359,7 @@
if test "${ac_cv_lib_socket_gai_strerror+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5961,63 +7284,60 @@
+@@ -5961,63 +7284,60 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -11393,7 +11446,7 @@
if test "${ipv6_cv_dir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -6027,8 +7347,8 @@
+@@ -6027,8 +7347,8 @@ else
fi
done
fi
@@ -11404,7 +11457,7 @@
if test $ipv6_cv_dir = no; then
ac_cv_lib_inet6_gai_strerror=no
else
-@@ -6037,8 +7357,8 @@
+@@ -6037,8 +7357,8 @@ echo "${ECHO_T}$ipv6_cv_dir" >&6
SAVELDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
fi
@@ -11415,7 +11468,7 @@
if test "${ac_cv_lib_inet6_gai_strerror+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -6051,56 +7371,53 @@
+@@ -6051,56 +7371,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -11493,7 +11546,7 @@
if test $ac_cv_lib_inet6_gai_strerror = yes; then
if test $ipv6_libinet6 = no; then
ipv6_libinet6=yes
-@@ -6135,9 +7452,9 @@
+@@ -6135,9 +7452,9 @@ _ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "${ipv6_cv_pfx}gai_strerror" >/dev/null 2>&1; then
as_ac_var=`echo "ac_cv_func_${ipv6_cv_pfx}gai_strerror" | $as_tr_sh`
@@ -11506,7 +11559,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -6163,68 +7480,60 @@
+@@ -6163,68 +7480,60 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef ${ipv6_cv_pfx}gai_strerror
@@ -11598,7 +11651,7 @@
fi
rm -f conftest*
-@@ -6260,8 +7569,8 @@
+@@ -6260,8 +7569,8 @@ fi
cyrus_cv_getnameinfo=yes
@@ -11609,7 +11662,7 @@
if test "${ac_cv_func_getnameinfo+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -6288,75 +7597,66 @@
+@@ -6288,75 +7597,66 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef getnameinfo
@@ -11709,7 +11762,7 @@
if test "${ac_cv_lib_socket_getnameinfo+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -6369,63 +7669,60 @@
+@@ -6369,63 +7669,60 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -11796,7 +11849,7 @@
if test "${ipv6_cv_dir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -6435,8 +7732,8 @@
+@@ -6435,8 +7732,8 @@ else
fi
done
fi
@@ -11807,7 +11860,7 @@
if test $ipv6_cv_dir = no; then
ac_cv_lib_inet6_getnameinfo=no
else
-@@ -6445,8 +7742,8 @@
+@@ -6445,8 +7742,8 @@ echo "${ECHO_T}$ipv6_cv_dir" >&6
SAVELDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
fi
@@ -11818,7 +11871,7 @@
if test "${ac_cv_lib_inet6_getnameinfo+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -6459,56 +7756,53 @@
+@@ -6459,56 +7756,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -11896,7 +11949,7 @@
if test $ac_cv_lib_inet6_getnameinfo = yes; then
if test $ipv6_libinet6 = no; then
ipv6_libinet6=yes
-@@ -6543,9 +7837,9 @@
+@@ -6543,9 +7837,9 @@ _ACEOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
$EGREP "${ipv6_cv_pfx}getnameinfo" >/dev/null 2>&1; then
as_ac_var=`echo "ac_cv_func_${ipv6_cv_pfx}getnameinfo" | $as_tr_sh`
@@ -11909,7 +11962,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -6571,68 +7865,60 @@
+@@ -6571,68 +7865,60 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef ${ipv6_cv_pfx}getnameinfo
@@ -12001,7 +12054,7 @@
fi
rm -f conftest*
-@@ -6664,8 +7950,8 @@
+@@ -6664,8 +7950,8 @@ if test $cyrus_cv_getnameinfo = no; then
fi
@@ -12012,7 +12065,7 @@
if test "${ipv6_cv_ss_family+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -6686,35 +7972,31 @@
+@@ -6686,35 +7972,31 @@ struct sockaddr_storage ss; int i = ss.s
}
_ACEOF
rm -f conftest.$ac_objext
@@ -12062,7 +12115,7 @@
fi
if test $ipv6_cv_ss_family = yes; then
-@@ -6725,11 +8007,11 @@
+@@ -6725,11 +8007,11 @@ _ACEOF
else
:
fi
@@ -12078,7 +12131,7 @@
if test "${ipv6_cv_sa_len+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -6750,35 +8032,31 @@
+@@ -6750,35 +8032,31 @@ struct sockaddr sa; int i = sa.sa_len;
}
_ACEOF
rm -f conftest.$ac_objext
@@ -12128,7 +12181,7 @@
fi
if test $ipv6_cv_sa_len = yes; then
-@@ -6789,8 +8067,8 @@
+@@ -6789,8 +8067,8 @@ _ACEOF
else
:
fi
@@ -12139,7 +12192,7 @@
-@@ -6798,18 +8076,19 @@
+@@ -6798,18 +8076,19 @@ echo "${ECHO_T}$ipv6_cv_sa_len" >&6
for ac_header in sys/time.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12167,7 +12220,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -6820,41 +8099,37 @@
+@@ -6820,41 +8099,37 @@ $ac_includes_default
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -12227,7 +12280,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -6863,24 +8138,22 @@
+@@ -6863,24 +8138,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -12263,7 +12316,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -6888,9 +8161,10 @@
+@@ -6888,9 +8161,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
@@ -12276,7 +12329,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -6914,25 +8188,19 @@
+@@ -6914,25 +8188,19 @@ echo "$as_me: WARNING: $ac_header: s
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;}
@@ -12309,7 +12362,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -6944,8 +8212,8 @@
+@@ -6944,8 +8212,8 @@ fi
done
@@ -12320,7 +12373,7 @@
if test "${ac_cv_header_time+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -6969,38 +8237,34 @@
+@@ -6969,38 +8237,34 @@ return 0;
}
_ACEOF
rm -f conftest.$ac_objext
@@ -12375,7 +12428,7 @@
if test $ac_cv_header_time = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -7009,8 +8273,8 @@
+@@ -7009,8 +8273,8 @@ _ACEOF
fi
@@ -12386,7 +12439,7 @@
if test "${ac_cv_struct_tm+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7026,44 +8290,42 @@
+@@ -7026,44 +8290,42 @@ cat >>conftest.$ac_ext <<_ACEOF
int
main ()
{
@@ -12450,7 +12503,7 @@
if test $ac_cv_struct_tm = sys/time.h; then
cat >>confdefs.h <<\_ACEOF
-@@ -7072,8 +8334,8 @@
+@@ -7072,8 +8334,8 @@ _ACEOF
fi
@@ -12461,7 +12514,7 @@
if test "${ac_cv_member_struct_tm_tm_zone+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7098,33 +8360,28 @@
+@@ -7098,33 +8360,28 @@ return 0;
}
_ACEOF
rm -f conftest.$ac_objext
@@ -12507,7 +12560,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -7145,40 +8402,37 @@
+@@ -7145,40 +8402,37 @@ return 0;
}
_ACEOF
rm -f conftest.$ac_objext
@@ -12566,7 +12619,7 @@
if test $ac_cv_member_struct_tm_tm_zone = yes; then
cat >>confdefs.h <<_ACEOF
-@@ -7195,8 +8449,77 @@
+@@ -7195,8 +8449,77 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
else
@@ -12646,7 +12699,7 @@
if test "${ac_cv_var_tzname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7207,52 +8530,49 @@
+@@ -7207,52 +8530,49 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <time.h>
@@ -12719,7 +12772,7 @@
if test $ac_cv_var_tzname = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -7272,9 +8592,9 @@
+@@ -7272,9 +8592,9 @@ fi
for ac_func in vprintf
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -12732,7 +12785,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -7300,75 +8620,67 @@
+@@ -7300,75 +8620,67 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef $ac_func
@@ -12833,7 +12886,7 @@
if test "${ac_cv_func__doprnt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7395,68 +8707,59 @@
+@@ -7395,68 +8707,59 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef _doprnt
@@ -12924,7 +12977,7 @@
if test $ac_cv_func__doprnt = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -7475,20 +8778,20 @@
+@@ -7475,20 +8778,20 @@ CYRUSDB_OBJS="cyrusdb_flat.o cyrusdb_ski
@@ -12938,10 +12991,10 @@
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"
@@ -12953,7 +13006,7 @@
case "$with_bdb" in
no)
-@@ -7510,21 +8813,21 @@
+@@ -7510,21 +8813,21 @@ esac
if test "$use_berkeley" != "no"; then
@@ -12967,9 +13020,9 @@
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"
@@ -12983,7 +13036,7 @@
-@@ -7539,17 +8842,17 @@
+@@ -7539,17 +8842,17 @@ fi;
fi
if test "${ac_cv_header_db_h+set}" = set; then
@@ -13007,7 +13060,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -7560,41 +8863,37 @@
+@@ -7560,41 +8863,37 @@ $ac_includes_default
#include <db.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -13067,7 +13120,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -7603,24 +8902,22 @@
+@@ -7603,24 +8902,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <db.h>
_ACEOF
@@ -13103,7 +13156,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -7628,9 +8925,10 @@
+@@ -7628,9 +8925,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
@@ -13116,7 +13169,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -7654,25 +8952,18 @@
+@@ -7654,25 +8952,18 @@ echo "$as_me: WARNING: db.h: section
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;}
@@ -13147,7 +13200,7 @@
fi
if test $ac_cv_header_db_h = yes; then
-@@ -7720,35 +9011,32 @@
+@@ -7720,35 +9011,32 @@ db_create(NULL, NULL, 0);
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -13198,7 +13251,7 @@
conftest$ac_exeext conftest.$ac_ext
if test "$dblib" = "berkeley"; then break; fi
done
-@@ -7770,35 +9058,32 @@
+@@ -7770,35 +9058,32 @@ db_open(NULL, 0, 0, 0, NULL, NULL, NULL)
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -13249,7 +13302,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
LIBS=$saved_LIBS
-@@ -7854,13 +9139,13 @@
+@@ -7854,13 +9139,13 @@ fi
SIEVE_SUBDIRS=""
sievedir="sieve"
@@ -13267,7 +13320,7 @@
if test "$sievedir" != "no"; then
SIEVE_OBJS="lmtp_sieve.o smtpclient.o"
-@@ -7879,8 +9164,8 @@
+@@ -7879,8 +9164,8 @@ _ACEOF
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -13278,7 +13331,7 @@
if test "${ac_cv_prog_YACC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7893,25 +9178,27 @@
+@@ -7893,25 +9178,27 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13311,7 +13364,7 @@
test -n "$YACC" && break
done
test -n "$YACC" || YACC="yacc"
-@@ -7920,8 +9207,8 @@
+@@ -7920,8 +9207,8 @@ test -n "$YACC" || YACC="yacc"
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -13322,7 +13375,7 @@
if test "${ac_cv_prog_LEX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7934,253 +9221,182 @@
+@@ -7934,253 +9221,182 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13676,7 +13729,7 @@
if test $ac_cv_prog_lex_yytext_pointer = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -8188,11 +9404,12 @@
+@@ -8188,11 +9404,12 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
fi
@@ -13691,7 +13744,7 @@
if test "${ac_cv_lib_fl_main+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8209,46 +9426,43 @@
+@@ -8209,46 +9426,43 @@ cat >>conftest.$ac_ext <<_ACEOF
int
main ()
{
@@ -13756,7 +13809,7 @@
if test $ac_cv_lib_fl_main = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBFL 1
-@@ -8259,13 +9473,12 @@
+@@ -8259,13 +9473,12 @@ _ACEOF
fi
@@ -13772,7 +13825,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8273,115 +9486,73 @@
+@@ -8273,115 +9486,73 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -13929,7 +13982,7 @@
cat >>confdefs.h <<\_ACEOF
-@@ -8389,17 +9560,17 @@
+@@ -8389,17 +9560,17 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
if test "${ac_cv_header_rxposix_h+set}" = set; then
@@ -13953,7 +14006,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8410,41 +9581,37 @@
+@@ -8410,41 +9581,37 @@ $ac_includes_default
#include <rxposix.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -14013,7 +14066,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8453,24 +9620,22 @@
+@@ -8453,24 +9620,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <rxposix.h>
_ACEOF
@@ -14049,7 +14102,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -8478,9 +9643,10 @@
+@@ -8478,9 +9643,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
@@ -14062,7 +14115,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8504,25 +9670,18 @@
+@@ -8504,25 +9670,18 @@ echo "$as_me: WARNING: rxposix.h: se
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;}
@@ -14093,7 +14146,7 @@
fi
if test $ac_cv_header_rxposix_h = yes; then
-@@ -8544,8 +9703,8 @@
+@@ -8544,8 +9703,8 @@ fi
@@ -14104,7 +14157,7 @@
if test "${ac_cv_func_strerror+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8572,68 +9731,59 @@
+@@ -8572,68 +9731,59 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef strerror
@@ -14121,15 +14174,17 @@
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. */
+- 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
+-choke me
-#else
-char (*f) () = strerror;
-#endif
-#ifdef __cplusplus
-}
++ something starting with __ and the normal name is an alias. */
++#if defined __stub_strerror || defined __stub___strerror
++choke me
#endif
int
@@ -14195,7 +14250,7 @@
if test $ac_cv_func_strerror = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -8653,18 +9803,19 @@
+@@ -8653,18 +9803,19 @@ fi
for ac_header in sys/resource.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -14223,7 +14278,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8675,41 +9826,37 @@
+@@ -8675,41 +9826,37 @@ $ac_includes_default
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -14283,7 +14338,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -8718,24 +9865,22 @@
+@@ -8718,24 +9865,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -14319,7 +14374,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -8743,9 +9888,10 @@
+@@ -8743,9 +9888,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
@@ -14332,7 +14387,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8769,25 +9915,19 @@
+@@ -8769,25 +9915,19 @@ echo "$as_me: WARNING: $ac_header: s
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;}
@@ -14365,7 +14420,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -8803,9 +9943,9 @@
+@@ -8803,9 +9943,9 @@ done
for ac_func in setrlimit
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -14378,7 +14433,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -8831,68 +9971,60 @@
+@@ -8831,68 +9971,60 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef $ac_func
@@ -14470,7 +14525,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -8905,9 +10037,9 @@
+@@ -8905,9 +10037,9 @@ done
for ac_func in getrlimit
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -14483,7 +14538,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -8933,68 +10065,60 @@
+@@ -8933,68 +10065,60 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef $ac_func
@@ -14575,7 +14630,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -9009,9 +10133,9 @@
+@@ -9009,9 +10133,9 @@ done
for ac_func in daemon setsid
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -14588,7 +14643,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -9037,68 +10161,60 @@
+@@ -9037,68 +10161,60 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef $ac_func
@@ -14680,7 +14735,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -9112,9 +10228,9 @@
+@@ -9112,9 +10228,9 @@ done
for ac_func in shutdown
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -14693,7 +14748,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -9140,68 +10256,60 @@
+@@ -9140,68 +10256,60 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef $ac_func
@@ -14785,7 +14840,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -9270,8 +10378,8 @@
+@@ -9270,8 +10378,8 @@ rm -f conftest*
spt_type=""
@@ -14796,7 +14851,7 @@
if test "${ac_cv_func_setproctitle+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9298,75 +10406,66 @@
+@@ -9298,75 +10406,66 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef setproctitle
@@ -14896,7 +14951,7 @@
if test "${ac_cv_lib_util_setproctitle+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9379,56 +10478,53 @@
+@@ -9379,56 +10478,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -14974,7 +15029,7 @@
if test $ac_cv_lib_util_setproctitle = yes; then
spt_type=SPT_BUILTIN
LIBS="${LIBS} -lutil"
-@@ -9437,17 +10533,17 @@
+@@ -9437,17 +10533,17 @@ fi
fi
if test "$spt_type" = ""; then
if test "${ac_cv_header_sys_pstat_h+set}" = set; then
@@ -14998,7 +15053,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -9458,41 +10554,37 @@
+@@ -9458,41 +10554,37 @@ $ac_includes_default
#include <sys/pstat.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -15058,7 +15113,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -9501,24 +10593,22 @@
+@@ -9501,24 +10593,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <sys/pstat.h>
_ACEOF
@@ -15094,7 +15149,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -9526,9 +10616,10 @@
+@@ -9526,9 +10616,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
@@ -15107,7 +15162,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -9552,25 +10643,18 @@
+@@ -9552,25 +10643,18 @@ echo "$as_me: WARNING: sys/pstat.h:
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;}
@@ -15138,7 +15193,7 @@
fi
if test $ac_cv_header_sys_pstat_h = yes; then
-@@ -9581,17 +10665,17 @@
+@@ -9581,17 +10665,17 @@ fi
fi
if test "$spt_type" = ""; then
if test "${ac_cv_header_sys_sysnews_h+set}" = set; then
@@ -15162,7 +15217,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -9602,41 +10686,37 @@
+@@ -9602,41 +10686,37 @@ $ac_includes_default
#include <sys/sysnews.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -15222,7 +15277,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -9645,24 +10725,22 @@
+@@ -9645,24 +10725,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <sys/sysnews.h>
_ACEOF
@@ -15258,7 +15313,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -9670,9 +10748,10 @@
+@@ -9670,9 +10748,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
@@ -15271,7 +15326,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -9696,25 +10775,18 @@
+@@ -9696,25 +10775,18 @@ echo "$as_me: WARNING: sys/sysnews.h:
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;}
@@ -15302,7 +15357,7 @@
fi
if test $ac_cv_header_sys_sysnews_h = yes; then
-@@ -9724,61 +10796,55 @@
+@@ -9724,61 +10796,55 @@ fi
fi
if test "$spt_type" = ""; then
@@ -15391,7 +15446,7 @@
if test "${cyrus_cv_sys_sco+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9793,24 +10859,22 @@
+@@ -9793,24 +10859,22 @@ cat >>conftest.$ac_ext <<_ACEOF
#include </nonexistent>
#endif
_ACEOF
@@ -15427,7 +15482,7 @@
cyrus_cv_sys_sco=yes
else
echo "$as_me: failed program was:" >&5
-@@ -9818,18 +10882,19 @@
+@@ -9818,18 +10882,19 @@ sed 's/^/| /' conftest.$ac_ext >&5
cyrus_cv_sys_sco=no
fi
@@ -15451,7 +15506,7 @@
if test "${cyrus_cv_sys_setproctitle+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9844,24 +10909,22 @@
+@@ -9844,24 +10909,22 @@ cat >>conftest.$ac_ext <<_ACEOF
#include </nonexistent>
#endif
_ACEOF
@@ -15487,7 +15542,7 @@
cyrus_cv_sys_setproctitle=yes
else
echo "$as_me: failed program was:" >&5
-@@ -9869,14 +10932,15 @@
+@@ -9869,14 +10932,15 @@ sed 's/^/| /' conftest.$ac_ext >&5
cyrus_cv_sys_setproctitle=no
fi
@@ -15505,7 +15560,7 @@
fi
if test "$spt_type" != ""; then
-@@ -9886,8 +10950,8 @@
+@@ -9886,8 +10950,8 @@ _ACEOF
fi
@@ -15516,7 +15571,7 @@
if test "${cyrus_cv_sys_nonblock+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9912,45 +10976,42 @@
+@@ -9912,45 +10976,42 @@ fcntl(0, F_GETFL, 0)&FNDELAY
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -15581,7 +15636,7 @@
if test "${cyrus_cv_struct_sys_gmtoff+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9973,43 +11034,39 @@
+@@ -9973,43 +11034,39 @@ tm.tm_gmtoff = 0;
}
_ACEOF
rm -f conftest.$ac_objext
@@ -15643,7 +15698,7 @@
if test "${cyrus_cv_func_mmap_shared+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -10049,13 +11106,22 @@
+@@ -10049,13 +11106,22 @@ exit(0);}
_ACEOF
rm -f conftest$ac_exeext
@@ -15670,7 +15725,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -10068,17 +11134,19 @@
+@@ -10068,17 +11134,19 @@ sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
cyrus_cv_func_mmap_shared=no
fi
@@ -15695,7 +15750,7 @@
if test "${cyrus_cv_func_mmap_stupidshared+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -10119,13 +11187,22 @@
+@@ -10119,13 +11187,22 @@ exit(0);}
_ACEOF
rm -f conftest$ac_exeext
@@ -15722,7 +15777,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -10138,12 +11215,14 @@
+@@ -10138,12 +11215,14 @@ sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
cyrus_cv_func_mmap_stupidshared=no
fi
@@ -15740,7 +15795,7 @@
if test $cyrus_cv_func_mmap_stupidshared = yes; then
WITH_MAP="stupidshared"
else
-@@ -10157,14 +11236,13 @@
+@@ -10157,14 +11236,13 @@ fi
@@ -15759,7 +15814,7 @@
if test "${ac_cv_func_fcntl+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -10191,74 +11269,65 @@
+@@ -10191,74 +11269,65 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef fcntl
@@ -15858,7 +15913,7 @@
if test "${ac_cv_func_flock+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -10285,68 +11354,59 @@
+@@ -10285,68 +11354,59 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef flock
@@ -15949,7 +16004,7 @@
if test $ac_cv_func_flock = yes; then
WITH_LOCK="flock"
else
-@@ -10361,13 +11421,14 @@
+@@ -10361,13 +11421,14 @@ fi
fi
@@ -15967,7 +16022,7 @@
if test "${ac_cv_func_fdatasync+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -10394,68 +11455,59 @@
+@@ -10394,68 +11455,59 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef fdatasync
@@ -16058,7 +16113,7 @@
if test $ac_cv_func_fdatasync = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -10464,8 +11516,8 @@
+@@ -10464,8 +11516,8 @@ _ACEOF
else
@@ -16069,7 +16124,7 @@
if test "${ac_cv_lib_rt_fdatasync+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -10478,56 +11530,53 @@
+@@ -10478,56 +11530,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16147,7 +16202,7 @@
if test $ac_cv_lib_rt_fdatasync = yes; then
LIB_RT="-lrt"
-@@ -10548,8 +11597,8 @@
+@@ -10548,8 +11597,8 @@ if test "${cyrus_sigveclib+set}" = set;
echo $ECHO_N "(cached) $ECHO_C" >&6
else
@@ -16158,7 +16213,7 @@
if test "${ac_cv_func_sigvec+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -10576,76 +11625,67 @@
+@@ -10576,76 +11625,67 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef sigvec
@@ -16259,7 +16314,7 @@
if test "${ac_cv_lib_BSD_sigvec+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -10658,64 +11698,61 @@
+@@ -10658,64 +11698,61 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16347,7 +16402,7 @@
if test "${ac_cv_lib_ucb_sigvec+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -10728,56 +11765,53 @@
+@@ -10728,56 +11765,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16425,7 +16480,7 @@
if test $ac_cv_lib_ucb_sigvec = yes; then
cyrus_sigveclib="-lc -L/usr/ucblib -R/usr/ucblib -lucb"
-@@ -10800,34 +11834,34 @@
+@@ -10800,34 +11834,34 @@ fi
# all authentication goes through SASL
@@ -16439,10 +16494,10 @@
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"
@@ -16452,9 +16507,9 @@
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"
@@ -16472,7 +16527,7 @@
if test "x$with_afs" != "xno"; then
if test ! -d $with_afs; then
-@@ -10856,8 +11890,8 @@
+@@ -10856,8 +11890,8 @@ else
SAVE_LIBS="$LIBS"
LIBS="${with_afs}/lib/liblwp.a"
@@ -16483,7 +16538,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -10874,30 +11908,26 @@
+@@ -10874,30 +11908,26 @@ IOMGR_Initialize()
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -16528,7 +16583,7 @@
cyrus_afs_sigvec="no"
else
-@@ -10905,12 +11935,13 @@
+@@ -10905,12 +11935,13 @@ else
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16545,7 +16600,7 @@
conftest$ac_exeext conftest.$ac_ext
fi
-@@ -10960,8 +11991,8 @@
+@@ -10960,8 +11991,8 @@ if test "x$with_ldap" != "xno"; then
CPPFLAGS=$LDAP_CPPFLAGS
LDFLAGS=$LDAP_LDFLAGS
@@ -16556,7 +16611,7 @@
if test "${ac_cv_lib_ldap_ldap_initialize+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -10974,56 +12005,53 @@
+@@ -10974,56 +12005,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16634,7 +16689,7 @@
if test $ac_cv_lib_ldap_ldap_initialize = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -11052,46 +12080,46 @@
+@@ -11052,46 +12080,46 @@ _ACEOF
fi
SERVER_SUBDIRS="master imap"
@@ -16663,10 +16718,10 @@
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"
@@ -16676,9 +16731,9 @@
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"
@@ -16688,18 +16743,18 @@
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
-@@ -11104,56 +12132,53 @@
+@@ -11104,56 +12132,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16777,7 +16832,7 @@
if test $ac_cv_lib_resolv_res_search = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBRESOLV 1
-@@ -11172,16 +12197,16 @@
+@@ -11172,16 +12197,16 @@ fi
if test "$with_krb" != "no"; then
@@ -16800,7 +16855,7 @@
if test "${ac_cv_lib_des_des_ecb_encrypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11194,56 +12219,53 @@
+@@ -11194,56 +12219,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16878,7 +16933,7 @@
if test $ac_cv_lib_des_des_ecb_encrypt = yes; then
if test "$with_statickrb" = "yes"; then
KRB_LIBS="$with_krb/lib/libdes.a"
-@@ -11260,8 +12282,8 @@
+@@ -11260,8 +12282,8 @@ fi
fi
if test -d ${with_krb}; then
@@ -16889,7 +16944,7 @@
if test "${cyrus_krbinclude+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11275,8 +12297,8 @@
+@@ -11275,8 +12297,8 @@ else
done
fi
@@ -16900,7 +16955,7 @@
if test -n "${cyrus_krbinclude}"; then
CPPFLAGS="$CPPFLAGS -I${cyrus_krbinclude}"
-@@ -11299,17 +12321,17 @@
+@@ -11299,17 +12321,17 @@ fi
if test "$with_des" != no; then
if test "${ac_cv_header_krb_h+set}" = set; then
@@ -16924,7 +16979,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -11320,41 +12342,37 @@
+@@ -11320,41 +12342,37 @@ $ac_includes_default
#include <krb.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -16984,7 +17039,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -11363,24 +12381,22 @@
+@@ -11363,24 +12381,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <krb.h>
_ACEOF
@@ -17020,7 +17075,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -11388,9 +12404,10 @@
+@@ -11388,9 +12404,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
@@ -17033,7 +17088,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -11414,32 +12431,25 @@
+@@ -11414,32 +12431,25 @@ echo "$as_me: WARNING: krb.h: sectio
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;}
@@ -17074,7 +17129,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -11451,56 +12461,54 @@
+@@ -11451,56 +12461,54 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -17153,7 +17208,7 @@
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"
-@@ -11539,11 +12547,11 @@
+@@ -11539,11 +12547,11 @@ SASL_GSSAPI_LIBS_SET="yes"
IMAP_PROGS=""
@@ -17169,7 +17224,7 @@
OPENSSL_INC=
OPENSSL_LIB=
-@@ -11551,8 +12559,8 @@
+@@ -11551,8 +12559,8 @@ case "$with_openssl" in
no) with_openssl="no";;
""|yes)
LIB_RSAREF=""
@@ -17180,7 +17235,7 @@
if test "${ac_cv_lib_rsaref_RSAPublicEncrypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11565,56 +12573,53 @@
+@@ -11565,56 +12573,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -17258,7 +17313,7 @@
if test $ac_cv_lib_rsaref_RSAPublicEncrypt = yes; then
LIB_RSAREF="-lRSAglue -lrsaref"; cmu_have_rsaref=yes
else
-@@ -11623,8 +12628,8 @@
+@@ -11623,8 +12628,8 @@ fi
with_openssl="yes"
@@ -17269,7 +17324,7 @@
if test "${ac_cv_lib_crypto_BIO_accept+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11637,64 +12642,61 @@
+@@ -11637,64 +12642,61 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -17357,7 +17412,7 @@
if test "${ac_cv_lib_ssl_SSL_CTX_new+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11707,56 +12709,53 @@
+@@ -11707,56 +12709,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -17435,7 +17490,7 @@
if test $ac_cv_lib_ssl_SSL_CTX_new = yes; then
LIBS="-lssl ${LIBS}"
else
-@@ -11788,10 +12787,10 @@
+@@ -11788,10 +12787,10 @@ fi
LIBS="${LIBS} -lssl -lcrypto";;
esac
@@ -17450,7 +17505,7 @@
if test "$with_openssl" != "no"; then
-@@ -11817,12 +12816,12 @@
+@@ -11817,12 +12816,12 @@ fi
@@ -17467,7 +17522,7 @@
if test -n "$EGD_SOCKET" ; then
cat >>confdefs.h <<_ACEOF
-@@ -11832,11 +12831,11 @@
+@@ -11832,11 +12831,11 @@ _ACEOF
fi
@@ -17483,7 +17538,7 @@
if test -z "$with_zephyr"; then
if test -f /usr/local/lib/libzephyr.a; then
with_zephyr="/usr/local"
-@@ -11848,8 +12847,8 @@
+@@ -11848,8 +12847,8 @@ ZEPHYR_LIBS=""
ZEPHYR_CPPFLAGS=""
case "$with_zephyr" in
no) true;;
@@ -17494,7 +17549,7 @@
if test "${ac_cv_lib_zephyr_ZInitialize+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11862,56 +12861,53 @@
+@@ -11862,56 +12861,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -17572,7 +17627,7 @@
if test $ac_cv_lib_zephyr_ZInitialize = yes; then
ZEPHYR_LIBS="-lzephyr"
else
-@@ -11936,13 +12932,13 @@
+@@ -11936,13 +12932,13 @@ _ACEOF
fi
@@ -17590,7 +17645,7 @@
MASTERPIDFILE="\"$MASTERPIDFILE\""
cat >>confdefs.h <<_ACEOF
-@@ -11951,48 +12947,45 @@
+@@ -11951,48 +12947,45 @@ _ACEOF
@@ -17622,9 +17677,9 @@
fi
-fi;
+fi
++
-# 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"
@@ -17634,12 +17689,12 @@
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"
@@ -17656,7 +17711,7 @@
if test "${ac_cv_lib_com_err_com_err+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -12005,56 +12998,53 @@
+@@ -12005,56 +12998,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -17734,7 +17789,7 @@
if test $ac_cv_lib_com_err_com_err = yes; then
# com_err is already in library path
-@@ -12062,17 +13052,17 @@
+@@ -12062,17 +13052,17 @@ if test $ac_cv_lib_com_err_com_err = yes
# can use system com_err
with_com_err=""
if test "${ac_cv_header_et_com_err_h+set}" = set; then
@@ -17758,7 +17813,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -12083,41 +13073,37 @@
+@@ -12083,41 +13073,37 @@ $ac_includes_default
#include <et/com_err.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -17818,7 +17873,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -12126,24 +13112,22 @@
+@@ -12126,24 +13112,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <et/com_err.h>
_ACEOF
@@ -17854,7 +17909,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -12151,9 +13135,10 @@
+@@ -12151,9 +13135,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
@@ -17867,7 +17922,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -12177,25 +13162,18 @@
+@@ -12177,25 +13162,18 @@ echo "$as_me: WARNING: et/com_err.h:
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;}
@@ -17898,7 +17953,7 @@
fi
if test $ac_cv_header_et_com_err_h = yes; then
-@@ -12206,17 +13184,17 @@
+@@ -12206,17 +13184,17 @@ _ACEOF
else
if test "${ac_cv_header_com_err_h+set}" = set; then
@@ -17922,7 +17977,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -12227,41 +13205,37 @@
+@@ -12227,41 +13205,37 @@ $ac_includes_default
#include <com_err.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -17982,7 +18037,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -12270,24 +13244,22 @@
+@@ -12270,24 +13244,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <com_err.h>
_ACEOF
@@ -18018,7 +18073,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -12295,9 +13267,10 @@
+@@ -12295,9 +13267,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
@@ -18031,7 +18086,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -12321,25 +13294,18 @@
+@@ -12321,25 +13294,18 @@ echo "$as_me: WARNING: com_err.h: se
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;}
@@ -18062,7 +18117,7 @@
fi
if test $ac_cv_header_com_err_h = yes; then
-@@ -12356,8 +13322,8 @@
+@@ -12356,8 +13322,8 @@ fi
# Extract the first word of "compile_et", so it can be a program name with args.
set dummy compile_et; ac_word=$2
@@ -18073,7 +18128,7 @@
if test "${ac_cv_path_COMPILE_ET+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -12372,37 +13338,38 @@
+@@ -12372,37 +13338,38 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -18120,7 +18175,7 @@
if test "${ac_cv_path_COMPILE_ET+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -12417,34 +13384,35 @@
+@@ -12417,34 +13384,35 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -18164,7 +18219,7 @@
if test "${ac_cv_path_COMPILE_ET+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -12459,28 +13427,29 @@
+@@ -12459,28 +13427,29 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -18200,7 +18255,7 @@
else
# use ours
with_com_err=yes
-@@ -12535,8 +13504,8 @@
+@@ -12535,8 +13504,8 @@ esac
@@ -18211,7 +18266,7 @@
if test "${cyrus_cv_lib_syslog+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -12551,24 +13520,22 @@
+@@ -12551,24 +13520,22 @@ cat >>conftest.$ac_ext <<_ACEOF
#include </nonexistent>
#endif
_ACEOF
@@ -18247,7 +18302,7 @@
cyrus_cv_lib_syslog=yes
else
echo "$as_me: failed program was:" >&5
-@@ -12576,6 +13543,7 @@
+@@ -12576,6 +13543,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
cyrus_cv_lib_syslog=no
fi
@@ -18255,7 +18310,7 @@
rm -f conftest.err conftest.$ac_ext
fi
-@@ -12585,35 +13553,35 @@
+@@ -12585,35 +13553,35 @@ if test $cyrus_cv_lib_syslog = no; then
DEPLIBS="${DEPLIBS} ../syslog/libsyslog.a"
CPPFLAGS="$CPPFLAGS -I\$(srcdir)/../syslog"
fi
@@ -18304,7 +18359,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -12639,143 +13607,133 @@
+@@ -12639,143 +13607,133 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef $ac_func
@@ -18425,11 +18480,11 @@
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.
@@ -18459,9 +18514,9 @@
+ { 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"
@@ -18475,9 +18530,9 @@
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"
@@ -18491,16 +18546,16 @@
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
-@@ -12802,74 +13760,65 @@
+@@ -12802,74 +13760,65 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef dlopen
@@ -18599,7 +18654,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -12882,56 +13831,53 @@
+@@ -12882,56 +13831,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -18677,7 +18732,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBDL 1
-@@ -12943,8 +13889,8 @@
+@@ -12943,8 +13889,8 @@ fi
fi
@@ -18688,7 +18743,7 @@
if test "${ac_cv_func_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -12971,73 +13917,64 @@
+@@ -12971,73 +13917,64 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef crypt
@@ -18786,7 +18841,7 @@
if test "${ac_cv_lib_crypt_crypt+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -13050,56 +13987,53 @@
+@@ -13050,56 +13987,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -18864,7 +18919,7 @@
if test $ac_cv_lib_crypt_crypt = yes; then
LIB_CRYPT="-lcrypt"; cmu_have_crypt=yes
else
-@@ -13112,21 +14046,21 @@
+@@ -13112,21 +14046,21 @@ fi
@@ -18878,9 +18933,9 @@
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"
@@ -18894,7 +18949,7 @@
if test "$gssapi" != no; then
platform=
-@@ -13179,17 +14113,17 @@
+@@ -13179,17 +14113,17 @@ echo "$as_me: error: CyberSafe was force
fi
fi
if test "${ac_cv_header_gssapi_h+set}" = set; then
@@ -18918,7 +18973,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -13200,41 +14134,37 @@
+@@ -13200,41 +14134,37 @@ $ac_includes_default
#include <gssapi.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -18978,7 +19033,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -13243,24 +14173,22 @@
+@@ -13243,24 +14173,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <gssapi.h>
_ACEOF
@@ -19014,7 +19069,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -13268,9 +14196,10 @@
+@@ -13268,9 +14196,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
@@ -19027,7 +19082,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -13294,25 +14223,18 @@
+@@ -13294,25 +14223,18 @@ echo "$as_me: WARNING: gssapi.h: sec
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;}
@@ -19058,7 +19113,7 @@
fi
if test $ac_cv_header_gssapi_h = yes; then
-@@ -13323,17 +14245,17 @@
+@@ -13323,17 +14245,17 @@ _ACEOF
else
if test "${ac_cv_header_gssapi_gssapi_h+set}" = set; then
@@ -19082,7 +19137,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -13344,41 +14266,37 @@
+@@ -13344,41 +14266,37 @@ $ac_includes_default
#include <gssapi/gssapi.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -19142,7 +19197,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -13387,24 +14305,22 @@
+@@ -13387,24 +14305,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <gssapi/gssapi.h>
_ACEOF
@@ -19178,7 +19233,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -13412,9 +14328,10 @@
+@@ -13412,9 +14328,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
@@ -19191,7 +19246,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -13438,25 +14355,18 @@
+@@ -13438,25 +14355,18 @@ echo "$as_me: WARNING: gssapi/gssapi.h:
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;}
@@ -19222,7 +19277,7 @@
fi
if test $ac_cv_header_gssapi_gssapi_h = yes; then
-@@ -13485,8 +14395,8 @@
+@@ -13485,8 +14395,8 @@ if test "$gssapi" != no; then
# The choice is reflected in GSSAPIBASE_LIBS
@@ -19233,7 +19288,7 @@
if test "${ac_cv_lib_resolv_res_search+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -13499,56 +14409,53 @@
+@@ -13499,56 +14409,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -19311,7 +19366,7 @@
if test $ac_cv_lib_resolv_res_search = yes; then
cat >>confdefs.h <<_ACEOF
#define HAVE_LIBRESOLV 1
-@@ -13575,8 +14482,8 @@
+@@ -13575,8 +14482,8 @@ fi
if test "$gss_impl" = "auto" -o "$gss_impl" = "heimdal"; then
gss_failed=0
@@ -19322,7 +19377,7 @@
if test "${ac_cv_lib_gssapi_gss_unwrap+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -13589,56 +14496,53 @@
+@@ -13589,56 +14496,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -19400,7 +19455,7 @@
if test $ac_cv_lib_gssapi_gss_unwrap = yes; then
gss_impl="heimdal"
else
-@@ -13651,14 +14555,81 @@
+@@ -13651,14 +14555,81 @@ fi
fi
if test "$gss_impl" = "auto" -o "$gss_impl" = "mit"; then
@@ -19485,7 +19540,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -13666,56 +14637,53 @@
+@@ -13666,56 +14637,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -19563,7 +19618,7 @@
if test $ac_cv_lib_gssapi_krb5_gss_unwrap = yes; then
gss_impl="mit"
else
-@@ -13747,8 +14715,8 @@
+@@ -13747,8 +14715,8 @@ fi
# library (older CyberSafe)
unset ac_cv_lib_gss_csf_gss_acq_user
@@ -19574,7 +19629,7 @@
if test "${ac_cv_lib_gss_csf_gss_acq_user+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -13761,62 +14729,59 @@
+@@ -13761,62 +14729,59 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -19660,7 +19715,7 @@
if test "${ac_cv_lib_gss_csf_gss_acq_user+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -13829,56 +14794,53 @@
+@@ -13829,56 +14794,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -19738,7 +19793,7 @@
if test $ac_cv_lib_gss_csf_gss_acq_user = yes; then
gss_impl="cybersafe"
else
-@@ -13901,8 +14863,8 @@
+@@ -13901,8 +14863,8 @@ fi
if test "$gss_impl" = "auto" -o "$gss_impl" = "seam"; then
gss_failed=0
@@ -19749,7 +19804,7 @@
if test "${ac_cv_lib_gss_gss_unwrap+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -13915,56 +14877,53 @@
+@@ -13915,56 +14877,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -19827,7 +19882,7 @@
if test $ac_cv_lib_gss_gss_unwrap = yes; then
gss_impl="seam"
else
-@@ -13977,8 +14936,8 @@
+@@ -13977,8 +14936,8 @@ fi
fi
if test "$gss_impl" = "mit"; then
@@ -19838,7 +19893,7 @@
elif test "$gss_impl" = "heimdal"; then
CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err"
-@@ -14155,13 +15114,13 @@
+@@ -14155,13 +15114,13 @@ rm -f conftest*
fi
GSSAPI_LIBS=""
@@ -19858,7 +19913,7 @@
if test "${ac_cv_lib_resolv_res_search+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -14174,56 +15133,53 @@
+@@ -14174,56 +15133,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -19936,7 +19991,7 @@
if test $ac_cv_lib_resolv_res_search = yes; then
GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv"
fi
-@@ -14238,9 +15194,9 @@
+@@ -14238,9 +15194,9 @@ fi
for ac_func in gsskrb5_register_acceptor_identity
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -19949,7 +20004,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -14266,68 +15222,60 @@
+@@ -14266,68 +15222,60 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef $ac_func
@@ -20041,7 +20096,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -14338,8 +15286,8 @@
+@@ -14338,8 +15286,8 @@ done
LIBS="$cmu_save_LIBS"
else
@@ -20052,7 +20107,7 @@
fi
-@@ -14347,25 +15295,25 @@
+@@ -14347,25 +15295,25 @@ fi
@@ -20086,7 +20141,7 @@
SASLFLAGS=""
LIB_SASL=""
-@@ -14393,17 +15341,17 @@
+@@ -14393,17 +15341,17 @@ if test ${with_staticsasl} != "no"; then
fi
if test "${ac_cv_header_sasl_sasl_h+set}" = set; then
@@ -20110,7 +20165,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -14414,41 +15362,37 @@
+@@ -14414,41 +15362,37 @@ $ac_includes_default
#include <sasl/sasl.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -20170,7 +20225,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -14457,24 +15401,22 @@
+@@ -14457,24 +15401,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <sasl/sasl.h>
_ACEOF
@@ -20206,7 +20261,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -14482,9 +15424,10 @@
+@@ -14482,9 +15424,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
@@ -20219,7 +20274,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -14508,40 +15451,33 @@
+@@ -14508,40 +15451,33 @@ echo "$as_me: WARNING: sasl/sasl.h:
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;}
@@ -20271,7 +20326,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -14552,41 +15488,37 @@
+@@ -14552,41 +15488,37 @@ $ac_includes_default
#include <sasl/saslutil.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -20331,7 +20386,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -14595,24 +15527,22 @@
+@@ -14595,24 +15527,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <sasl/saslutil.h>
_ACEOF
@@ -20367,7 +20422,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -14620,9 +15550,10 @@
+@@ -14620,9 +15550,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
@@ -20380,7 +20435,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -14646,39 +15577,32 @@
+@@ -14646,39 +15577,32 @@ echo "$as_me: WARNING: sasl/saslutil.h:
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;}
@@ -20429,7 +20484,7 @@
{ { 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; }; }
-@@ -14690,8 +15614,8 @@
+@@ -14690,8 +15614,8 @@ fi
@@ -20440,7 +20495,7 @@
if test "x$SASL_GSSAPI_LIBS_SET" = "x"; then
LIB_SASL="$LIB_SASL $GSSAPIBASE_STATIC_LIBS"
-@@ -14723,17 +15647,17 @@
+@@ -14723,17 +15647,17 @@ fi
# be sure to check for a SASLv2 specific function
if test "${ac_cv_header_sasl_sasl_h+set}" = set; then
@@ -20464,7 +20519,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -14744,41 +15668,37 @@
+@@ -14744,41 +15668,37 @@ $ac_includes_default
#include <sasl/sasl.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -20524,7 +20579,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -14787,24 +15707,22 @@
+@@ -14787,24 +15707,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <sasl/sasl.h>
_ACEOF
@@ -20560,7 +20615,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -14812,9 +15730,10 @@
+@@ -14812,9 +15730,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
@@ -20573,7 +20628,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -14838,40 +15757,33 @@
+@@ -14838,40 +15757,33 @@ echo "$as_me: WARNING: sasl/sasl.h:
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;}
@@ -20625,7 +20680,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -14882,41 +15794,37 @@
+@@ -14882,41 +15794,37 @@ $ac_includes_default
#include <sasl/saslutil.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -20685,7 +20740,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -14925,24 +15833,22 @@
+@@ -14925,24 +15833,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <sasl/saslutil.h>
_ACEOF
@@ -20721,7 +20776,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -14950,9 +15856,10 @@
+@@ -14950,9 +15856,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
@@ -20734,7 +20789,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -14976,30 +15883,23 @@
+@@ -14976,30 +15883,23 @@ echo "$as_me: WARNING: sasl/saslutil.h:
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;}
@@ -20772,7 +20827,7 @@
if test "${ac_cv_lib_sasl2_prop_get+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -15012,56 +15912,53 @@
+@@ -15012,56 +15912,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -20850,7 +20905,7 @@
if test $ac_cv_lib_sasl2_prop_get = yes; then
ac_cv_found_sasl=yes
else
-@@ -15152,24 +16049,22 @@
+@@ -15152,24 +16049,22 @@ cat >>conftest.$ac_ext <<_ACEOF
#endif
_ACEOF
@@ -20886,7 +20941,7 @@
:
else
echo "$as_me: failed program was:" >&5
-@@ -15179,6 +16074,7 @@
+@@ -15179,6 +16074,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
echo "$as_me: error: Incorrect SASL headers found. This package requires SASL 2.1.7 or newer." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -20894,7 +20949,7 @@
rm -f conftest.err conftest.$ac_ext
CPPFLAGS=$cmu_saved_CPPFLAGS
-@@ -15189,8 +16085,8 @@
+@@ -15189,8 +16085,8 @@ cmu_saved_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS $LIB_SASL"
@@ -20905,7 +20960,7 @@
if test "${ac_cv_lib_sasl2_sasl_checkapop+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -15203,56 +16099,53 @@
+@@ -15203,56 +16099,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -20983,7 +21038,7 @@
if test $ac_cv_lib_sasl2_sasl_checkapop = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -15270,13 +16163,13 @@
+@@ -15270,13 +16163,13 @@ LDFLAGS=$cmu_saved_LDFLAGS
@@ -21001,7 +21056,7 @@
if test "${with_perl}" = yes; then
with_perl="perl"
-@@ -15291,8 +16184,8 @@
+@@ -15291,8 +16184,8 @@ echo "$as_me: WARNING: Cannot compile pe
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -21012,7 +21067,7 @@
if test "${ac_cv_prog_PERL+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -15305,25 +16198,27 @@
+@@ -15305,25 +16198,27 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -21045,7 +21100,7 @@
test -n "$PERL" && break
done
test -n "$PERL" || PERL="with_perl=notfound"
-@@ -15352,8 +16247,8 @@
+@@ -15352,8 +16247,8 @@ else
PERL_DEPSUBDIRS="none"
fi
@@ -21056,7 +21111,7 @@
if test "${ac_cv_func_MD5Init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -15380,73 +16275,64 @@
+@@ -15380,73 +16275,64 @@ cat >>conftest.$ac_ext <<_ACEOF
#undef MD5Init
@@ -21154,7 +21209,7 @@
if test "${ac_cv_lib_md_MD5Init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -15459,56 +16345,53 @@
+@@ -15459,56 +16345,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -21232,7 +21287,7 @@
if test $ac_cv_lib_md_MD5Init = yes; then
LIBS="${LIBS} -lmd"
else
-@@ -15523,13 +16406,13 @@
+@@ -15523,13 +16406,13 @@ SNMP_SUBDIRS=""
@@ -21251,7 +21306,7 @@
if test "${ac_cv_type_long+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -15540,61 +16423,57 @@
+@@ -15540,61 +16423,57 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -21338,7 +21393,7 @@
if test "$cross_compiling" = yes; then
# Depending upon the size, compute the lo and hi bounds.
cat >conftest.$ac_ext <<_ACEOF
-@@ -15604,10 +16483,11 @@
+@@ -15604,10 +16483,11 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -21351,7 +21406,7 @@
test_array [0] = 0
;
-@@ -15615,27 +16495,22 @@
+@@ -15615,27 +16495,22 @@ test_array [0] = 0
}
_ACEOF
rm -f conftest.$ac_objext
@@ -21390,7 +21445,7 @@
ac_lo=0 ac_mid=0
while :; do
cat >conftest.$ac_ext <<_ACEOF
-@@ -15645,10 +16520,11 @@
+@@ -15645,10 +16520,11 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -21403,7 +21458,7 @@
test_array [0] = 0
;
-@@ -15656,56 +16532,53 @@
+@@ -15656,56 +16532,53 @@ test_array [0] = 0
}
_ACEOF
rm -f conftest.$ac_objext
@@ -21482,7 +21537,7 @@
test_array [0] = 0
;
-@@ -15713,27 +16586,22 @@
+@@ -15713,27 +16586,22 @@ test_array [0] = 0
}
_ACEOF
rm -f conftest.$ac_objext
@@ -21521,7 +21576,7 @@
ac_hi=-1 ac_mid=-1
while :; do
cat >conftest.$ac_ext <<_ACEOF
-@@ -15743,10 +16611,11 @@
+@@ -15743,10 +16611,11 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -21534,7 +21589,7 @@
test_array [0] = 0
;
-@@ -15754,50 +16623,48 @@
+@@ -15754,50 +16623,48 @@ test_array [0] = 0
}
_ACEOF
rm -f conftest.$ac_objext
@@ -21609,7 +21664,7 @@
# 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`
-@@ -15808,10 +16675,11 @@
+@@ -15808,10 +16675,11 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -21622,7 +21677,7 @@
test_array [0] = 0
;
-@@ -15819,52 +16687,45 @@
+@@ -15819,52 +16687,45 @@ test_array [0] = 0
}
_ACEOF
rm -f conftest.$ac_objext
@@ -21696,7 +21751,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -15872,8 +16733,9 @@
+@@ -15872,8 +16733,9 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
$ac_includes_default
@@ -21708,7 +21763,7 @@
#include <stdio.h>
#include <stdlib.h>
int
-@@ -15882,35 +16744,44 @@
+@@ -15882,35 +16744,44 @@ main ()
FILE *f = fopen ("conftest.val", "w");
if (! f)
@@ -21766,7 +21821,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -15921,29 +16792,32 @@
+@@ -15921,29 +16792,32 @@ echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
@@ -21790,8 +21845,8 @@
rm -f conftest.val
-else
- ac_cv_sizeof_long=0
- fi
-fi
+ fi
-echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
-echo "${ECHO_T}$ac_cv_sizeof_long" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
@@ -21811,7 +21866,7 @@
if test "${ac_cv_cmu_lib_subdir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -15961,8 +16835,8 @@
+@@ -15961,8 +16835,8 @@ else
ac_cv_cmu_lib_subdir=$with_lib_subdir
fi
fi
@@ -21822,7 +21877,7 @@
CMU_LIB_SUBDIR=$ac_cv_cmu_lib_subdir
-@@ -15970,21 +16844,21 @@
+@@ -15970,21 +16844,21 @@ CMU_LIB_SUBDIR=$ac_cv_cmu_lib_subdir
@@ -21850,7 +21905,7 @@
if test "${ac_cv_lib_wrap_request_init+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -15997,70 +16871,67 @@
+@@ -15997,70 +16871,67 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -21948,7 +22003,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -16071,41 +16942,37 @@
+@@ -16071,41 +16942,37 @@ $ac_includes_default
#include <tcpd.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -22008,7 +22063,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -16114,24 +16981,22 @@
+@@ -16114,24 +16981,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <tcpd.h>
_ACEOF
@@ -22044,7 +22099,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -16139,9 +17004,10 @@
+@@ -16139,9 +17004,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
@@ -22057,7 +22112,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -16165,25 +17031,18 @@
+@@ -16165,25 +17031,18 @@ echo "$as_me: WARNING: tcpd.h: secti
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;}
@@ -22088,7 +22143,7 @@
fi
if test $ac_cv_header_tcpd_h = yes; then
-@@ -16199,10 +17058,10 @@
+@@ -16199,10 +17058,10 @@ fi
LIBS="$cmu_save_LIBS"
fi
@@ -22103,7 +22158,7 @@
LIB_WRAP=""
if test "$with_libwrap" != no; then
-@@ -16211,8 +17070,8 @@
+@@ -16211,8 +17070,8 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
LIB_WRAP="-lwrap"
@@ -22114,7 +22169,7 @@
if test "${ac_cv_lib_nsl_yp_get_default_domain+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -16225,56 +17084,53 @@
+@@ -16225,56 +17084,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -22192,7 +22247,7 @@
if test $ac_cv_lib_nsl_yp_get_default_domain = yes; then
LIB_WRAP="${LIB_WRAP} -lnsl"
fi
-@@ -16286,28 +17142,28 @@
+@@ -16286,28 +17142,28 @@ fi
@@ -22231,7 +22286,7 @@
if test "${ac_cv_path_SNMP_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -16323,34 +17179,35 @@
+@@ -16323,34 +17179,35 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -22275,7 +22330,7 @@
SNMP_LIBS=`$SNMP_CONFIG --agent-libs`
SNMP_PREFIX=`$SNMP_CONFIG --prefix`
-@@ -16364,11 +17221,11 @@
+@@ -16364,11 +17221,11 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
@@ -22291,7 +22346,7 @@
{ 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
-@@ -16379,8 +17236,8 @@
+@@ -16379,8 +17236,8 @@ echo "$as_me: WARNING: Could not find th
LDFLAGS="$LDFLAGS -L${with_snmp}/$CMU_LIB_SUBDIR"
fi
cmu_save_LIBS="$LIBS"
@@ -22302,7 +22357,7 @@
if test "${ac_cv_lib_snmp_sprint_objid+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -16393,70 +17250,67 @@
+@@ -16393,70 +17250,67 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -22400,7 +22455,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -16467,41 +17321,37 @@
+@@ -16467,41 +17321,37 @@ $ac_includes_default
#include <ucd-snmp/version.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -22460,7 +22515,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -16510,24 +17360,22 @@
+@@ -16510,24 +17360,22 @@ cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ucd-snmp/version.h>
_ACEOF
@@ -22496,7 +22551,7 @@
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
-@@ -16535,9 +17383,10 @@
+@@ -16535,9 +17383,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
@@ -22509,7 +22564,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -16561,25 +17410,18 @@
+@@ -16561,25 +17410,18 @@ echo "$as_me: WARNING: ucd-snmp/version.
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;}
@@ -22540,7 +22595,7 @@
fi
if test $ac_cv_header_ucd_snmp_version_h = yes; then
-@@ -16595,10 +17437,10 @@
+@@ -16595,10 +17437,10 @@ fi
LIBS="$cmu_save_LIBS"
fi
@@ -22555,7 +22610,7 @@
LIB_UCDSNMP=""
if test "$with_snmp" != no; then
-@@ -16607,8 +17449,8 @@
+@@ -16607,8 +17449,8 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
@@ -22566,7 +22621,7 @@
if test "${ac_cv_lib_rpm_rpmdbOpen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -16621,56 +17463,53 @@
+@@ -16621,56 +17463,53 @@ cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -22644,7 +22699,7 @@
if test $ac_cv_lib_rpm_rpmdbOpen = yes; then
LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt"
fi
-@@ -16729,7 +17568,8 @@
+@@ -16729,7 +17568,8 @@ IMAP_LIBS="${LIB_SASL} ${LIBS}"
@@ -22654,7 +22709,7 @@
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
-@@ -16748,39 +17588,58 @@
+@@ -16748,39 +17588,58 @@ _ACEOF
# The following way of writing the cache mishandles newlines in values,
# but we know of no workaround that is simple, portable, and efficient.
@@ -22729,7 +22784,7 @@
fi
fi
rm -f confcache
-@@ -16789,32 +17648,18 @@
+@@ -16789,32 +17648,18 @@ test "x$prefix" = xNONE && prefix=$ac_de
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -22768,7 +22823,7 @@
done
LIBOBJS=$ac_libobjs
-@@ -16845,17 +17690,45 @@
+@@ -16845,17 +17690,45 @@ cat >>$CONFIG_STATUS <<\_ACEOF
## M4sh Initialization. ##
## --------------------- ##
@@ -22818,7 +22873,7 @@
# Support unset when possible.
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-@@ -16865,8 +17738,43 @@
+@@ -16865,8 +17738,43 @@ else
fi
@@ -22863,7 +22918,7 @@
PS1='$ '
PS2='> '
PS4='+ '
-@@ -16880,18 +17788,19 @@
+@@ -16880,18 +17788,19 @@ do
if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
@@ -22886,7 +22941,7 @@
as_basename=basename
else
as_basename=false
-@@ -16899,159 +17808,120 @@
+@@ -16899,159 +17808,120 @@ fi
# Name of the executable.
@@ -22903,14 +22958,6 @@
- /^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
@@ -22924,7 +22971,19 @@
+ 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
@@ -22937,10 +22996,8 @@
- 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`
@@ -23117,7 +23174,7 @@
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
-@@ -17060,7 +17930,28 @@
+@@ -17060,7 +17930,28 @@ else
as_mkdir_p=false
fi
@@ -23147,7 +23204,7 @@
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -17069,31 +17960,14 @@
+@@ -17069,31 +17960,14 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -23183,7 +23240,7 @@
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -17101,30 +17975,19 @@
+@@ -17101,30 +17975,19 @@ generated by GNU Autoconf 2.59. Invocat
CONFIG_COMMANDS = $CONFIG_COMMANDS
$ $0 $@
@@ -23200,7 +23257,9 @@
-if test -n "$ac_config_files"; then
- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
--
++config_files="$ac_config_files"
++config_headers="$ac_config_headers"
+
-if test -n "$ac_config_headers"; then
- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
@@ -23208,9 +23267,7 @@
-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
@@ -23221,7 +23278,7 @@
ac_cs_usage="\
\`$as_me' instantiates files from templates according to the
current configuration.
-@@ -17132,7 +17995,7 @@
+@@ -17132,7 +17995,7 @@ current configuration.
Usage: $0 [OPTIONS] [FILE]...
-h, --help print this help, then exit
@@ -23230,7 +23287,7 @@
-q, --quiet do not print progress messages
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
-@@ -17148,19 +18011,21 @@
+@@ -17148,19 +18011,21 @@ Configuration headers:
$config_headers
Report bugs to <bug-autoconf at gnu.org>."
@@ -23258,7 +23315,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -17171,39 +18036,24 @@
+@@ -17171,39 +18036,24 @@ while test $# != 0
do
case $1 in
--*=*)
@@ -23304,7 +23361,7 @@
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
-@@ -17213,18 +18063,24 @@
+@@ -17213,18 +18063,24 @@ Try \`$0 --help' for more information."
$ac_shift
CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
ac_need_defaults=false;;
@@ -23334,7 +23391,7 @@
esac
shift
-@@ -17240,37 +18096,51 @@
+@@ -17240,37 +18096,51 @@ fi
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
if \$ac_cs_recheck; then
@@ -23403,7 +23460,7 @@
# If the user did not use the arguments to specify the items to instantiate,
# then the envvar interface is used. Set only those that are not.
# We use the long form for the default assignment because of an extremely
-@@ -17281,626 +18151,621 @@
+@@ -17281,626 +18151,621 @@ if $ac_need_defaults; then
fi
# Have a temporary directory for convenience. Make it in the build tree
@@ -23577,10 +23634,9 @@
-s, at PERL_DEPSUBDIRS@,$PERL_DEPSUBDIRS,;t t
-s, at LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
-+if test -n "$CONFIG_FILES"; then
-
- _ACEOF
-
+-
+-_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.
@@ -23617,6 +23673,10 @@
- done
- if test -z "$ac_sed_cmds"; then
- ac_sed_cmds=cat
++if test -n "$CONFIG_FILES"; then
++
++_ACEOF
++
+
+
+ac_delim='%!_!# '
@@ -23738,11 +23798,11 @@
+ 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
++_ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
@@ -23810,11 +23870,11 @@
+ 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
+ _ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
@@ -23873,7 +23933,7 @@
+ { (exit 1); exit 1; }; };;
+ :[FH]-) ac_tag=-:-;;
+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
- esac
++ esac
+ ac_save_IFS=$IFS
+ IFS=:
+ set x $ac_tag
@@ -23881,9 +23941,7 @@
+ 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])
@@ -23922,8 +23980,10 @@
+ *:-:* | *:-) cat >"$tmp/stdin";;
+ esac
+ ;;
-+ esac
-+
+ esac
+
+- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
+- ac_dir=`(dirname "$ac_file") 2>/dev/null ||
+ ac_dir=`$as_dirname -- "$ac_file" ||
$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$ac_file" : 'X\(//\)[^/]' \| \
@@ -24131,11 +24191,7 @@
- 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=:
@@ -24163,6 +24219,11 @@
- fi;;
- esac
- done` || { (exit 1); exit 1; }
++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=
++
+case `sed -n '/datarootdir/ {
+ p
+ q
@@ -24225,19 +24286,7 @@
-#
-# 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.
-#
@@ -24251,6 +24300,19 @@
-ac_uB='$,\1#\2define\3'
-ac_uC=' '
-ac_uD=',;t'
++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
++
+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"; } &&
@@ -24389,6 +24451,17 @@
+# (The regexp can be short, since the line contains either #define or #undef.)
+echo 's/ $//
+s,^[ #]*u.*,/* & */,' >>conftest.defines
++
++# 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"'
-# 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).
@@ -24398,17 +24471,6 @@
-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.
@@ -24553,9 +24615,8 @@
{ (exit 0); exit 0; }
_ACEOF
-diff -urNad cyrus-imapd-2.2.13/install-sh /tmp/dpep.48WUNC/cyrus-imapd-2.2.13/install-sh
---- cyrus-imapd-2.2.13/install-sh 2007-02-24 20:51:39.699152166 +0100
-+++ /tmp/dpep.48WUNC/cyrus-imapd-2.2.13/install-sh 2007-02-24 20:51:40.485074190 +0100
+--- a/install-sh
++++ b/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
@@ -24565,67 +24626,3 @@
# 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.2.13/mkinstalldirs /tmp/dpep.48WUNC/cyrus-imapd-2.2.13/mkinstalldirs
---- cyrus-imapd-2.2.13/mkinstalldirs 2007-02-24 20:51:39.369184904 +0100
-+++ /tmp/dpep.48WUNC/cyrus-imapd-2.2.13/mkinstalldirs 2007-02-24 20:51:40.486074091 +0100
-@@ -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: trunk/cyrus-imapd-2.2.13/debian/patches/series
URL: https://mail.incase.de/viewcvs/trunk/cyrus-imapd-2.2.13/debian/patches/series?rev=873&root=cyrus22&r1=872&r2=873&view=diff
==============================================================================
--- trunk/cyrus-imapd-2.2.13/debian/patches/series (original)
+++ trunk/cyrus-imapd-2.2.13/debian/patches/series Fri Jan 22 22:07:03 2010
@@ -53,7 +53,7 @@
35-masssievec_remove_unused_variable.dpatch
40-rehash_fix_pathes.dpatch
45-kolab2-annotations.dpatch
-50-fix-imclient-manpage
+50-fix-imclient-manpage.dpatch
61-64bit-quota.dpatch
65-sieveshell-enhancements.dpatch
70-fix_readme_link.dpatch
More information about the Pkg-Cyrus-imapd-Debian-devel
mailing list