Hi.
Here's a diff that updates the cyrus-imapd port to the latest stable
version: 2.2.13
Thanks!
--
Antoine Jacoutot
Observatoire de Paris
SIO - Centre de calcul (Bat 15)
5, Place Jules Janssen
92195 Meudon Cedex
Tel : +33 (0)1.45.07.71.95
diff -uNr --exclude=CVS /usr/ports/mail/cyrus-imapd/Makefile
cyrus-imapd/Makefile
--- /usr/ports/mail/cyrus-imapd/Makefile Sat Apr 1 01:43:21 2006
+++ cyrus-imapd/Makefile Tue Apr 4 10:07:38 2006
@@ -3,12 +3,11 @@
COMMENT= "Cyrus IMAP server"
COMMENT-perl= "perl utils for the Cyrus IMAP server"
-V= 2.2.12
+V= 2.2.13
DISTNAME= cyrus-imapd-${V}
-PKGNAME= ${DISTNAME}p0
FULLPKGNAME-perl=cyrus-imapd-perl-${V}
CATEGORIES= mail
-HOMEPAGE= http://asg.web.cmu.edu/cyrus/imapd/
+HOMEPAGE= http://cyrusimap.web.cmu.edu
MAINTAINER= Antoine Jacoutot <[EMAIL PROTECTED]>
@@ -33,6 +32,7 @@
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
ac_cv_lib_resolv_res_search=no \
+ ac_cv_sys_long_file_names=yes \
MAKEDEPEND=""
CONFIGURE_ARGS= --with-service-path=${LOCALBASE}/libexec/cyrus-imapd \
--with-bdb \
@@ -68,6 +68,7 @@
.endif
.if ${FLAVOR:L:Mkerberos}
+WANTLIB+= com_err krb5 gssapi asn1
CONFIGURE_ENV+= CPPFLAGS="-I/usr/include/kerberosV" \
CONFIGURE_ARGS+=--with-auth=krb5 \
--enable-gssapi=/usr \
diff -uNr --exclude=CVS /usr/ports/mail/cyrus-imapd/distinfo
cyrus-imapd/distinfo
--- /usr/ports/mail/cyrus-imapd/distinfo Sun Mar 27 20:01:50 2005
+++ cyrus-imapd/distinfo Sun Apr 2 14:33:44 2006
@@ -1,4 +1,4 @@
-MD5 (cyrus-imapd-2.2.12.tar.gz) = 70b3bba526a8d36d3bb23a87d37e9188
-RMD160 (cyrus-imapd-2.2.12.tar.gz) = ff4a95e519ea066ed9b21b515b18bdacaf0d1852
-SHA1 (cyrus-imapd-2.2.12.tar.gz) = 08adc5dfde1288c0d9e7de44e7ea4d17a7940d06
-SIZE (cyrus-imapd-2.2.12.tar.gz) = 1961161
+MD5 (cyrus-imapd-2.2.13.tar.gz) = 3ff679714836d1d7b1e1df0e026d4844
+RMD160 (cyrus-imapd-2.2.13.tar.gz) = 7e8ac84b5ddd9f1206e71d5b659d07d8400f9ac2
+SHA1 (cyrus-imapd-2.2.13.tar.gz) = ba84b67a1cae4c15d5a588d010764031167970c4
+SIZE (cyrus-imapd-2.2.13.tar.gz) = 2109770
diff -uNr --exclude=CVS /usr/ports/mail/cyrus-imapd/patches/patch-configure
cyrus-imapd/patches/patch-configure
--- /usr/ports/mail/cyrus-imapd/patches/patch-configure Sun Mar 27 20:01:50 2005
+++ cyrus-imapd/patches/patch-configure Sun Apr 2 14:54:46 2006
@@ -1,6 +1,7 @@
---- configure.orig Tue Nov 23 19:55:47 2004
-+++ configure Sat Jan 22 13:12:28 2005
-@@ -3286,10 +3286,9 @@ CFLAGS=$save_CFLAGS
+$OpenBSD$
+--- configure.orig Sun Apr 2 14:49:05 2006
++++ configure Sun Apr 2 14:54:33 2006
+@@ -3486,9 +3486,7 @@ CFLAGS=$save_CFLAGS
fi
if test "$ac_cv_fpic" = "yes"; then
@@ -9,56 +10,27 @@
- FPIC_CFLAGS=""
+ CFLAGS="${CFLAGS} -fPIC"
fi
-+
echo "$as_me:$LINENO: result: $ac_cv_fpic" >&5
echo "${ECHO_T}$ac_cv_fpic" >&6
+@@ -7838,7 +7836,7 @@ echo "$as_me: error: Berkeley DB 3.x or
-@@ -4489,7 +4488,7 @@ if test "${ac_cv_lib_resolv_res_search+s
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lresolv $LIBS"
-+#LIBS="-lresolv $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h. */
-@@ -6728,7 +6727,7 @@ echo "$as_me: error: Berkeley DB 3.x or
-
- LIBS="${LIBS} ${BDB_LIBADD}"
+ LIBS="${BDB_LIBADD} ${LIBS}"
CPPFLAGS="${BDB_INCADD} ${CPPFLAGS}"
CYRUSDB_OBJS="$CYRUSDB_OBJS cyrusdb_berkeley.o"
-@@ -9639,7 +9638,7 @@ if test "${ac_cv_lib_resolv_res_search+s
+@@ -13581,7 +13579,7 @@ if test "${ac_cv_lib_gssapi_gss_unwrap+s
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
--LIBS="-lresolv $LIBS"
-+#LIBS="-lresolv $LIBS"
+-LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT}
${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS"
++LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lcrypto
${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS"
cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
/* confdefs.h. */
-@@ -11814,7 +11813,7 @@ if test "${ac_cv_lib_resolv_res_search+s
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lresolv $LIBS"
-+#LIBS="-lresolv $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h. */
-@@ -11892,7 +11891,7 @@ if test "${ac_cv_lib_gssapi_gss_unwrap+s
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lgssapi $GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT}
${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS"
-+LIBS="-lgssapi $GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lcrypto ${LIB_CRYPT}
${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h. */
-@@ -12242,8 +12241,8 @@ fi
+ _ACEOF
+@@ -13981,8 +13979,8 @@ fi
GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a
$gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a"
elif test "$gss_impl" = "heimdal"; then
CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL"
@@ -69,29 +41,7 @@
elif test "$gss_impl" = "cybersafe03"; then
# Version of CyberSafe with two libraries
CPPFLAGS="$CPPFLAGS -D$platform -I${gssapi}/appsec-sdk/include"
-@@ -12435,7 +12434,7 @@ if test "${ac_cv_lib_resolv_res_search+s
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lresolv $LIBS"
-+#LIBS="-lresolv $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- #line $LINENO "configure"
- /* confdefs.h. */
-@@ -12483,9 +12482,9 @@ LIBS=$ac_check_lib_save_LIBS
- fi
- echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_search" >&5
- echo "${ECHO_T}$ac_cv_lib_resolv_res_search" >&6
--if test $ac_cv_lib_resolv_res_search = yes; then
-- GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv"
--fi
-+#if test $ac_cv_lib_resolv_res_search = yes; then
-+# GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lresolv"
-+#fi
-
- SASL_MECHS="$SASL_MECHS libgssapiv2.la"
- SASL_STATIC_OBJS="$SASL_STATIC_OBJS ../plugins/gssapi.o"
-@@ -13727,6 +13726,8 @@ extern "C"
+@@ -16004,6 +16002,8 @@ extern "C"
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char request_init ();
diff -uNr --exclude=CVS
/usr/ports/mail/cyrus-imapd/patches/patch-contrib_drac_auth_patch
cyrus-imapd/patches/patch-contrib_drac_auth_patch
--- /usr/ports/mail/cyrus-imapd/patches/patch-contrib_drac_auth_patch Thu Jan
1 01:00:00 1970
+++ cyrus-imapd/patches/patch-contrib_drac_auth_patch Tue Apr 4 09:56:54 2006
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- contrib/drac_auth.patch.orig Fri Dec 19 21:01:58 2003
++++ contrib/drac_auth.patch Tue Apr 4 09:56:31 2006
+@@ -373,6 +373,6 @@ diff -u -r1.8 imapoptions
+ +{ "drachost", "localhost", STRING }
+ +/* Hostname of the RPC dracd server. */
+ +
+- { "duplicate_db", "berkeley-nosync", STRINGLIST("berkeley",
"berkeley-nosync", "skiplist")}
++ { "duplicate_db", "berkeley-nosync", STRINGLIST("berkeley",
"berkeley-nosync", "berkeley-hash", "berkeley-hash-nosync", "skiplist")}
+ /* The cyrusdb backend to use for the duplicate delivery suppression
+ and sieve. */
diff -uNr --exclude=CVS
/usr/ports/mail/cyrus-imapd/patches/patch-imap_fetchnews_c
cyrus-imapd/patches/patch-imap_fetchnews_c
--- /usr/ports/mail/cyrus-imapd/patches/patch-imap_fetchnews_c Thu Jan 1
01:00:00 1970
+++ cyrus-imapd/patches/patch-imap_fetchnews_c Tue Apr 4 09:22:06 2006
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- imap/fetchnews.c.orig Tue Apr 4 09:21:43 2006
++++ imap/fetchnews.c Tue Apr 4 09:21:59 2006
+@@ -433,7 +433,7 @@ int main(int argc, char *argv[])
+ We can't change this, otherwise we'd be incompatible
+ with an old localtime timestamp.
+ */
+- stamp -= timezone;
++ stamp -= (time_t) timezone;
+ }
+
+ if (!newnews) {
diff -uNr --exclude=CVS /usr/ports/mail/cyrus-imapd/patches/patch-imap_index_c
cyrus-imapd/patches/patch-imap_index_c
--- /usr/ports/mail/cyrus-imapd/patches/patch-imap_index_c Sun Mar 27
20:01:50 2005
+++ cyrus-imapd/patches/patch-imap_index_c Thu Jan 1 01:00:00 1970
@@ -1,17 +0,0 @@
-$OpenBSD: patch-imap_index_c,v 1.1.1.1 2005/03/27 18:01:50 alek Exp $
---- imap/index.c.orig Sat Jan 22 02:44:35 2005
-+++ imap/index.c Sat Jan 22 03:10:14 2005
-@@ -207,8 +207,13 @@ void index_closemailbox(struct mailbox *
- seendb = 0;
- }
- if (index_len) {
-+/*
-+ Always after index_closemailbox() goes mailbox_close()
-+ that frees the same memory area.
-+
- map_free(&index_base, &index_len);
- map_free(&cache_base, &cache_len);
-+ */
- index_len = cache_end = 0;
- }
- }
diff -uNr --exclude=CVS /usr/ports/mail/cyrus-imapd/pkg/PLIST
cyrus-imapd/pkg/PLIST
--- /usr/ports/mail/cyrus-imapd/pkg/PLIST Thu Feb 9 02:00:01 2006
+++ cyrus-imapd/pkg/PLIST Tue Apr 4 09:33:18 2006
@@ -41,8 +41,12 @@
include/cyrus/sysexits.h
include/cyrus/util.h
include/cyrus/xmalloc.h
+include/cyrus/xstrlcat.h
+include/cyrus/xstrlcpy.h
lib/libcyrus.a
lib/libcyrus_min.a
[EMAIL PROTECTED] libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/
[EMAIL PROTECTED] libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.8/perllocal.pod
libexec/cyrus-imapd/
libexec/cyrus-imapd/arbitron
libexec/cyrus-imapd/chk_cyrus
diff -uNr --exclude=CVS /usr/ports/mail/cyrus-imapd/pkg/PLIST-perl
cyrus-imapd/pkg/PLIST-perl
--- /usr/ports/mail/cyrus-imapd/pkg/PLIST-perl Sun Mar 27 20:01:50 2005
+++ cyrus-imapd/pkg/PLIST-perl Tue Apr 4 09:27:12 2006
@@ -3,8 +3,6 @@
bin/installsieve
bin/sieveshell
@comment libdata/perl5/${MACHINE_ARCH}-openbsd/
[EMAIL PROTECTED] libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.6/
[EMAIL PROTECTED] libdata/perl5/${MACHINE_ARCH}-openbsd/5.8.6/perllocal.pod
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/Cyrus/IMAP/
