From 5ec58f65de26116b6998cbfa6389c6afc8e60ff4 Mon Sep 17 00:00:00 2001 From: ume Date: Wed, 14 Sep 2011 11:19:36 +0000 Subject: Update to 2.3.17. --- mail/cyrus-imapd23/Makefile | 13 +++++---- mail/cyrus-imapd23/distinfo | 4 +-- mail/cyrus-imapd23/files/extra-patch-configure | 18 ++++++------ mail/cyrus-imapd23/files/extra-patch-configure.in | 9 ------ mail/cyrus-imapd23/files/patch-configure | 35 +++++++++-------------- mail/cyrus-imapd23/files/patch-lib::imapurl.c | 12 -------- 6 files changed, 32 insertions(+), 59 deletions(-) delete mode 100644 mail/cyrus-imapd23/files/patch-lib::imapurl.c (limited to 'mail/cyrus-imapd23') diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile index d004767378ab..f49e1f40e7b2 100644 --- a/mail/cyrus-imapd23/Makefile +++ b/mail/cyrus-imapd23/Makefile @@ -6,19 +6,20 @@ # PORTNAME= cyrus-imapd -PORTVERSION= 2.3.16 -PORTREVISION= 4 +PORTVERSION= 2.3.17 +#PORTREVISION= 0 CATEGORIES= mail ipv6 -MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus/ \ - http://ftp.andrew.cmu.edu/pub/cyrus/ \ - http://www.transit.hanse.de/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/ \ - ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/cyrus-mail/&,} +MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-imapd/ MAINTAINER= ume@FreeBSD.org COMMENT= The cyrus mail server, supporting POP3 and IMAP4 protocols +LICENSE= BSD +LICENSE_FILE= ${WRKSRC}/COPYRIGHT + LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 \ pcre.0:${PORTSDIR}/devel/pcre +BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1 CONFLICTS= cyrus-1.* cyrus-imapd-2.[^3].* diff --git a/mail/cyrus-imapd23/distinfo b/mail/cyrus-imapd23/distinfo index 43b9943b58b2..711f452de65f 100644 --- a/mail/cyrus-imapd23/distinfo +++ b/mail/cyrus-imapd23/distinfo @@ -1,5 +1,5 @@ -SHA256 (cyrus-imapd-2.3.16.tar.gz) = e020ac79403a683bddc136c25887fe501edcc8d73b308982f4b68ec828ab63d2 -SIZE (cyrus-imapd-2.3.16.tar.gz) = 2359349 +SHA256 (cyrus-imapd-2.3.17.tar.gz) = 48336db74fad9da7a16228054ce37063f6982fe0f57695ba4ceb6f25814770b5 +SIZE (cyrus-imapd-2.3.17.tar.gz) = 2311153 SHA256 (cyrus-imapd-2.3.16-autocreate-0.10-0.diff) = a373c9d4e3b35c8ecbd4ad7806cf50196525c3c1a32c35bc18d7b6c449bd57e3 SIZE (cyrus-imapd-2.3.16-autocreate-0.10-0.diff) = 86056 SHA256 (cyrus-imapd-2.3.16-autosieve-0.6.0.diff) = b50acaf0595e320ac89fdd15b375b7e051009ebbe839c461bbb2b2a7006c23c5 diff --git a/mail/cyrus-imapd23/files/extra-patch-configure b/mail/cyrus-imapd23/files/extra-patch-configure index 8e283ee68870..7c3f5c046a22 100644 --- a/mail/cyrus-imapd23/files/extra-patch-configure +++ b/mail/cyrus-imapd23/files/extra-patch-configure @@ -1,15 +1,17 @@ ---- configure.orig 2008-04-25 14:34:53.000000000 -0400 -+++ configure 2008-09-17 18:46:12.000000000 -0400 -@@ -14921,7 +14922,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 +Index: configure +diff -u configure.orig configure +--- configure.orig 2011-09-09 03:03:46.000000000 +0900 ++++ configure 2011-09-14 13:16:52.766364908 +0900 +@@ -9540,7 +9540,7 @@ + $as_echo_n "(cached) " >&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 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} -lhx509 $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -15391,7 +15392,7 @@ + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -9842,7 +9842,7 @@ GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}" elif test "$gss_impl" = "heimdal"; then CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL" diff --git a/mail/cyrus-imapd23/files/extra-patch-configure.in b/mail/cyrus-imapd23/files/extra-patch-configure.in index 28e3c0e8f462..35336cab632f 100644 --- a/mail/cyrus-imapd23/files/extra-patch-configure.in +++ b/mail/cyrus-imapd23/files/extra-patch-configure.in @@ -11,12 +11,3 @@ diff -u configure.in.orig configure.in LIBS="$LIBS -lpcre -lpcreposix"; AC_DEFINE(ENABLE_REGEX, [], [Do we have a regex library?]) else -@@ -1145,7 +1145,7 @@ - dnl libraries will be compiled as PIC if perl requires PIC objects - dnl -- this is needed on NetBSD and Linux, but seems to cause problems on atleast Solaris -- - case "${target_os}" in -- linux*|netbsd*) -+ linux*|netbsd*|freebsd*) - AC_MSG_CHECKING(for perl cccdlflags needed on "${target_os}") - eval `${PERL} -V:cccdlflags` - PERL_CCCDLFLAGS="$cccdlflags" diff --git a/mail/cyrus-imapd23/files/patch-configure b/mail/cyrus-imapd23/files/patch-configure index 744995260bf5..f2675add2cf8 100644 --- a/mail/cyrus-imapd23/files/patch-configure +++ b/mail/cyrus-imapd23/files/patch-configure @@ -1,8 +1,8 @@ Index: configure diff -u configure.orig configure ---- configure.orig 2010-11-26 14:08:32.950506060 +0900 -+++ configure 2010-11-26 14:10:19.298911330 +0900 -@@ -642,6 +642,7 @@ +--- configure.orig 2011-09-14 13:19:05.073252913 +0900 ++++ configure 2011-09-14 13:21:19.010068209 +0900 +@@ -606,6 +606,7 @@ IMAP_COM_ERR_LIBS LIB_RT LIB_UCDSNMP @@ -10,7 +10,7 @@ diff -u configure.orig configure SNMP_CONFIG LIB_WRAP SNMP_SUBDIRS -@@ -12402,7 +12403,7 @@ +@@ -7171,7 +7172,7 @@ done @@ -18,17 +18,8 @@ diff -u configure.orig configure + if test "$ac_cv_header_pcreposix_h" = "yes"; then LIBS="$LIBS -lpcre -lpcreposix"; - cat >>confdefs.h <<\_ACEOF -@@ -20173,7 +20174,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; } - eval `${PERL} -V:cccdlflags` -@@ -20749,7 +20750,9 @@ + $as_echo "#define ENABLE_REGEX /**/" >>confdefs.h +@@ -10688,7 +10689,9 @@ if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then CPPFLAGS="$CPPFLAGS -I${SNMP_PREFIX}/include" @@ -37,14 +28,14 @@ diff -u configure.orig configure + 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 + $as_echo "#define HAVE_NETSNMP 1" >>confdefs.h + +@@ -10781,7 +10784,7 @@ + + $as_echo "#define HAVE_UCDSNMP 1" >>confdefs.h - 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 "$as_me:${as_lineno-$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 + if ${ac_cv_lib_rpm_rpmdbOpen+:} false; then : diff --git a/mail/cyrus-imapd23/files/patch-lib::imapurl.c b/mail/cyrus-imapd23/files/patch-lib::imapurl.c deleted file mode 100644 index 78bd54cd4fbd..000000000000 --- a/mail/cyrus-imapd23/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 - #include - #include -+#include - - #include "imapurl.h" - #include "xmalloc.h" -- cgit