diff options
author | Hajimu UMEMOTO <ume@FreeBSD.org> | 2006-05-25 03:33:33 +0000 |
---|---|---|
committer | Hajimu UMEMOTO <ume@FreeBSD.org> | 2006-05-25 03:33:33 +0000 |
commit | 874087aab9a427b03b1f245118059def78aea19b (patch) | |
tree | 15e89b6bac35f26a09407dc9c35935480f1e375f /mail | |
parent | Fix unfetchable problem. (diff) |
Update to 2.3.5.
Notes
Notes:
svn path=/head/; revision=163337
Diffstat (limited to 'mail')
-rw-r--r-- | mail/cyrus-imapd23/Makefile | 2 | ||||
-rw-r--r-- | mail/cyrus-imapd23/distinfo | 6 | ||||
-rw-r--r-- | mail/cyrus-imapd23/files/extra-patch-cmulocal::berkdb.m4 | 12 | ||||
-rw-r--r-- | mail/cyrus-imapd23/files/patch-configure | 22 | ||||
-rw-r--r-- | mail/cyrus-imapd23/files/patch-imap::fetchnews.c | 37 | ||||
-rw-r--r-- | mail/cyrus-imapd23/pkg-plist | 3 | ||||
-rw-r--r-- | mail/cyrus-imapd24/Makefile | 2 | ||||
-rw-r--r-- | mail/cyrus-imapd24/distinfo | 6 | ||||
-rw-r--r-- | mail/cyrus-imapd24/files/extra-patch-cmulocal::berkdb.m4 | 12 | ||||
-rw-r--r-- | mail/cyrus-imapd24/files/patch-configure | 22 | ||||
-rw-r--r-- | mail/cyrus-imapd24/files/patch-imap::fetchnews.c | 37 | ||||
-rw-r--r-- | mail/cyrus-imapd24/pkg-plist | 3 |
12 files changed, 48 insertions, 116 deletions
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile index 628e3ae85ce1..14ea5dd5b82a 100644 --- a/mail/cyrus-imapd23/Makefile +++ b/mail/cyrus-imapd23/Makefile @@ -6,7 +6,7 @@ # PORTNAME= cyrus-imapd -PORTVERSION= 2.3.3 +PORTVERSION= 2.3.5 #PORTREVISION= 0 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ diff --git a/mail/cyrus-imapd23/distinfo b/mail/cyrus-imapd23/distinfo index cb6bbafa83b6..b5bbea07d502 100644 --- a/mail/cyrus-imapd23/distinfo +++ b/mail/cyrus-imapd23/distinfo @@ -1,3 +1,3 @@ -MD5 (cyrus-imapd-2.3.3.tar.gz) = e2e337270b2e56ba64cd99158fed1efc -SHA256 (cyrus-imapd-2.3.3.tar.gz) = 69f862b952e8f9681ddfdeb0fc54ca399e646759412ae380f8922bc97ade897d -SIZE (cyrus-imapd-2.3.3.tar.gz) = 2223824 +MD5 (cyrus-imapd-2.3.5.tar.gz) = 1a76b0e6c4617aa1ea78591e117b26f6 +SHA256 (cyrus-imapd-2.3.5.tar.gz) = c674b186e899b793bcd4965ce8e6095e51e581108e9e4ce3271937d9a11de3b0 +SIZE (cyrus-imapd-2.3.5.tar.gz) = 2250010 diff --git a/mail/cyrus-imapd23/files/extra-patch-cmulocal::berkdb.m4 b/mail/cyrus-imapd23/files/extra-patch-cmulocal::berkdb.m4 index 72e3b641475d..27c0f42453a8 100644 --- a/mail/cyrus-imapd23/files/extra-patch-cmulocal::berkdb.m4 +++ b/mail/cyrus-imapd23/files/extra-patch-cmulocal::berkdb.m4 @@ -1,13 +1,13 @@ Index: cmulocal/berkdb.m4 diff -u cmulocal/berkdb.m4.orig cmulocal/berkdb.m4 ---- cmulocal/berkdb.m4.orig Sat Nov 27 06:41:58 2004 -+++ cmulocal/berkdb.m4 Sat Dec 10 16:28:44 2005 -@@ -212,10 +212,11 @@ +--- cmulocal/berkdb.m4.orig Tue May 23 22:27:15 2006 ++++ cmulocal/berkdb.m4 Wed May 24 00:08:16 2006 +@@ -213,10 +213,11 @@ fi saved_LIBS=$LIBS -- for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db -+ for dbname in ${with_bdb} db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db +- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db ++ for dbname in ${with_bdb} db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db do LIBS="$saved_LIBS -l$dbname" - AC_TRY_LINK([#include <db.h>], @@ -16,7 +16,7 @@ diff -u cmulocal/berkdb.m4.orig cmulocal/berkdb.m4 [db_create(NULL, NULL, 0);], BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db, dblib="no") -@@ -223,7 +224,8 @@ +@@ -224,7 +225,8 @@ done if test "$dblib" = "no"; then LIBS="$saved_LIBS -ldb" diff --git a/mail/cyrus-imapd23/files/patch-configure b/mail/cyrus-imapd23/files/patch-configure index b88c0c0e0cde..05612707d217 100644 --- a/mail/cyrus-imapd23/files/patch-configure +++ b/mail/cyrus-imapd23/files/patch-configure @@ -1,25 +1,25 @@ Index: configure diff -u configure.orig configure ---- configure.orig Tue Dec 6 01:00:41 2005 -+++ configure Sat Dec 10 14:01:36 2005 +--- configure.orig Tue May 23 22:57:47 2006 ++++ configure Wed May 24 00:01:31 2006 @@ -310,6 +310,7 @@ #endif" - ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAKEDEPEND cyrus_prefix service_path cyrus_user cyrus_group CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP AWK LIBOBJS LIB_SOCKET IPV6_OBJS PRE_SUBDIRS EXTRA_SUBDIRS DEPLIBS LOCALDEFS BDB_INC BDB_LIB CYRUSDB_OBJS SIEVE_OBJS SIEVE_LIBS SIEVE_CPPFLAGS YACC LEX LEXLIB LEX_OUTPUT_ROOT SIEVE_SUBDIRS WITH_NONBLOCK WITH_GMTOFF WITH_MAP WITH_LOCK cyrus_sigveclib AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS IMAP_PROGS COMPILE_ET COM_ERR_LIBS COM_ERR_LDFLAGS COM_ERR_CPPFLAGS LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_DYN_SASL DYNSASLFLAGS LIB_SASL SASLFLAGS PERL PERL_CCCDLFLAGS MD5OBJ SNMP_SUBDIRS LIB_WRAP SNMP_CONFIG LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS' + ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAKEDEPEND cyrus_prefix service_path cyrus_user cyrus_group CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP AWK LIBOBJS LIB_SOCKET IPV6_OBJS PRE_SUBDIRS EXTRA_SUBDIRS DEPLIBS LOCALDEFS BDB_INC BDB_LIB CYRUSDB_OBJS SIEVE_OBJS SIEVE_LIBS SIEVE_CPPFLAGS YACC LEX LEXLIB LEX_OUTPUT_ROOT SIEVE_SUBDIRS WITH_NONBLOCK WITH_GMTOFF WITH_MAP WITH_LOCK cyrus_sigveclib AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS IMAP_PROGS COMPILE_ET COM_ERR_LIBS COM_ERR_LDFLAGS COM_ERR_CPPFLAGS LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_DYN_SASL DYNSASLFLAGS LIB_SASL SASLFLAGS PERL PERL_CCCDLFLAGS MD5OBJ SNMP_SUBDIRS CMU_LIB_SUBDIR LIB_WRAP SNMP_CONFIG LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS' +ac_subst_vars="${ac_subst_vars} LDFLAGS_UCDSNMP" ac_subst_files='' # Initialize some variables set by options. -@@ -8776,7 +8777,7 @@ +@@ -8768,7 +8769,7 @@ fi saved_LIBS=$LIBS -- for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db -+ for dbname in ${with_bdb} db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db +- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db ++ for dbname in ${with_bdb} db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db do LIBS="$saved_LIBS -l$dbname" cat >conftest.$ac_ext <<_ACEOF -@@ -8785,6 +8786,7 @@ +@@ -8777,6 +8778,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -27,7 +27,7 @@ diff -u configure.orig configure #include <db.h> int main () -@@ -16659,6 +16661,7 @@ +@@ -16716,6 +16718,7 @@ EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl" PERL_SUBDIRS="imap" PERL="${with_perl}" @@ -35,7 +35,7 @@ diff -u configure.orig configure PERL_CCCDLFLAGS="$cccdlflags" fi -@@ -17233,7 +17236,9 @@ +@@ -17736,7 +17739,9 @@ if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then CPPFLAGS="$CPPFLAGS -I${SNMP_PREFIX}/include" @@ -46,7 +46,7 @@ diff -u configure.orig configure cat >>confdefs.h <<\_ACEOF #define HAVE_NETSNMP 1 -@@ -17482,7 +17487,7 @@ +@@ -17985,7 +17990,7 @@ #define HAVE_UCDSNMP 1 _ACEOF @@ -55,7 +55,7 @@ diff -u configure.orig configure echo "$as_me:$LINENO: checking for rpmdbOpen in -lrpm" >&5 echo $ECHO_N "checking for rpmdbOpen in -lrpm... $ECHO_C" >&6 if test "${ac_cv_lib_rpm_rpmdbOpen+set}" = set; then -@@ -18306,6 +18311,7 @@ +@@ -18810,6 +18815,7 @@ s,@LIB_WRAP@,$LIB_WRAP,;t t s,@SNMP_CONFIG@,$SNMP_CONFIG,;t t s,@LIB_UCDSNMP@,$LIB_UCDSNMP,;t t diff --git a/mail/cyrus-imapd23/files/patch-imap::fetchnews.c b/mail/cyrus-imapd23/files/patch-imap::fetchnews.c deleted file mode 100644 index 4156a1e2eec6..000000000000 --- a/mail/cyrus-imapd23/files/patch-imap::fetchnews.c +++ /dev/null @@ -1,37 +0,0 @@ -Index: imap/fetchnews.c -diff -u -p imap/fetchnews.c.orig imap/fetchnews.c ---- imap/fetchnews.c.orig Wed Mar 23 09:40:11 2005 -+++ imap/fetchnews.c Fri Apr 14 23:36:14 2006 -@@ -60,6 +60,7 @@ - #include "cyrusdb.h" - #include "exitcodes.h" - #include "global.h" -+#include "gmtoff.h" - #include "lock.h" - #include "prot.h" - #include "xmalloc.h" -@@ -388,6 +389,7 @@ int main(int argc, char *argv[]) - &ctime.tm_hour, &ctime.tm_min, &ctime.tm_sec); - ctime.tm_year -= 1900; - ctime.tm_mon--; -+ ctime.tm_isdst = -1; - - /* read the previous timestamp */ - if (!sfile[0]) { -@@ -417,6 +419,7 @@ int main(int argc, char *argv[]) - /* ask for new articles */ - if (stamp) stamp -= 180; /* adjust back 3 minutes */ - ptime = gmtime(&stamp); -+ ptime->tm_isdst = -1; - strftime(buf, sizeof(buf), datefmt, ptime); - prot_printf(pout, "NEWNEWS %s %s GMT\r\n", wildmat, buf); - -@@ -433,7 +436,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 += gmtoff_of(&ctime, stamp); - } - - if (!newnews) { diff --git a/mail/cyrus-imapd23/pkg-plist b/mail/cyrus-imapd23/pkg-plist index c66270b2e372..f40c35d9494a 100644 --- a/mail/cyrus-imapd23/pkg-plist +++ b/mail/cyrus-imapd23/pkg-plist @@ -24,6 +24,7 @@ cyrus/bin/fud cyrus/bin/imapd cyrus/bin/ipurge cyrus/bin/lmtpd +cyrus/bin/lmtpproxyd %%REPLICATION%%cyrus/bin/make_md5 cyrus/bin/masssievec cyrus/bin/master @@ -86,6 +87,8 @@ include/cyrus/stristr.h include/cyrus/sysexits.h include/cyrus/util.h include/cyrus/xmalloc.h +include/cyrus/xstrlcat.h +include/cyrus/xstrlcpy.h lib/libcyrus_min.a lib/libcyrus.a %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile index 628e3ae85ce1..14ea5dd5b82a 100644 --- a/mail/cyrus-imapd24/Makefile +++ b/mail/cyrus-imapd24/Makefile @@ -6,7 +6,7 @@ # PORTNAME= cyrus-imapd -PORTVERSION= 2.3.3 +PORTVERSION= 2.3.5 #PORTREVISION= 0 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ diff --git a/mail/cyrus-imapd24/distinfo b/mail/cyrus-imapd24/distinfo index cb6bbafa83b6..b5bbea07d502 100644 --- a/mail/cyrus-imapd24/distinfo +++ b/mail/cyrus-imapd24/distinfo @@ -1,3 +1,3 @@ -MD5 (cyrus-imapd-2.3.3.tar.gz) = e2e337270b2e56ba64cd99158fed1efc -SHA256 (cyrus-imapd-2.3.3.tar.gz) = 69f862b952e8f9681ddfdeb0fc54ca399e646759412ae380f8922bc97ade897d -SIZE (cyrus-imapd-2.3.3.tar.gz) = 2223824 +MD5 (cyrus-imapd-2.3.5.tar.gz) = 1a76b0e6c4617aa1ea78591e117b26f6 +SHA256 (cyrus-imapd-2.3.5.tar.gz) = c674b186e899b793bcd4965ce8e6095e51e581108e9e4ce3271937d9a11de3b0 +SIZE (cyrus-imapd-2.3.5.tar.gz) = 2250010 diff --git a/mail/cyrus-imapd24/files/extra-patch-cmulocal::berkdb.m4 b/mail/cyrus-imapd24/files/extra-patch-cmulocal::berkdb.m4 index 72e3b641475d..27c0f42453a8 100644 --- a/mail/cyrus-imapd24/files/extra-patch-cmulocal::berkdb.m4 +++ b/mail/cyrus-imapd24/files/extra-patch-cmulocal::berkdb.m4 @@ -1,13 +1,13 @@ Index: cmulocal/berkdb.m4 diff -u cmulocal/berkdb.m4.orig cmulocal/berkdb.m4 ---- cmulocal/berkdb.m4.orig Sat Nov 27 06:41:58 2004 -+++ cmulocal/berkdb.m4 Sat Dec 10 16:28:44 2005 -@@ -212,10 +212,11 @@ +--- cmulocal/berkdb.m4.orig Tue May 23 22:27:15 2006 ++++ cmulocal/berkdb.m4 Wed May 24 00:08:16 2006 +@@ -213,10 +213,11 @@ fi saved_LIBS=$LIBS -- for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db -+ for dbname in ${with_bdb} db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db +- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db ++ for dbname in ${with_bdb} db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db do LIBS="$saved_LIBS -l$dbname" - AC_TRY_LINK([#include <db.h>], @@ -16,7 +16,7 @@ diff -u cmulocal/berkdb.m4.orig cmulocal/berkdb.m4 [db_create(NULL, NULL, 0);], BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db, dblib="no") -@@ -223,7 +224,8 @@ +@@ -224,7 +225,8 @@ done if test "$dblib" = "no"; then LIBS="$saved_LIBS -ldb" diff --git a/mail/cyrus-imapd24/files/patch-configure b/mail/cyrus-imapd24/files/patch-configure index b88c0c0e0cde..05612707d217 100644 --- a/mail/cyrus-imapd24/files/patch-configure +++ b/mail/cyrus-imapd24/files/patch-configure @@ -1,25 +1,25 @@ Index: configure diff -u configure.orig configure ---- configure.orig Tue Dec 6 01:00:41 2005 -+++ configure Sat Dec 10 14:01:36 2005 +--- configure.orig Tue May 23 22:57:47 2006 ++++ configure Wed May 24 00:01:31 2006 @@ -310,6 +310,7 @@ #endif" - ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAKEDEPEND cyrus_prefix service_path cyrus_user cyrus_group CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP AWK LIBOBJS LIB_SOCKET IPV6_OBJS PRE_SUBDIRS EXTRA_SUBDIRS DEPLIBS LOCALDEFS BDB_INC BDB_LIB CYRUSDB_OBJS SIEVE_OBJS SIEVE_LIBS SIEVE_CPPFLAGS YACC LEX LEXLIB LEX_OUTPUT_ROOT SIEVE_SUBDIRS WITH_NONBLOCK WITH_GMTOFF WITH_MAP WITH_LOCK cyrus_sigveclib AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS IMAP_PROGS COMPILE_ET COM_ERR_LIBS COM_ERR_LDFLAGS COM_ERR_CPPFLAGS LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_DYN_SASL DYNSASLFLAGS LIB_SASL SASLFLAGS PERL PERL_CCCDLFLAGS MD5OBJ SNMP_SUBDIRS LIB_WRAP SNMP_CONFIG LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS' + ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAKEDEPEND cyrus_prefix service_path cyrus_user cyrus_group CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP AWK LIBOBJS LIB_SOCKET IPV6_OBJS PRE_SUBDIRS EXTRA_SUBDIRS DEPLIBS LOCALDEFS BDB_INC BDB_LIB CYRUSDB_OBJS SIEVE_OBJS SIEVE_LIBS SIEVE_CPPFLAGS YACC LEX LEXLIB LEX_OUTPUT_ROOT SIEVE_SUBDIRS WITH_NONBLOCK WITH_GMTOFF WITH_MAP WITH_LOCK cyrus_sigveclib AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS IMAP_PROGS COMPILE_ET COM_ERR_LIBS COM_ERR_LDFLAGS COM_ERR_CPPFLAGS LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_DYN_SASL DYNSASLFLAGS LIB_SASL SASLFLAGS PERL PERL_CCCDLFLAGS MD5OBJ SNMP_SUBDIRS CMU_LIB_SUBDIR LIB_WRAP SNMP_CONFIG LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS' +ac_subst_vars="${ac_subst_vars} LDFLAGS_UCDSNMP" ac_subst_files='' # Initialize some variables set by options. -@@ -8776,7 +8777,7 @@ +@@ -8768,7 +8769,7 @@ fi saved_LIBS=$LIBS -- for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db -+ for dbname in ${with_bdb} db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db +- for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db ++ for dbname in ${with_bdb} db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db do LIBS="$saved_LIBS -l$dbname" cat >conftest.$ac_ext <<_ACEOF -@@ -8785,6 +8786,7 @@ +@@ -8777,6 +8778,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -27,7 +27,7 @@ diff -u configure.orig configure #include <db.h> int main () -@@ -16659,6 +16661,7 @@ +@@ -16716,6 +16718,7 @@ EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl" PERL_SUBDIRS="imap" PERL="${with_perl}" @@ -35,7 +35,7 @@ diff -u configure.orig configure PERL_CCCDLFLAGS="$cccdlflags" fi -@@ -17233,7 +17236,9 @@ +@@ -17736,7 +17739,9 @@ if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then CPPFLAGS="$CPPFLAGS -I${SNMP_PREFIX}/include" @@ -46,7 +46,7 @@ diff -u configure.orig configure cat >>confdefs.h <<\_ACEOF #define HAVE_NETSNMP 1 -@@ -17482,7 +17487,7 @@ +@@ -17985,7 +17990,7 @@ #define HAVE_UCDSNMP 1 _ACEOF @@ -55,7 +55,7 @@ diff -u configure.orig configure echo "$as_me:$LINENO: checking for rpmdbOpen in -lrpm" >&5 echo $ECHO_N "checking for rpmdbOpen in -lrpm... $ECHO_C" >&6 if test "${ac_cv_lib_rpm_rpmdbOpen+set}" = set; then -@@ -18306,6 +18311,7 @@ +@@ -18810,6 +18815,7 @@ s,@LIB_WRAP@,$LIB_WRAP,;t t s,@SNMP_CONFIG@,$SNMP_CONFIG,;t t s,@LIB_UCDSNMP@,$LIB_UCDSNMP,;t t diff --git a/mail/cyrus-imapd24/files/patch-imap::fetchnews.c b/mail/cyrus-imapd24/files/patch-imap::fetchnews.c deleted file mode 100644 index 4156a1e2eec6..000000000000 --- a/mail/cyrus-imapd24/files/patch-imap::fetchnews.c +++ /dev/null @@ -1,37 +0,0 @@ -Index: imap/fetchnews.c -diff -u -p imap/fetchnews.c.orig imap/fetchnews.c ---- imap/fetchnews.c.orig Wed Mar 23 09:40:11 2005 -+++ imap/fetchnews.c Fri Apr 14 23:36:14 2006 -@@ -60,6 +60,7 @@ - #include "cyrusdb.h" - #include "exitcodes.h" - #include "global.h" -+#include "gmtoff.h" - #include "lock.h" - #include "prot.h" - #include "xmalloc.h" -@@ -388,6 +389,7 @@ int main(int argc, char *argv[]) - &ctime.tm_hour, &ctime.tm_min, &ctime.tm_sec); - ctime.tm_year -= 1900; - ctime.tm_mon--; -+ ctime.tm_isdst = -1; - - /* read the previous timestamp */ - if (!sfile[0]) { -@@ -417,6 +419,7 @@ int main(int argc, char *argv[]) - /* ask for new articles */ - if (stamp) stamp -= 180; /* adjust back 3 minutes */ - ptime = gmtime(&stamp); -+ ptime->tm_isdst = -1; - strftime(buf, sizeof(buf), datefmt, ptime); - prot_printf(pout, "NEWNEWS %s %s GMT\r\n", wildmat, buf); - -@@ -433,7 +436,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 += gmtoff_of(&ctime, stamp); - } - - if (!newnews) { diff --git a/mail/cyrus-imapd24/pkg-plist b/mail/cyrus-imapd24/pkg-plist index c66270b2e372..f40c35d9494a 100644 --- a/mail/cyrus-imapd24/pkg-plist +++ b/mail/cyrus-imapd24/pkg-plist @@ -24,6 +24,7 @@ cyrus/bin/fud cyrus/bin/imapd cyrus/bin/ipurge cyrus/bin/lmtpd +cyrus/bin/lmtpproxyd %%REPLICATION%%cyrus/bin/make_md5 cyrus/bin/masssievec cyrus/bin/master @@ -86,6 +87,8 @@ include/cyrus/stristr.h include/cyrus/sysexits.h include/cyrus/util.h include/cyrus/xmalloc.h +include/cyrus/xstrlcat.h +include/cyrus/xstrlcpy.h lib/libcyrus_min.a lib/libcyrus.a %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm |