From fd095c476678013ef266338b51b424ee67795ab2 Mon Sep 17 00:00:00 2001 From: Hajimu UMEMOTO Date: Mon, 26 Jul 2004 20:39:54 +0000 Subject: [PATCH] - Update to 2.2.7. - Fix build problem with WITH_SNMP_5 on FreeBSD 4.X with perl5.8 installed. Though we need 5.8's libperl.so, /usr/lib/libperl.so was linked. [1] Reported by: Thomas Vogt [1] --- mail/cyrus-imapd22/Makefile | 2 +- mail/cyrus-imapd22/distinfo | 4 +-- .../files/extra-patch-aclocal.m4 | 13 +++++--- mail/cyrus-imapd22/files/patch-ac | 32 +++++++++++++++---- mail/cyrus-imapd22/files/patch-dg | 14 ++++---- .../files/patch-master::Makefile.in | 15 +++++++-- mail/cyrus-imapd23/Makefile | 2 +- mail/cyrus-imapd23/distinfo | 4 +-- .../files/extra-patch-aclocal.m4 | 13 +++++--- mail/cyrus-imapd23/files/patch-ac | 32 +++++++++++++++---- mail/cyrus-imapd23/files/patch-dg | 14 ++++---- .../files/patch-master::Makefile.in | 15 +++++++-- mail/cyrus-imapd24/Makefile | 2 +- mail/cyrus-imapd24/distinfo | 4 +-- .../files/extra-patch-aclocal.m4 | 13 +++++--- mail/cyrus-imapd24/files/patch-ac | 32 +++++++++++++++---- mail/cyrus-imapd24/files/patch-dg | 14 ++++---- .../files/patch-master::Makefile.in | 15 +++++++-- 18 files changed, 168 insertions(+), 72 deletions(-) diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile index b666dceb3f5e..17e63d464ccf 100644 --- a/mail/cyrus-imapd22/Makefile +++ b/mail/cyrus-imapd22/Makefile @@ -6,7 +6,7 @@ # PORTNAME= cyrus-imapd -PORTVERSION= 2.2.6 +PORTVERSION= 2.2.7 #PORTREVISION= 0 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \ diff --git a/mail/cyrus-imapd22/distinfo b/mail/cyrus-imapd22/distinfo index 29a0ca8b2e89..70fd9a96a9bd 100644 --- a/mail/cyrus-imapd22/distinfo +++ b/mail/cyrus-imapd22/distinfo @@ -1,2 +1,2 @@ -MD5 (cyrus-imapd-2.2.6.tar.gz) = 6b83b27146bea34ad700f0ef4f695be7 -SIZE (cyrus-imapd-2.2.6.tar.gz) = 1933281 +MD5 (cyrus-imapd-2.2.7.tar.gz) = 5546b13ffb43af51246f751e85b8a4ea +SIZE (cyrus-imapd-2.2.7.tar.gz) = 1942391 diff --git a/mail/cyrus-imapd22/files/extra-patch-aclocal.m4 b/mail/cyrus-imapd22/files/extra-patch-aclocal.m4 index 0fb00562c04e..fc32b3504419 100644 --- a/mail/cyrus-imapd22/files/extra-patch-aclocal.m4 +++ b/mail/cyrus-imapd22/files/extra-patch-aclocal.m4 @@ -1,7 +1,7 @@ Index: aclocal.m4 diff -u aclocal.m4.orig aclocal.m4 ---- aclocal.m4.orig Sat May 29 03:08:14 2004 -+++ aclocal.m4 Sat May 29 07:10:54 2004 +--- aclocal.m4.orig Fri Jun 18 03:55:46 2004 ++++ aclocal.m4 Wed Jul 21 04:23:48 2004 @@ -505,7 +505,7 @@ BDB_LIBADD="" fi @@ -20,16 +20,21 @@ diff -u aclocal.m4.orig aclocal.m4 dblib="no") CPPFLAGS=$cmu_save_CPPFLAGS -@@ -1806,7 +1806,7 @@ +@@ -1806,9 +1806,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) -@@ -1834,7 +1834,7 @@ + else + AC_MSG_RESULT(no) +@@ -1834,7 +1837,7 @@ LIB_UCDSNMP="" if test "$with_snmp" != no; then AC_DEFINE(HAVE_UCDSNMP,1,[Do we have UCD-SNMP support?]) diff --git a/mail/cyrus-imapd22/files/patch-ac b/mail/cyrus-imapd22/files/patch-ac index 4f6476d7498a..a050484fa3b9 100644 --- a/mail/cyrus-imapd22/files/patch-ac +++ b/mail/cyrus-imapd22/files/patch-ac @@ -1,8 +1,16 @@ Index: configure diff -u configure.orig configure ---- configure.orig Sat May 29 03:08:17 2004 -+++ configure Sat May 29 06:43:27 2004 -@@ -6551,7 +6551,7 @@ +--- configure.orig Fri Jun 18 03:55:49 2004 ++++ configure Wed Jul 21 04:21:05 2004 +@@ -309,6 +309,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 WITH_AUTH 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 WITH_PTS AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS WITH_IDLE 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="${ac_subst_vars} LDFLAGS_UCDSNMP" + ac_subst_files='' + + # Initialize some variables set by options. +@@ -6551,7 +6552,7 @@ BDB_LIBADD="" fi @@ -11,7 +19,7 @@ diff -u configure.orig configure do as_ac_Lib=`echo "ac_cv_lib_$dbname''_db_create" | $as_tr_sh` echo "$as_me:$LINENO: checking for db_create in -l$dbname" >&5 -@@ -6575,11 +6575,11 @@ +@@ -6575,11 +6576,11 @@ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ @@ -25,7 +33,7 @@ diff -u configure.orig configure ; return 0; } -@@ -13502,6 +13502,7 @@ +@@ -13502,6 +13503,7 @@ EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl" PERL_SUBDIRS="imap" PERL="${with_perl}" @@ -33,16 +41,18 @@ diff -u configure.orig configure PERL_CCCDLFLAGS="$cccdlflags" fi -@@ -14020,7 +14021,7 @@ +@@ -14020,7 +14022,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 -@@ -14251,7 +14252,7 @@ +@@ -14251,7 +14255,7 @@ #define HAVE_UCDSNMP 1 _ACEOF @@ -51,3 +61,11 @@ 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 +@@ -15067,6 +15071,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 diff --git a/mail/cyrus-imapd22/files/patch-dg b/mail/cyrus-imapd22/files/patch-dg index 5c54d21287d8..80dc928b96d0 100644 --- a/mail/cyrus-imapd22/files/patch-dg +++ b/mail/cyrus-imapd22/files/patch-dg @@ -1,7 +1,7 @@ Index: tools/mkimap diff -u tools/mkimap.orig tools/mkimap ---- tools/mkimap.orig Mon Mar 10 03:39:36 2003 -+++ tools/mkimap Fri Mar 21 17:24:10 2003 +--- tools/mkimap.orig Wed Jun 30 03:16:54 2004 ++++ tools/mkimap Tue Jul 27 04:47:43 2004 @@ -61,6 +61,9 @@ $imapdconf = shift || "/etc/imapd.conf"; @@ -19,18 +19,18 @@ diff -u tools/mkimap.orig tools/mkimap +mkdir $d, 0755; chdir $d or die "couldn't change to $d"; - mkdir "proc", 0755; + mkdir "proc", 0755 || warn "can't create $d/proc: $!"; @@ -95,11 +99,14 @@ - mkdir "msg", 0755; - mkdir "ptclient", 0755; + mkdir "msg", 0755 || warn "can't create $d/msg: $!"; + mkdir "ptclient", 0755 || warn "can't create $d/ptclient: $!"; +system "/usr/sbin/chown -R $cyrus_user:$cyrus_group ."; + while ($part = shift @parts) { print "creating $part...\n"; - mkdir $part, 0755; + mkdir $part, 0755 || warn "can't create $part: $!"; chdir $part or die "couldn't change to partition $part"; - mkdir "stage.", 0755; + mkdir "stage.", 0755 || warn "can't create $part/stage.: $!"; + system "/usr/sbin/chown -R $cyrus_user:$cyrus_group $part"; } diff --git a/mail/cyrus-imapd22/files/patch-master::Makefile.in b/mail/cyrus-imapd22/files/patch-master::Makefile.in index 5b421718655a..c828109f247e 100644 --- a/mail/cyrus-imapd22/files/patch-master::Makefile.in +++ b/mail/cyrus-imapd22/files/patch-master::Makefile.in @@ -1,8 +1,17 @@ Index: master/Makefile.in diff -u master/Makefile.in.orig master/Makefile.in ---- master/Makefile.in.orig Wed Nov 12 13:02:03 2003 -+++ master/Makefile.in Thu Mar 11 01:18:52 2004 -@@ -75,10 +75,10 @@ +--- 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) install: diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile index b666dceb3f5e..17e63d464ccf 100644 --- a/mail/cyrus-imapd23/Makefile +++ b/mail/cyrus-imapd23/Makefile @@ -6,7 +6,7 @@ # PORTNAME= cyrus-imapd -PORTVERSION= 2.2.6 +PORTVERSION= 2.2.7 #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 29a0ca8b2e89..70fd9a96a9bd 100644 --- a/mail/cyrus-imapd23/distinfo +++ b/mail/cyrus-imapd23/distinfo @@ -1,2 +1,2 @@ -MD5 (cyrus-imapd-2.2.6.tar.gz) = 6b83b27146bea34ad700f0ef4f695be7 -SIZE (cyrus-imapd-2.2.6.tar.gz) = 1933281 +MD5 (cyrus-imapd-2.2.7.tar.gz) = 5546b13ffb43af51246f751e85b8a4ea +SIZE (cyrus-imapd-2.2.7.tar.gz) = 1942391 diff --git a/mail/cyrus-imapd23/files/extra-patch-aclocal.m4 b/mail/cyrus-imapd23/files/extra-patch-aclocal.m4 index 0fb00562c04e..fc32b3504419 100644 --- a/mail/cyrus-imapd23/files/extra-patch-aclocal.m4 +++ b/mail/cyrus-imapd23/files/extra-patch-aclocal.m4 @@ -1,7 +1,7 @@ Index: aclocal.m4 diff -u aclocal.m4.orig aclocal.m4 ---- aclocal.m4.orig Sat May 29 03:08:14 2004 -+++ aclocal.m4 Sat May 29 07:10:54 2004 +--- aclocal.m4.orig Fri Jun 18 03:55:46 2004 ++++ aclocal.m4 Wed Jul 21 04:23:48 2004 @@ -505,7 +505,7 @@ BDB_LIBADD="" fi @@ -20,16 +20,21 @@ diff -u aclocal.m4.orig aclocal.m4 dblib="no") CPPFLAGS=$cmu_save_CPPFLAGS -@@ -1806,7 +1806,7 @@ +@@ -1806,9 +1806,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) -@@ -1834,7 +1834,7 @@ + else + AC_MSG_RESULT(no) +@@ -1834,7 +1837,7 @@ LIB_UCDSNMP="" if test "$with_snmp" != no; then AC_DEFINE(HAVE_UCDSNMP,1,[Do we have UCD-SNMP support?]) diff --git a/mail/cyrus-imapd23/files/patch-ac b/mail/cyrus-imapd23/files/patch-ac index 4f6476d7498a..a050484fa3b9 100644 --- a/mail/cyrus-imapd23/files/patch-ac +++ b/mail/cyrus-imapd23/files/patch-ac @@ -1,8 +1,16 @@ Index: configure diff -u configure.orig configure ---- configure.orig Sat May 29 03:08:17 2004 -+++ configure Sat May 29 06:43:27 2004 -@@ -6551,7 +6551,7 @@ +--- configure.orig Fri Jun 18 03:55:49 2004 ++++ configure Wed Jul 21 04:21:05 2004 +@@ -309,6 +309,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 WITH_AUTH 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 WITH_PTS AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS WITH_IDLE 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="${ac_subst_vars} LDFLAGS_UCDSNMP" + ac_subst_files='' + + # Initialize some variables set by options. +@@ -6551,7 +6552,7 @@ BDB_LIBADD="" fi @@ -11,7 +19,7 @@ diff -u configure.orig configure do as_ac_Lib=`echo "ac_cv_lib_$dbname''_db_create" | $as_tr_sh` echo "$as_me:$LINENO: checking for db_create in -l$dbname" >&5 -@@ -6575,11 +6575,11 @@ +@@ -6575,11 +6576,11 @@ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ @@ -25,7 +33,7 @@ diff -u configure.orig configure ; return 0; } -@@ -13502,6 +13502,7 @@ +@@ -13502,6 +13503,7 @@ EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl" PERL_SUBDIRS="imap" PERL="${with_perl}" @@ -33,16 +41,18 @@ diff -u configure.orig configure PERL_CCCDLFLAGS="$cccdlflags" fi -@@ -14020,7 +14021,7 @@ +@@ -14020,7 +14022,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 -@@ -14251,7 +14252,7 @@ +@@ -14251,7 +14255,7 @@ #define HAVE_UCDSNMP 1 _ACEOF @@ -51,3 +61,11 @@ 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 +@@ -15067,6 +15071,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 diff --git a/mail/cyrus-imapd23/files/patch-dg b/mail/cyrus-imapd23/files/patch-dg index 5c54d21287d8..80dc928b96d0 100644 --- a/mail/cyrus-imapd23/files/patch-dg +++ b/mail/cyrus-imapd23/files/patch-dg @@ -1,7 +1,7 @@ Index: tools/mkimap diff -u tools/mkimap.orig tools/mkimap ---- tools/mkimap.orig Mon Mar 10 03:39:36 2003 -+++ tools/mkimap Fri Mar 21 17:24:10 2003 +--- tools/mkimap.orig Wed Jun 30 03:16:54 2004 ++++ tools/mkimap Tue Jul 27 04:47:43 2004 @@ -61,6 +61,9 @@ $imapdconf = shift || "/etc/imapd.conf"; @@ -19,18 +19,18 @@ diff -u tools/mkimap.orig tools/mkimap +mkdir $d, 0755; chdir $d or die "couldn't change to $d"; - mkdir "proc", 0755; + mkdir "proc", 0755 || warn "can't create $d/proc: $!"; @@ -95,11 +99,14 @@ - mkdir "msg", 0755; - mkdir "ptclient", 0755; + mkdir "msg", 0755 || warn "can't create $d/msg: $!"; + mkdir "ptclient", 0755 || warn "can't create $d/ptclient: $!"; +system "/usr/sbin/chown -R $cyrus_user:$cyrus_group ."; + while ($part = shift @parts) { print "creating $part...\n"; - mkdir $part, 0755; + mkdir $part, 0755 || warn "can't create $part: $!"; chdir $part or die "couldn't change to partition $part"; - mkdir "stage.", 0755; + mkdir "stage.", 0755 || warn "can't create $part/stage.: $!"; + system "/usr/sbin/chown -R $cyrus_user:$cyrus_group $part"; } diff --git a/mail/cyrus-imapd23/files/patch-master::Makefile.in b/mail/cyrus-imapd23/files/patch-master::Makefile.in index 5b421718655a..c828109f247e 100644 --- a/mail/cyrus-imapd23/files/patch-master::Makefile.in +++ b/mail/cyrus-imapd23/files/patch-master::Makefile.in @@ -1,8 +1,17 @@ Index: master/Makefile.in diff -u master/Makefile.in.orig master/Makefile.in ---- master/Makefile.in.orig Wed Nov 12 13:02:03 2003 -+++ master/Makefile.in Thu Mar 11 01:18:52 2004 -@@ -75,10 +75,10 @@ +--- 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) install: diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile index b666dceb3f5e..17e63d464ccf 100644 --- a/mail/cyrus-imapd24/Makefile +++ b/mail/cyrus-imapd24/Makefile @@ -6,7 +6,7 @@ # PORTNAME= cyrus-imapd -PORTVERSION= 2.2.6 +PORTVERSION= 2.2.7 #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 29a0ca8b2e89..70fd9a96a9bd 100644 --- a/mail/cyrus-imapd24/distinfo +++ b/mail/cyrus-imapd24/distinfo @@ -1,2 +1,2 @@ -MD5 (cyrus-imapd-2.2.6.tar.gz) = 6b83b27146bea34ad700f0ef4f695be7 -SIZE (cyrus-imapd-2.2.6.tar.gz) = 1933281 +MD5 (cyrus-imapd-2.2.7.tar.gz) = 5546b13ffb43af51246f751e85b8a4ea +SIZE (cyrus-imapd-2.2.7.tar.gz) = 1942391 diff --git a/mail/cyrus-imapd24/files/extra-patch-aclocal.m4 b/mail/cyrus-imapd24/files/extra-patch-aclocal.m4 index 0fb00562c04e..fc32b3504419 100644 --- a/mail/cyrus-imapd24/files/extra-patch-aclocal.m4 +++ b/mail/cyrus-imapd24/files/extra-patch-aclocal.m4 @@ -1,7 +1,7 @@ Index: aclocal.m4 diff -u aclocal.m4.orig aclocal.m4 ---- aclocal.m4.orig Sat May 29 03:08:14 2004 -+++ aclocal.m4 Sat May 29 07:10:54 2004 +--- aclocal.m4.orig Fri Jun 18 03:55:46 2004 ++++ aclocal.m4 Wed Jul 21 04:23:48 2004 @@ -505,7 +505,7 @@ BDB_LIBADD="" fi @@ -20,16 +20,21 @@ diff -u aclocal.m4.orig aclocal.m4 dblib="no") CPPFLAGS=$cmu_save_CPPFLAGS -@@ -1806,7 +1806,7 @@ +@@ -1806,9 +1806,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) -@@ -1834,7 +1834,7 @@ + else + AC_MSG_RESULT(no) +@@ -1834,7 +1837,7 @@ LIB_UCDSNMP="" if test "$with_snmp" != no; then AC_DEFINE(HAVE_UCDSNMP,1,[Do we have UCD-SNMP support?]) diff --git a/mail/cyrus-imapd24/files/patch-ac b/mail/cyrus-imapd24/files/patch-ac index 4f6476d7498a..a050484fa3b9 100644 --- a/mail/cyrus-imapd24/files/patch-ac +++ b/mail/cyrus-imapd24/files/patch-ac @@ -1,8 +1,16 @@ Index: configure diff -u configure.orig configure ---- configure.orig Sat May 29 03:08:17 2004 -+++ configure Sat May 29 06:43:27 2004 -@@ -6551,7 +6551,7 @@ +--- configure.orig Fri Jun 18 03:55:49 2004 ++++ configure Wed Jul 21 04:21:05 2004 +@@ -309,6 +309,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 WITH_AUTH 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 WITH_PTS AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS WITH_IDLE 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="${ac_subst_vars} LDFLAGS_UCDSNMP" + ac_subst_files='' + + # Initialize some variables set by options. +@@ -6551,7 +6552,7 @@ BDB_LIBADD="" fi @@ -11,7 +19,7 @@ diff -u configure.orig configure do as_ac_Lib=`echo "ac_cv_lib_$dbname''_db_create" | $as_tr_sh` echo "$as_me:$LINENO: checking for db_create in -l$dbname" >&5 -@@ -6575,11 +6575,11 @@ +@@ -6575,11 +6576,11 @@ #endif /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ @@ -25,7 +33,7 @@ diff -u configure.orig configure ; return 0; } -@@ -13502,6 +13502,7 @@ +@@ -13502,6 +13503,7 @@ EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl" PERL_SUBDIRS="imap" PERL="${with_perl}" @@ -33,16 +41,18 @@ diff -u configure.orig configure PERL_CCCDLFLAGS="$cccdlflags" fi -@@ -14020,7 +14021,7 @@ +@@ -14020,7 +14022,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 -@@ -14251,7 +14252,7 @@ +@@ -14251,7 +14255,7 @@ #define HAVE_UCDSNMP 1 _ACEOF @@ -51,3 +61,11 @@ 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 +@@ -15067,6 +15071,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 diff --git a/mail/cyrus-imapd24/files/patch-dg b/mail/cyrus-imapd24/files/patch-dg index 5c54d21287d8..80dc928b96d0 100644 --- a/mail/cyrus-imapd24/files/patch-dg +++ b/mail/cyrus-imapd24/files/patch-dg @@ -1,7 +1,7 @@ Index: tools/mkimap diff -u tools/mkimap.orig tools/mkimap ---- tools/mkimap.orig Mon Mar 10 03:39:36 2003 -+++ tools/mkimap Fri Mar 21 17:24:10 2003 +--- tools/mkimap.orig Wed Jun 30 03:16:54 2004 ++++ tools/mkimap Tue Jul 27 04:47:43 2004 @@ -61,6 +61,9 @@ $imapdconf = shift || "/etc/imapd.conf"; @@ -19,18 +19,18 @@ diff -u tools/mkimap.orig tools/mkimap +mkdir $d, 0755; chdir $d or die "couldn't change to $d"; - mkdir "proc", 0755; + mkdir "proc", 0755 || warn "can't create $d/proc: $!"; @@ -95,11 +99,14 @@ - mkdir "msg", 0755; - mkdir "ptclient", 0755; + mkdir "msg", 0755 || warn "can't create $d/msg: $!"; + mkdir "ptclient", 0755 || warn "can't create $d/ptclient: $!"; +system "/usr/sbin/chown -R $cyrus_user:$cyrus_group ."; + while ($part = shift @parts) { print "creating $part...\n"; - mkdir $part, 0755; + mkdir $part, 0755 || warn "can't create $part: $!"; chdir $part or die "couldn't change to partition $part"; - mkdir "stage.", 0755; + mkdir "stage.", 0755 || warn "can't create $part/stage.: $!"; + system "/usr/sbin/chown -R $cyrus_user:$cyrus_group $part"; } diff --git a/mail/cyrus-imapd24/files/patch-master::Makefile.in b/mail/cyrus-imapd24/files/patch-master::Makefile.in index 5b421718655a..c828109f247e 100644 --- a/mail/cyrus-imapd24/files/patch-master::Makefile.in +++ b/mail/cyrus-imapd24/files/patch-master::Makefile.in @@ -1,8 +1,17 @@ Index: master/Makefile.in diff -u master/Makefile.in.orig master/Makefile.in ---- master/Makefile.in.orig Wed Nov 12 13:02:03 2003 -+++ master/Makefile.in Thu Mar 11 01:18:52 2004 -@@ -75,10 +75,10 @@ +--- 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) install: