Cyrus IMAP Server 2.3.16 patch making it compilable on FreeBSD 8

[Francis Gendreau]

I was trying to build the latest source of Cyrus IMAP Server on my
system when I came across a few problems that I've been able to track
down.

Here are my configuration options

CONFIG_OPTIONS=`echo                            \
        --prefix=${PREFIX}/imapd                \
        --with-cyrus-prefix=${PREFIX}/imapd     \
                                                \
        --disable-murder                        \
        --disable-cmulocal                      \
        --disable-netscapehack                  \
        --disable-replication                   \
        --disable-nntp                          \
        --disable-gssapi                        \
                                                \
        --enable-listext                        \
                                                \
        --with-bdb-incdir=${BDB_INCLUDE_DIR}    \
        --with-bdb-libdir=${BDB_LIBRARY_DIR}    \
        --with-mysql-incdir=${MYSQL_INCLUDE_DIR}\
        --with-mysql-libdir=${MYSQL_LIBRARY_DIR}\
        --with-openssl                          \
        --without-pgsql                         \
        --without-sqlite                        \
        --with-lock=fcntl                       \
        --without-egd-socket                    \
        --without-krb                           \
        --without-ldap                          \
        --without-afs                           \
        --with-pidfile=${PREFIX}/imapd.pid      \
        --without-zephyr                        \
        --with-sasl=${SASL_DIR}                 \
        --without-snmp                          \
        --without-libwrap                       `

During the building process, I've encountered a problem with
lib/imapurl.c:56 -> lib/util.h:120 where mode_t was undefined.
Solution was to include config.h in lib/imapurl.c and in
lib/strcasecmp.c since both include "util.h" without directly or
indirectly including sys/types.h.

Also a minor "oops I forgot a semicolon" in imap/version.c:149

I joined the patch to this email.

Francis Gendreau

diff -ru cyrus-imapd-2.3.16/imap/version.c cyrus-imapd-2.3.16-modif/imap/version.c
--- cyrus-imapd-2.3.16/imap/version.c	2009-04-23 13:10:07.000000000 -0400
+++ cyrus-imapd-2.3.16-modif/imap/version.c	2010-02-16 17:35:07.000000000 -0500
@@ -146,7 +146,7 @@
 	     "; Running w/%s", SSLeay_version(SSLEAY_VERSION));
 #ifdef EGD_SOCKET
     snprintf(env_buf + strlen(env_buf), MAXIDVALUELEN - strlen(env_buf),
-	     " (with EGD)")
+	     " (with EGD)");
 #endif
 #endif
 #ifdef HAVE_ZLIB
diff -ru cyrus-imapd-2.3.16/lib/getaddrinfo.c cyrus-imapd-2.3.16-modif/lib/getaddrinfo.c
--- cyrus-imapd-2.3.16/lib/getaddrinfo.c	2009-03-31 00:11:22.000000000 -0400
+++ cyrus-imapd-2.3.16-modif/lib/getaddrinfo.c	2010-02-16 17:49:32.000000000 -0500
@@ -60,7 +60,7 @@
  * will be used if you have broken getaddrinfo or no getaddrinfo.
  */
 
-#include "config.h"
+#include <config.h>
 #ifndef macintosh
 #include <sys/param.h>
 #include <arpa/inet.h>
diff -ru cyrus-imapd-2.3.16/lib/imapurl.c cyrus-imapd-2.3.16-modif/lib/imapurl.c
--- cyrus-imapd-2.3.16/lib/imapurl.c	2009-03-31 00:11:22.000000000 -0400
+++ cyrus-imapd-2.3.16-modif/lib/imapurl.c	2010-02-16 17:48:45.000000000 -0500
@@ -42,6 +42,7 @@
  *
  * derived from chris newman's code
  */
+#include <config.h>
 
 #include <stdio.h>
 #include <string.h>
diff -ru cyrus-imapd-2.3.16/lib/strcasecmp.c cyrus-imapd-2.3.16-modif/lib/strcasecmp.c
--- cyrus-imapd-2.3.16/lib/strcasecmp.c	2008-03-24 13:43:09.000000000 -0400
+++ cyrus-imapd-2.3.16-modif/lib/strcasecmp.c	2010-02-16 17:47:02.000000000 -0500
@@ -44,6 +44,7 @@
  * Author: Chris Newman
  * Start Date: 4/6/93
  */
+#include <config.h>
 
 #include "util.h"