mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-29 10:18:30 +00:00
Code Issues Releases Activity

Update to 2.2.12.

Browse Source 
Security:	Fix possible single byte overflow in mailbox handling code.
Security:	Fix possible single byte overflows in the imapd annotate
		extension.
Security:	Fix stack buffer overflows in fetchnews (exploitable by
		peer news server), backend (exploitable by admin), and in
		imapd (exploitable by users though only on platforms where
		a filename may be larger than a mailbox name).
This commit is contained in:
Hajimu UMEMOTO 2005-02-23 20:37:39 +00:00
parent 24d3aa1ab6
commit e0e9882381
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=129622
12 changed files with 132 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
mail/cyrus-imapd22/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= cyrus-imapd
PORTVERSION= 2.2.10
PORTVERSION= 2.2.12
#PORTREVISION= 0
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
@ -48,24 +48,34 @@ USE_BDB_VER= 3
OPTIONS+= BDB_3 "Use BerkeleyDB v3" on \
BDB_4 "Use BerkeleyDB v4" off \
BDB_41 "Use BerkeleyDB v4.1" off \
BDB_42 "Use BerkeleyDB v4.2" off
BDB_42 "Use BerkeleyDB v4.2" off \
BDB_43 "Use BerkeleyDB v4.3" off
.elif ${USE_BDB_VER} == 4
OPTIONS+= BDB_3 "Use BerkeleyDB v3" off \
BDB_4 "Use BerkeleyDB v4" on \
BDB_41 "Use BerkeleyDB v4.1" off \
BDB_42 "Use BerkeleyDB v4.2" off
BDB_42 "Use BerkeleyDB v4.2" off \
BDB_43 "Use BerkeleyDB v4.3" off
.elif ${USE_BDB_VER} == 41
OPTIONS+= BDB_3 "Use BerkeleyDB v3" off \
BDB_4 "Use BerkeleyDB v4" off \
BDB_41 "Use BerkeleyDB v4.1" on \
BDB_42 "Use BerkeleyDB v4.2" off
BDB_42 "Use BerkeleyDB v4.2" off \
BDB_43 "Use BerkeleyDB v4.3" off
.elif ${USE_BDB_VER} == 42
OPTIONS+= BDB_3 "Use BerkeleyDB v3" off \
BDB_4 "Use BerkeleyDB v4" off \
BDB_41 "Use BerkeleyDB v4.1" off \
BDB_42 "Use BerkeleyDB v4.2" on
BDB_42 "Use BerkeleyDB v4.2" on \
BDB_43 "Use BerkeleyDB v4.3" off
.elif ${USE_BDB_VER} == 43
OPTIONS+= BDB_3 "Use BerkeleyDB v3" off \
BDB_4 "Use BerkeleyDB v4" off \
BDB_41 "Use BerkeleyDB v4.1" off \
BDB_42 "Use BerkeleyDB v4.2" off \
BDB_43 "Use BerkeleyDB v4.3" on
.else
BROKEN= "WITH_BDB_VER must be 3, 4, 41 or 42"
BROKEN= "WITH_BDB_VER must be 3, 4, 41, 42 or 43"
.endif
OPTIONS+= DRAC "Enable DRAC support" off
@ -83,9 +93,11 @@ OPTIONS+= PASS8BITHACK "Add pass8bit option (not recommended)" off
.include <bsd.port.pre.mk>
.if !defined(WITH_BDB_3) && !defined(WITH_BDB_4) && \
!defined(WITH_BDB_41) && !defined(WITH_BDB_42)
!defined(WITH_BDB_41) && !defined(WITH_BDB_42) && \
!defined(WITH_BDB_43)
.if defined(WITHOUT_BDB_3) && defined(WITHOUT_BDB_4) && \
defined(WITHOUT_BDB_41) && defined(WITHOUT_BDB_42)
defined(WITHOUT_BDB_41) && defined(WITHOUT_BDB_42) && \
defined(WITHOUT_BDB_43)
BROKEN= "You need to select one BDB version. Run 'make config' again!"
.endif
.if ${USE_BDB_VER} == 3
@ -96,14 +108,20 @@ WITH_BDB_4= yes
WITH_BDB_41= yes
.elif ${USE_BDB_VER} == 42
WITH_BDB_42= yes
.elif ${USE_BDB_VER} == 43
WITH_BDB_43= yes
.endif
.endif
.if (defined(WITH_BDB_3) && defined(WITH_BDB_4)) || \
(defined(WITH_BDB_3) && defined(WITH_BDB_41)) || \
(defined(WITH_BDB_3) && defined(WITH_BDB_42)) || \
(defined(WITH_BDB_3) && defined(WITH_BDB_43)) || \
(defined(WITH_BDB_4) && defined(WITH_BDB_41)) || \
(defined(WITH_BDB_4) && defined(WITH_BDB_42)) || \
(defined(WITH_BDB_41) && defined(WITH_BDB_42))
(defined(WITH_BDB_4) && defined(WITH_BDB_43)) || \
(defined(WITH_BDB_41) && defined(WITH_BDB_42)) || \
(defined(WITH_BDB_41) && defined(WITH_BDB_43)) || \
(defined(WITH_BDB_42) && defined(WITH_BDB_43))
BROKEN= "Multiple BDB versions selected. Run 'make config' again!"
.endif
.if defined(WITH_BDB_3)
@ -118,6 +136,9 @@ CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db41 --with-bdb=db41
.elif defined(WITH_BDB_42)
LIB_DEPENDS+= db-4.2.2:${PORTSDIR}/databases/db42
CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db42 --with-bdb=db-4.2
.elif defined(WITH_BDB_43)
LIB_DEPENDS+= db-4.3.0:${PORTSDIR}/databases/db43
CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db43 --with-bdb=db-4.3
.endif
.if defined(WITH_NNTP)

