Update to 2.3.13.

1 files changed, 32 insertions, 23 deletions

diff --git a/mail/cyrus-imapd24/files/patch-configure b/mail/cyrus-imapd24/files/patch-configure
index 73908ab528cf..75404c4d58d5 100644
--- a/mail/cyrus-imapd24/files/patch-configure
+++ b/mail/cyrus-imapd24/files/patch-configure
@@ -1,16 +1,16 @@
 Index: configure
 diff -u configure.orig configure
---- 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 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.
-@@ -16716,6 +16718,7 @@
+--- configure.orig	2008-10-09 23:46:22.000000000 +0900
++++ configure	2008-10-12 23:56:41.000000000 +0900
+@@ -733,6 +733,7 @@
+ LIB_WRAP
+ SNMP_CONFIG
+ LIB_UCDSNMP
++LDFLAGS_UCDSNMP
+ LIB_RT
+ IMAP_COM_ERR_LIBS
+ IMAP_LIBS
+@@ -18347,6 +18348,7 @@
      EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl"
      PERL_SUBDIRS="imap"
      PERL="${with_perl}"
@@ -18,7 +18,7 @@ diff -u configure.orig configure
      PERL_CCCDLFLAGS="$cccdlflags"
  
  fi
-@@ -17736,7 +17739,9 @@
+@@ -19329,7 +19331,9 @@
  
      if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then
        CPPFLAGS="$CPPFLAGS -I${SNMP_PREFIX}/include"
@@ -29,20 +29,29 @@ diff -u configure.orig configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_NETSNMP 1
-@@ -17985,7 +17990,7 @@
+@@ -19563,7 +19567,7 @@
  #define HAVE_UCDSNMP 1
  _ACEOF
  
 -      LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
 +      LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap"
-       echo "$as_me:$LINENO: checking for rpmdbOpen in -lrpm" >&5
- echo $ECHO_N "checking for rpmdbOpen in -lrpm... $ECHO_C" >&6
+       { 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
-@@ -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
-+s,@LDFLAGS_UCDSNMP@,$LDFLAGS_UCDSNMP,;t t
- s,@LIB_RT@,$LIB_RT,;t t
- s,@IMAP_COM_ERR_LIBS@,$IMAP_COM_ERR_LIBS,;t t
- s,@IMAP_LIBS@,$IMAP_LIBS,;t t
+@@ -20470,6 +20474,7 @@
+ LIB_WRAP!$LIB_WRAP$ac_delim
+ SNMP_CONFIG!$SNMP_CONFIG$ac_delim
+ LIB_UCDSNMP!$LIB_UCDSNMP$ac_delim
++LDFLAGS_UCDSNMP!$LDFLAGS_UCDSNMP$ac_delim
+ LIB_RT!$LIB_RT$ac_delim
+ IMAP_COM_ERR_LIBS!$IMAP_COM_ERR_LIBS$ac_delim
+ IMAP_LIBS!$IMAP_LIBS$ac_delim
+@@ -20478,7 +20483,7 @@
+ LTLIBOBJS!$LTLIBOBJS$ac_delim
+ _ACEOF
+ 
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 29; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 30; then
+     break
+   elif $ac_last_try; then
+     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5