6 files changed, 23 insertions, 85 deletions

diff --git a/mail/cyrus-imapd24/files/extra-patch-cmulocal::ucdsnmp.m4 b/mail/cyrus-imapd24/files/extra-patch-cmulocal::ucdsnmp.m4
deleted file mode 100644
index 829d92d23585..000000000000
--- a/mail/cyrus-imapd24/files/extra-patch-cmulocal::ucdsnmp.m4
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: cmulocal/ucdsnmp.m4
-diff -u cmulocal/ucdsnmp.m4.orig cmulocal/ucdsnmp.m4
---- cmulocal/ucdsnmp.m4.orig	Tue May 25 10:27:58 2004
-+++ cmulocal/ucdsnmp.m4	Sat Dec 10 16:34:09 2005
-@@ -31,9 +31,12 @@
- 
-     if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then
-       CPPFLAGS="$CPPFLAGS -I${SNMP_PREFIX}/include"
--      LIB_UCDSNMP=$SNMP_LIBS
-+      LIB_UCDSNMP="$SNMP_LIBS -lwrap"
-+      PERLLIBDIR=`$PERL -e 'use Config; print "$Config{archlibexp}/CORE";'`
-+      LDFLAGS_UCDSNMP="-L${PERLLIBDIR} -R${PERLLIBDIR}"
-       AC_DEFINE(HAVE_NETSNMP,1,[Do we have Net-SNMP support?])
-       AC_SUBST(LIB_UCDSNMP)
-+      AC_SUBST(LDFLAGS_UCDSNMP)
-       AC_MSG_RESULT(yes)
-     else
-       AC_MSG_RESULT(no)
-@@ -59,7 +62,7 @@
-     LIB_UCDSNMP=""
-     if test "$with_snmp" != no; then
-       AC_DEFINE(HAVE_UCDSNMP,1,[Do we have UCD-SNMP support?])
--      LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
-+      LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap"
-       AC_CHECK_LIB(rpm, rpmdbOpen,
- 		 LIB_UCDSNMP="${LIB_UCDSNMP} -lrpm -lpopt",,-lpopt)
-     fi
diff --git a/mail/cyrus-imapd24/files/imapd.conf b/mail/cyrus-imapd24/files/imapd.conf
index 3c73402c12de..60f1f06d2d00 100644
--- a/mail/cyrus-imapd24/files/imapd.conf
+++ b/mail/cyrus-imapd24/files/imapd.conf
@@ -262,7 +262,7 @@ sievedir: /var/imap/sieve
 # and sieve.
 # Allowed values: berkeley, berkeley-nosync, skiplist
 #
-#duplicate_db: berkeley-nosync
+#duplicate_db: skiplist
 
 # The cyrusdb backend to use for the mailbox list.
 # Allowed values: flat, berkeley, skiplist
@@ -272,7 +272,7 @@ sievedir: /var/imap/sieve
 # The cyrusdb backend to use for the pts cache.
 # Allowed values: berkeley, skiplist
 #
-#ptscache_db: berkeley
+#ptscache_db: skiplist
 
 # The cyrusdb backend to use for the seen state.
 # Allowed values: flat, berkeley, skiplist
@@ -283,7 +283,7 @@ sievedir: /var/imap/sieve
 # Allowed values:  berkeley, berkeley-nosync, berkeley-hash,
 # berkeley-hash-nosync, skiplist
 #
-#statuscache_db: berkeley-nosync
+#statuscache_db: skiplist
 
 # The cyrusdb backend to use for the subscriptions list.
 # Allowed values: flat, berkeley, skiplist
@@ -293,7 +293,7 @@ sievedir: /var/imap/sieve
 # The cyrusdb backend to use for the TLS cache.
 # Allowed values: berkeley, berkeley-nosync, skiplist
 #
-#tlscache_db: berkeley-nosync
+#tlscache_db: skiplist
 
 # Maximum SSF (security strength factor) that the server will allow a
 # client to negotiate.
diff --git a/mail/cyrus-imapd24/files/patch-configure b/mail/cyrus-imapd24/files/patch-configure
index df269d696b7a..20b75ceffceb 100644
--- a/mail/cyrus-imapd24/files/patch-configure
+++ b/mail/cyrus-imapd24/files/patch-configure
@@ -1,41 +1,13 @@
 Index: configure
 diff -u configure.orig configure
---- configure.orig	2009-12-21 23:20:56.817376076 +0900
-+++ configure	2009-12-21 23:21:49.196653299 +0900
-@@ -642,6 +642,7 @@
- IMAP_COM_ERR_LIBS
- LIB_RT
- LIB_UCDSNMP
-+LDFLAGS_UCDSNMP
- SNMP_CONFIG
- LIB_WRAP
- SNMP_SUBDIRS
-@@ -20173,7 +20174,7 @@
+--- configure.orig	2010-10-12 10:22:49.725848550 +0900
++++ configure	2010-10-12 11:00:05.295936060 +0900
+@@ -19686,7 +19686,7 @@
      PERL_SUBDIRS="imap"
      PERL="${with_perl}"
      case "${target_os}" in
 -        linux*|netbsd*)
 +        linux*|netbsd*|freebsd*)