4
mail/cyrus-imapd22/distinfo
View File

@ -1,2 +1,2 @@
MD5 (cyrus-imapd-2.2.10.tar.gz) = f3159efa2ffb9856ab79c35c7b002184
SIZE (cyrus-imapd-2.2.10.tar.gz) = 1946803
MD5 (cyrus-imapd-2.2.12.tar.gz) = 70b3bba526a8d36d3bb23a87d37e9188
SIZE (cyrus-imapd-2.2.12.tar.gz) = 1961161

4
mail/cyrus-imapd22/files/extra-patch-aclocal.m4
View File

@ -6,8 +6,8 @@ diff -u aclocal.m4.orig aclocal.m4
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>],

20
mail/cyrus-imapd22/files/patch-ac
View File

@ -1,7 +1,7 @@
Index: configure
diff -u configure.orig configure
--- configure.orig Wed Nov 24 03:55:47 2004
+++ configure Wed Nov 24 15:34:27 2004
--- configure.orig Tue Feb 15 02:59:46 2005
+++ configure Thu Feb 24 04:45:06 2005
@@ -309,6 +309,7 @@
#endif"
@ -10,16 +10,16 @@ diff -u configure.orig configure
ac_subst_files=''
# Initialize some variables set by options.
@@ -6611,7 +6612,7 @@
@@ -6612,7 +6613,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
@@ -6621,6 +6622,7 @@
@@ -6622,6 +6623,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 ()
@@ -13532,6 +13534,7 @@
@@ -13549,6 +13551,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
@@ -14050,7 +14053,9 @@
@@ -14067,7 +14070,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
@@ -14281,7 +14286,7 @@
@@ -14298,7 +14303,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
@@ -15097,6 +15102,7 @@
@@ -15114,6 +15119,7 @@
s,@LIB_WRAP@,$LIB_WRAP,;t t
s,@SNMP_CONFIG@,$SNMP_CONFIG,;t t
s,@LIB_UCDSNMP@,$LIB_UCDSNMP,;t t

39
mail/cyrus-imapd23/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= cyrus-imapd
PORTVERSION= 2.2.10
PORTVERSION= 2.2.12
#PORTREVISION= 0
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
@ -48,24 +48,34 @@ USE_BDB_VER= 3
OPTIONS+= BDB_3 "Use BerkeleyDB v3" on \
BDB_4 "Use BerkeleyDB v4" off \
BDB_41 "Use BerkeleyDB v4.1" off \
BDB_42 "Use BerkeleyDB v4.2" off
BDB_42 "Use BerkeleyDB v4.2" off \
BDB_43 "Use BerkeleyDB v4.3" off
.elif ${USE_BDB_VER} == 4
OPTIONS+= BDB_3 "Use BerkeleyDB v3" off \
BDB_4 "Use BerkeleyDB v4" on \
BDB_41 "Use BerkeleyDB v4.1" off \
BDB_42 "Use BerkeleyDB v4.2" off
BDB_42 "Use BerkeleyDB v4.2" off \
BDB_43 "Use BerkeleyDB v4.3" off
.elif ${USE_BDB_VER} == 41
OPTIONS+= BDB_3 "Use BerkeleyDB v3" off \
BDB_4 "Use BerkeleyDB v4" off \
BDB_41 "Use BerkeleyDB v4.1" on \
BDB_42 "Use BerkeleyDB v4.2" off
BDB_42 "Use BerkeleyDB v4.2" off \
BDB_43 "Use BerkeleyDB v4.3" off
.elif ${USE_BDB_VER} == 42
OPTIONS+= BDB_3 "Use BerkeleyDB v3" off \
BDB_4 "Use BerkeleyDB v4" off \
BDB_41 "Use BerkeleyDB v4.1" off \
BDB_42 "Use BerkeleyDB v4.2" on
BDB_42 "Use BerkeleyDB v4.2" on \
BDB_43 "Use BerkeleyDB v4.3" off
.elif ${USE_BDB_VER} == 43
OPTIONS+= BDB_3 "Use BerkeleyDB v3" off \
BDB_4 "Use BerkeleyDB v4" off \
BDB_41 "Use BerkeleyDB v4.1" off \
BDB_42 "Use BerkeleyDB v4.2" off \
BDB_43 "Use BerkeleyDB v4.3" on
.else
BROKEN= "WITH_BDB_VER must be 3, 4, 41 or 42"
BROKEN= "WITH_BDB_VER must be 3, 4, 41, 42 or 43"
.endif
OPTIONS+= DRAC "Enable DRAC support" off
@ -83,9 +93,11 @@ OPTIONS+= PASS8BITHACK "Add pass8bit option (not recommended)" off
.include <bsd.port.pre.mk>
.if !defined(WITH_BDB_3) && !defined(WITH_BDB_4) && \
!defined(WITH_BDB_41) && !defined(WITH_BDB_42)
!defined(WITH_BDB_41) && !defined(WITH_BDB_42) && \
!defined(WITH_BDB_43)
.if defined(WITHOUT_BDB_3) && defined(WITHOUT_BDB_4) && \
defined(WITHOUT_BDB_41) && defined(WITHOUT_BDB_42)
defined(WITHOUT_BDB_41) && defined(WITHOUT_BDB_42) && \
defined(WITHOUT_BDB_43)
BROKEN= "You need to select one BDB version. Run 'make config' again!"
.endif
.if ${USE_BDB_VER} == 3
@ -96,14 +108,20 @@ WITH_BDB_4= yes
WITH_BDB_41= yes
.elif ${USE_BDB_VER} == 42
WITH_BDB_42= yes
.elif ${USE_BDB_VER} == 43
WITH_BDB_43= yes
.endif
.endif
.if (defined(WITH_BDB_3) && defined(WITH_BDB_4)) || \
(defined(WITH_BDB_3) && defined(WITH_BDB_41)) || \
(defined(WITH_BDB_3) && defined(WITH_BDB_42)) || \
(defined(WITH_BDB_3) && defined(WITH_BDB_43)) || \
(defined(WITH_BDB_4) && defined(WITH_BDB_41)) || \
(defined(WITH_BDB_4) && defined(WITH_BDB_42)) || \
(defined(WITH_BDB_41) && defined(WITH_BDB_42))
(defined(WITH_BDB_4) && defined(WITH_BDB_43)) || \
(defined(WITH_BDB_41) && defined(WITH_BDB_42)) || \
(defined(WITH_BDB_41) && defined(WITH_BDB_43)) || \
(defined(WITH_BDB_42) && defined(WITH_BDB_43))
BROKEN= "Multiple BDB versions selected. Run 'make config' again!"
.endif
.if defined(WITH_BDB_3)
@ -118,6 +136,9 @@ CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db41 --with-bdb=db41
.elif defined(WITH_BDB_42)
LIB_DEPENDS+= db-4.2.2:${PORTSDIR}/databases/db42
CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db42 --with-bdb=db-4.2
.elif defined(WITH_BDB_43)
LIB_DEPENDS+= db-4.3.0:${PORTSDIR}/databases/db43
CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db43 --with-bdb=db-4.3
.endif
.if defined(WITH_NNTP)

4
mail/cyrus-imapd23/distinfo
View File

@ -1,2 +1,2 @@
MD5 (cyrus-imapd-2.2.10.tar.gz) = f3159efa2ffb9856ab79c35c7b002184
SIZE (cyrus-imapd-2.2.10.tar.gz) = 1946803
MD5 (cyrus-imapd-2.2.12.tar.gz) = 70b3bba526a8d36d3bb23a87d37e9188
SIZE (cyrus-imapd-2.2.12.tar.gz) = 1961161