-             { $as_echo "$as_me:$LINENO: checking for perl cccdlflags needed on \"${target_os}\"" >&5
- $as_echo_n "checking for perl cccdlflags needed on \"${target_os}\"... " >&6; }
+             echo "$as_me:$LINENO: checking for perl cccdlflags needed on \"${target_os}\"" >&5
+ echo $ECHO_N "checking for perl cccdlflags needed on \"${target_os}\"... $ECHO_C" >&6
              eval `${PERL} -V:cccdlflags`
-@@ -20749,7 +20750,9 @@
- 
-     if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then
-       CPPFLAGS="$CPPFLAGS -I${SNMP_PREFIX}/include"
--      LIB_UCDSNMP=$SNMP_LIBS
-+      LIB_UCDSNMP="$SNMP_LIBS -lwrap"
-+      PERLLIBDIR=`$PERL -e 'use Config; print "$Config{archlibexp}/CORE";'`
-+      LDFLAGS_UCDSNMP="-L${PERLLIBDIR} -R${PERLLIBDIR}"
- 
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_NETSNMP 1
-@@ -21135,7 +21138,7 @@
- #define HAVE_UCDSNMP 1
- _ACEOF
- 
--      LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
-+      LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap"
-       { $as_echo "$as_me:$LINENO: checking for rpmdbOpen in -lrpm" >&5
- $as_echo_n "checking for rpmdbOpen in -lrpm... " >&6; }
- if test "${ac_cv_lib_rpm_rpmdbOpen+set}" = set; then
diff --git a/mail/cyrus-imapd24/files/patch-imap::nntpd.c b/mail/cyrus-imapd24/files/patch-imap::nntpd.c
new file mode 100644
index 000000000000..08724551aab5
--- /dev/null
+++ b/mail/cyrus-imapd24/files/patch-imap::nntpd.c
@@ -0,0 +1,14 @@
+Index: imap/nntpd.c
+diff -u -p imap/nntpd.c.orig imap/nntpd.c
+--- imap/nntpd.c.orig	2010-10-12 06:35:47.000000000 +0900
++++ imap/nntpd.c	2010-10-12 12:18:23.780338789 +0900
+@@ -55,6 +55,9 @@
+ #ifdef HAVE_UNISTD_H
+ #include <unistd.h>
+ #endif
++#ifdef HAVE_STDINT_H
++#include <stdint.h>
++#endif
+ #include <stdio.h>
+ #include <errno.h>
+ #include <string.h>
diff --git a/mail/cyrus-imapd24/files/patch-lib::imapurl.c b/mail/cyrus-imapd24/files/patch-lib::imapurl.c
deleted file mode 100644
index 78bd54cd4fbd..000000000000
--- a/mail/cyrus-imapd24/files/patch-lib::imapurl.c
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: lib/imapurl.c
-diff -u -p lib/imapurl.c.orig lib/imapurl.c
---- lib/imapurl.c.orig	2009-03-31 13:11:22.000000000 +0900
-+++ lib/imapurl.c	2009-09-10 00:28:05.287769072 +0900
-@@ -50,6 +50,7 @@
- #include <errno.h>
- #include <limits.h>
- #include <time.h>
-+#include <sys/types.h>
- 
- #include "imapurl.h"
- #include "xmalloc.h"
diff --git a/mail/cyrus-imapd24/files/patch-master::Makefile.in b/mail/cyrus-imapd24/files/patch-master::Makefile.in
index c828109f247e..28b103ab7cb4 100644
--- a/mail/cyrus-imapd24/files/patch-master::Makefile.in
+++ b/mail/cyrus-imapd24/files/patch-master::Makefile.in
@@ -2,15 +2,6 @@ Index: master/Makefile.in
 diff -u master/Makefile.in.orig master/Makefile.in
 --- master/Makefile.in.orig	Sat May 29 03:03:05 2004
 +++ master/Makefile.in	Wed Jul 21 04:13:16 2004
-@@ -58,7 +58,7 @@
- DEPLIBS = @DEPLIBS@
- 
- CFLAGS = @CFLAGS@
--LDFLAGS = @LDFLAGS@ @COM_ERR_LDFLAGS@
-+LDFLAGS = @LDFLAGS_UCDSNMP@ @LDFLAGS@ @COM_ERR_LDFLAGS@
- LIBS = ../lib/libcyrus_min.a @LIB_UCDSNMP@ @LIBS@ @COM_ERR_LIBS@
- 
- SHELL = /bin/sh
 @@ -76,10 +76,10 @@
  all: $(PROGS) $(LOBJS)