4
mail/cyrus-imapd23/files/extra-patch-aclocal.m4
View File

@ -6,8 +6,8 @@ diff -u aclocal.m4.orig aclocal.m4
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>],

20
mail/cyrus-imapd23/files/patch-ac
View File

@ -1,7 +1,7 @@
Index: configure
diff -u configure.orig configure
--- configure.orig Wed Nov 24 03:55:47 2004
+++ configure Wed Nov 24 15:34:27 2004
--- configure.orig Tue Feb 15 02:59:46 2005
+++ configure Thu Feb 24 04:45:06 2005
@@ -309,6 +309,7 @@
#endif"
@ -10,16 +10,16 @@ diff -u configure.orig configure
ac_subst_files=''
# Initialize some variables set by options.
@@ -6611,7 +6612,7 @@
@@ -6612,7 +6613,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
@@ -6621,6 +6622,7 @@
@@ -6622,6 +6623,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 ()
@@ -13532,6 +13534,7 @@
@@ -13549,6 +13551,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
@@ -14050,7 +14053,9 @@
@@ -14067,7 +14070,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
@@ -14281,7 +14286,7 @@
@@ -14298,7 +14303,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
@@ -15097,6 +15102,7 @@
@@ -15114,6 +15119,7 @@
s,@LIB_WRAP@,$LIB_WRAP,;t t
s,@SNMP_CONFIG@,$SNMP_CONFIG,;t t
s,@LIB_UCDSNMP@,$LIB_UCDSNMP,;t t

39
mail/cyrus-imapd24/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= cyrus-imapd
PORTVERSION= 2.2.10
PORTVERSION= 2.2.12
#PORTREVISION= 0
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
@ -48,24 +48,34 @@ USE_BDB_VER= 3
OPTIONS+= BDB_3 "Use BerkeleyDB v3" on \
BDB_4 "Use BerkeleyDB v4" off \
BDB_41 "Use BerkeleyDB v4.1" off \
BDB_42 "Use BerkeleyDB v4.2" off
BDB_42 "Use BerkeleyDB v4.2" off \
BDB_43 "Use BerkeleyDB v4.3" off
.elif ${USE_BDB_VER} == 4
OPTIONS+= BDB_3 "Use BerkeleyDB v3" off \
BDB_4 "Use BerkeleyDB v4" on \
BDB_41 "Use BerkeleyDB v4.1" off \
BDB_42 "Use BerkeleyDB v4.2" off
BDB_42 "Use BerkeleyDB v4.2" off \
BDB_43 "Use BerkeleyDB v4.3" off
.elif ${USE_BDB_VER} == 41
OPTIONS+= BDB_3 "Use BerkeleyDB v3" off \
BDB_4 "Use BerkeleyDB v4" off \
BDB_41 "Use BerkeleyDB v4.1" on \
BDB_42 "Use BerkeleyDB v4.2" off
BDB_42 "Use BerkeleyDB v4.2" off \
BDB_43 "Use BerkeleyDB v4.3" off
.elif ${USE_BDB_VER} == 42
OPTIONS+= BDB_3 "Use BerkeleyDB v3" off \
BDB_4 "Use BerkeleyDB v4" off \
BDB_41 "Use BerkeleyDB v4.1" off \
BDB_42 "Use BerkeleyDB v4.2" on
BDB_42 "Use BerkeleyDB v4.2" on \
BDB_43 "Use BerkeleyDB v4.3" off
.elif ${USE_BDB_VER} == 43
OPTIONS+= BDB_3 "Use BerkeleyDB v3" off \
BDB_4 "Use BerkeleyDB v4" off \
BDB_41 "Use BerkeleyDB v4.1" off \
BDB_42 "Use BerkeleyDB v4.2" off \
BDB_43 "Use BerkeleyDB v4.3" on
.else
BROKEN= "WITH_BDB_VER must be 3, 4, 41 or 42"
BROKEN= "WITH_BDB_VER must be 3, 4, 41, 42 or 43"
.endif
OPTIONS+= DRAC "Enable DRAC support" off
@ -83,9 +93,11 @@ OPTIONS+= PASS8BITHACK "Add pass8bit option (not recommended)" off
.include <bsd.port.pre.mk>
.if !defined(WITH_BDB_3) && !defined(WITH_BDB_4) && \
!defined(WITH_BDB_41) && !defined(WITH_BDB_42)
!defined(WITH_BDB_41) && !defined(WITH_BDB_42) && \
!defined(WITH_BDB_43)
.if defined(WITHOUT_BDB_3) && defined(WITHOUT_BDB_4) && \
defined(WITHOUT_BDB_41) && defined(WITHOUT_BDB_42)
defined(WITHOUT_BDB_41) && defined(WITHOUT_BDB_42) && \
defined(WITHOUT_BDB_43)
BROKEN= "You need to select one BDB version. Run 'make config' again!"
.endif
.if ${USE_BDB_VER} == 3
@ -96,14 +108,20 @@ WITH_BDB_4= yes
WITH_BDB_41= yes
.elif ${USE_BDB_VER} == 42
WITH_BDB_42= yes
.elif ${USE_BDB_VER} == 43
WITH_BDB_43= yes
.endif
.endif
.if (defined(WITH_BDB_3) && defined(WITH_BDB_4)) || \
(defined(WITH_BDB_3) && defined(WITH_BDB_41)) || \
(defined(WITH_BDB_3) && defined(WITH_BDB_42)) || \
(defined(WITH_BDB_3) && defined(WITH_BDB_43)) || \
(defined(WITH_BDB_4) && defined(WITH_BDB_41)) || \
(defined(WITH_BDB_4) && defined(WITH_BDB_42)) || \
(defined(WITH_BDB_41) && defined(WITH_BDB_42))
(defined(WITH_BDB_4) && defined(WITH_BDB_43)) || \
(defined(WITH_BDB_41) && defined(WITH_BDB_42)) || \
(defined(WITH_BDB_41) && defined(WITH_BDB_43)) || \
(defined(WITH_BDB_42) && defined(WITH_BDB_43))
BROKEN= "Multiple BDB versions selected. Run 'make config' again!"
.endif
.if defined(WITH_BDB_3)
@ -118,6 +136,9 @@ CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db41 --with-bdb=db41
.elif defined(WITH_BDB_42)
LIB_DEPENDS+= db-4.2.2:${PORTSDIR}/databases/db42
CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db42 --with-bdb=db-4.2
.elif defined(WITH_BDB_43)
LIB_DEPENDS+= db-4.3.0:${PORTSDIR}/databases/db43
CONFIGURE_ARGS+=--with-bdb-incdir=${LOCALBASE}/include/db43 --with-bdb=db-4.3
.endif
.if defined(WITH_NNTP)

4
mail/cyrus-imapd24/distinfo
View File

@ -1,2 +1,2 @@
MD5 (cyrus-imapd-2.2.10.tar.gz) = f3159efa2ffb9856ab79c35c7b002184
SIZE (cyrus-imapd-2.2.10.tar.gz) = 1946803
MD5 (cyrus-imapd-2.2.12.tar.gz) = 70b3bba526a8d36d3bb23a87d37e9188
SIZE (cyrus-imapd-2.2.12.tar.gz) = 1961161

4
mail/cyrus-imapd24/files/extra-patch-aclocal.m4
View File

@ -6,8 +6,8 @@ diff -u aclocal.m4.orig aclocal.m4
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>],

20
mail/cyrus-imapd24/files/patch-ac
View File

@ -1,7 +1,7 @@
Index: configure
diff -u configure.orig configure
--- configure.orig Wed Nov 24 03:55:47 2004
+++ configure Wed Nov 24 15:34:27 2004
--- configure.orig Tue Feb 15 02:59:46 2005
+++ configure Thu Feb 24 04:45:06 2005
@@ -309,6 +309,7 @@
#endif"
@ -10,16 +10,16 @@ diff -u configure.orig configure
ac_subst_files=''
# Initialize some variables set by options.
@@ -6611,7 +6612,7 @@
@@ -6612,7 +6613,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
@@ -6621,6 +6622,7 @@
@@ -6622,6 +6623,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 ()
@@ -13532,6 +13534,7 @@
@@ -13549,6 +13551,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
@@ -14050,7 +14053,9 @@
@@ -14067,7 +14070,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
@@ -14281,7 +14286,7 @@
@@ -14298,7 +14303,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
@@ -15097,6 +15102,7 @@
@@ -15114,6 +15119,7 @@
s,@LIB_WRAP@,$LIB_WRAP,;t t
s,@SNMP_CONFIG@,$SNMP_CONFIG,;t t
s,@LIB_UCDSNMP@,$LIB_UCDSNMP,;t t