# ChangeLog for dev-libs/cyrus-imap-dev
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-imap-dev/ChangeLog,v 1.24 2004/10/29 20:50:23 langthang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-imap-dev/ChangeLog,v 1.25 2004/10/29 23:29:41 langthang Exp $
+
+ 29 Oct 2004; Tuan Van <langthang@gentoo.org> -files/2.1.14-db4.patch,
+ -files/cyrus-imap-dev-2.1.12-libwrap.patch,
+ -files/cyrus-imapd-2.1.12-includepath.patch,
+ -files/cyrus-imapd-2.2.3-db4.patch, -cyrus-imap-dev-2.1.12.ebuild,
+ -cyrus-imap-dev-2.1.13.ebuild, -cyrus-imap-dev-2.1.14.ebuild,
+ -cyrus-imap-dev-2.2.3.ebuild:
+ remove old ebuilds.
29 Oct 2004; Tuan Van <langthang@gentoo.org> cyrus-imap-dev-2.2.8.ebuild:
net-analyzer/ucd-snmp --> virtual/snmp
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 4dfb8029a40d29da7804a243c06999e7 cyrus-imap-dev-2.1.13.ebuild 2478
-MD5 bd94fedc7558962efe668977e39422b6 cyrus-imap-dev-2.1.12.ebuild 2461
-MD5 6849011c3a1daf70e49fb0d064ff831c ChangeLog 3702
+MD5 5f66346eaba6442a0f480ed61f2a5563 ChangeLog 4055
MD5 dbdd229f17b9aa32ab1e8d10135d7827 cyrus-imap-dev-2.2.8.ebuild 2254
MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 f6041d6b757a358156694c6356f9d24f cyrus-imap-dev-2.2.3.ebuild 2165
-MD5 60591bfd13a1eff9dca08a6da1f0aa9a cyrus-imap-dev-2.1.14.ebuild 2978
-MD5 fe1bbab93ddd6cf3a9c4aacc111154d4 files/cyrus-imapd-2.2.3-db4.patch 1604
-MD5 24cfd296507c04e376368f15665041d1 files/cyrus-imap-dev-2.1.12-libwrap.patch 494
-MD5 419f3372b21d1eea29593634a57bc134 files/cyrus-imapd-2.1.12-includepath.patch 2721
-MD5 6678b1b72838a7ba2cb5045909ea909f files/digest-cyrus-imap-dev-2.2.3 70
MD5 6453c70342b78c99a073a06292b7e757 files/digest-cyrus-imap-dev-2.2.8 70
-MD5 a73606d0350e6883a11a4c525af59551 files/digest-cyrus-imap-dev-2.1.12 71
-MD5 d63d317f0f8fa042638be86b663fffc0 files/digest-cyrus-imap-dev-2.1.13 71
-MD5 aa678d0f596367397edeea90763ab29e files/digest-cyrus-imap-dev-2.1.14 155
-MD5 b398dd3696347604a52a40bf1a77291b files/2.1.14-db4.patch 2032
MD5 fe1bbab93ddd6cf3a9c4aacc111154d4 files/cyrus-imapd-2.2.8-db4.patch 1604
MD5 24cfd296507c04e376368f15665041d1 files/cyrus-imapd-libwrap.patch 494
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.6 (GNU/Linux)
-iD8DBQFBgq1n5FrxP71izLARAmrtAKCH2MRMeGSCYCkQqXh1+rMiPIx/CACfeHGz
-ZsUnx5r6ENppfMFImxQpqBA=
-=iRmt
+iD8DBQFBgtJw5FrxP71izLARAoaaAJ9Mf/PPbAQi8xuBCJwHtZVdvycTIACgzAan
+nkK3Hxql6E0p7ob/HjBWAyc=
+=YDlY
-----END PGP SIGNATURE-----
+++ /dev/null
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.1.12.ebuild,v 1.13 2004/07/14 14:12:34 agriffis Exp $
-
-inherit eutils
-
-DESCRIPTION="Developer support for the Cyrus IMAP Server"
-HOMEPAGE="http://asg.web.cmu.edu/cyrus/imapd/"
-SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/cyrus-imapd-${PV}.tar.gz"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 -ppc -sparc"
-IUSE="afs kerberos snmp ssl"
-DEPEND="virtual/libc
- afs? ( >=net-fs/openafs-1.2.2 )
- snmp? ( >=net-analyzer/ucd-snmp-4.2.3 )
- ssl? ( >=dev-libs/openssl-0.9.6 )
- kerberos? ( >=app-crypt/mit-krb5-1.2.5 )
- >=sys-libs/db-3.2
- >=sys-libs/pam-0.75
- >=dev-libs/cyrus-sasl-2.1.12
- >=sys-apps/tcp-wrappers-7.6"
-S=${WORKDIR}/cyrus-imapd-${PV}
-
-src_unpack() {
- unpack ${A}
- cd ${S}
- # add libwrap defines as we don't have a dynamicly linked library.
- epatch ${FILESDIR}/${P}-libwrap.patch
- # when linking with rpm, you need to link with more libraries.
- cp configure configure.orig
- sed -e "s:lrpm:lrpm -lrpmio -lrpmdb:" \
- < configure.orig > configure
-}
-
-src_compile() {
- local myconf
-
- use afs && myconf="--with-afs" \
- || myconf="--without-afs"
-
- use snmp && myconf="${myconf} --with-ucdsnmp=/usr" \
- || myconf="${myconf} --without-ucdsnmp"
-
- use ssl && myconf="${myconf} --with-openssl=/usr" \
- || myconf="${myconf} --without-openssl"
-
- #use kerberos && myconf="${myconf} --with-krb=/usr/athena --with-auth=krb --enable-gssapi" \
- # || myconf="${myconf} --without-krb --with-auth=unix --disable-gssapi"
- # As cyrus-sasl-2.1.12 doesn't appear to compile in krb4 support
- # (neither did previous versions) only support krb5
- use kerberos && myconf="${myconf} --with-auth=krb --enable-gssapi" \
- || myconf="${myconf} --without-krb --with-auth=unix --disable-gssapi"
-
- econf \
- --enable-listext \
- --with-cyrus-group=mail \
- --enable-netscapehack \
- --with-com_err=yes \
- --without-perl \
- --disable-cyradm \
- --with-libwrap=/usr \
- ${myconf} || die "econf failed"
-
- # make depends break with -f... in CFLAGS
- make depend CFLAGS="" || die "make depend problem"
-
- cd ${S}/lib
- make || die "compile problem"
- cd ${S}/acap
- make || die "compile problem"
-}
-
-src_install() {
- dodoc COPYRIGHT README*
- cd ${S}/lib
- dodir /usr/include/cyrus
- emake DESTDIR=${D} install || die "compile problem"
- cd ${S}/acap
- emake DESTDIR=${D} install || die "compile problem"
-}
+++ /dev/null
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.1.13.ebuild,v 1.11 2004/07/14 14:12:34 agriffis Exp $
-
-inherit eutils
-
-DESCRIPTION="Developer support for the Cyrus IMAP Server"
-HOMEPAGE="http://asg.web.cmu.edu/cyrus/imapd/"
-SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/cyrus-imapd-${PV}.tar.gz"
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 -ppc -sparc"
-IUSE="afs kerberos snmp ssl"
-DEPEND="virtual/libc
- afs? ( >=net-fs/openafs-1.2.2 )
- snmp? ( >=net-analyzer/ucd-snmp-4.2.3 )
- ssl? ( >=dev-libs/openssl-0.9.6 )
- kerberos? ( >=app-crypt/mit-krb5-1.2.5 )
- >=sys-libs/db-3.2
- >=sys-libs/pam-0.75
- >=dev-libs/cyrus-sasl-2.1.12
- >=sys-apps/tcp-wrappers-7.6"
-S=${WORKDIR}/cyrus-imapd-${PV}
-
-src_unpack() {
- unpack ${A}
- cd ${S}
- # add libwrap defines as we don't have a dynamicly linked library.
- epatch ${FILESDIR}/cyrus-imap-dev-2.1.12-libwrap.patch
- # when linking with rpm, you need to link with more libraries.
- cp configure configure.orig
- sed -e "s:lrpm:lrpm -lrpmio -lrpmdb:" \
- < configure.orig > configure
-}
-
-src_compile() {
- local myconf
-
- use afs && myconf="--with-afs" \
- || myconf="--without-afs"
-
- use snmp && myconf="${myconf} --with-ucdsnmp=/usr" \
- || myconf="${myconf} --without-ucdsnmp"
-
- use ssl && myconf="${myconf} --with-openssl=/usr" \
- || myconf="${myconf} --without-openssl"
-
- #use kerberos && myconf="${myconf} --with-krb=/usr/athena --with-auth=krb --enable-gssapi" \
- # || myconf="${myconf} --without-krb --with-auth=unix --disable-gssapi"
- # As cyrus-sasl-2.1.12 doesn't appear to compile in krb4 support
- # (neither did previous versions) only support krb5
- use kerberos && myconf="${myconf} --with-auth=krb --enable-gssapi" \
- || myconf="${myconf} --without-krb --with-auth=unix --disable-gssapi"
-
- econf \
- --enable-listext \
- --with-cyrus-group=mail \
- --enable-netscapehack \
- --with-com_err=yes \
- --without-perl \
- --disable-cyradm \
- --with-libwrap=/usr \
- ${myconf} || die "econf failed"
-
- # make depends break with -f... in CFLAGS
- make depend CFLAGS="" || die "make depend problem"
-
- cd ${S}/lib
- make || die "compile problem"
- cd ${S}/acap
- make || die "compile problem"
-}
-
-src_install() {
- dodoc COPYRIGHT README*
- cd ${S}/lib
- dodir /usr/include/cyrus
- emake DESTDIR=${D} install || die "compile problem"
- cd ${S}/acap
- emake DESTDIR=${D} install || die "compile problem"
-}
+++ /dev/null
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.1.14.ebuild,v 1.11 2004/07/02 04:36:05 eradicator Exp $
-
-inherit eutils
-
-IPV6_P="cyrus-imapd-2.1.14-ipv6-20030703"
-
-IUSE="afs snmp ssl kerberos ipv6"
-
-DESCRIPTION="Developer support for the Cyrus IMAP Server"
-HOMEPAGE="http://asg.web.cmu.edu/cyrus/imapd/"
-SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/cyrus-imapd-${PV}.tar.gz
- ipv6? ( http://www.imasy.or.jp/~ume/ipv6/${IPV6_P}.diff.gz )"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 -ppc -sparc"
-
-DEPEND="virtual/libc
- afs? ( >=net-fs/openafs-1.2.2 )
- snmp? ( >=net-analyzer/ucd-snmp-4.2.3 )
- ssl? ( >=dev-libs/openssl-0.9.6 )
- kerberos? ( >=app-crypt/mit-krb5-1.2.6 )
- >=sys-libs/db-3.2
- >=sys-libs/pam-0.75
- >=dev-libs/cyrus-sasl-2.1.12
- >=sys-apps/tcp-wrappers-7.6"
-S=${WORKDIR}/cyrus-imapd-${PV}
-
-src_unpack() {
- unpack ${A}
- cd ${S}
-
- # patch for db4 detection and their respective versioned symbols
- epatch ${FILESDIR}/2.1.14-db4.patch
-
- # add libwrap defines as we don't have a dynamicly linked library.
- epatch ${FILESDIR}/cyrus-imap-dev-2.1.12-libwrap.patch
-
- # Does running autoconf squash any of this?
- use ipv6 && epatch ${WORKDIR}/${IPV6_P}.diff
-
- libtoolize --copy --force
- aclocal -I cmulocal || die
- autoheader || die
- autoconf || die
-
- # remove spurious -I/usr/includes which make configure tests fail
- epatch ${FILESDIR}/cyrus-imapd-2.1.12-includepath.patch
-
- # when linking with rpm, you need to link with more libraries.
- cp configure configure.orig
- sed -e "s:lrpm:lrpm -lrpmio -lrpmdb:" \
- < configure.orig > configure
-}
-
-src_compile() {
- local myconf
-
- use afs && myconf="--with-afs" \
- || myconf="--without-afs"
-
- use snmp && myconf="${myconf} --with-ucdsnmp=/usr" \
- || myconf="${myconf} --without-ucdsnmp"
-
- use ssl && myconf="${myconf} --with-openssl=/usr" \
- || myconf="${myconf} --without-openssl"
-
- # Kerberos IV is not working in cyrus-sasl so it's not enabled here. Only Kerberos V.
- #use kerberos && myconf="${myconf} --with-krb=/usr/athena --with-auth=krb --enable-gssapi" \
- # || myconf="${myconf} --without-krb --with-auth=unix --disable-gssapi"
-
- use kerberos && myconf="${myconf} --with-auth=krb --enable-gssapi" \
- || myconf="${myconf} --without-krb --with-auth=unix --disable-gssapi"
-
- econf \
- --enable-listext \
- --with-cyrus-group=mail \
- --enable-netscapehack \
- --with-com_err=yes \
- --without-perl \
- --disable-cyradm \
- --with-libwrap=/usr \
- ${myconf} || die "econf failed"
-
- # make depends break with -f... in CFLAGS
- make depend CFLAGS="" || die "make depend problem"
-
- cd ${S}/lib
- make || die "compile problem"
- cd ${S}/acap
- make || die "compile problem"
-}
-
-src_install() {
- dodoc COPYRIGHT README*
- cd ${S}/lib
- dodir /usr/include/cyrus
- emake DESTDIR=${D} install || die "compile problem"
- cd ${S}/acap
- emake DESTDIR=${D} install || die "compile problem"
-}
+++ /dev/null
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.2.3.ebuild,v 1.8 2004/07/02 04:36:05 eradicator Exp $
-
-inherit eutils
-
-DESCRIPTION="Developer support for the Cyrus IMAP Server."
-HOMEPAGE="http://asg.web.cmu.edu/cyrus/imapd/"
-SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-imapd-${PV}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="afs kerberos snmp ssl tcpd"
-
-RDEPEND="virtual/libc
- >=sys-libs/db-3.2
- >=dev-libs/cyrus-sasl-2.1.12
- afs? ( >=net-fs/openafs-1.2.2 )
- kerberos? ( >=app-crypt/mit-krb5-1.2.6 )
- snmp? ( >=net-analyzer/ucd-snmp-4.2.3 )
- ssl? ( >=dev-libs/openssl-0.9.6 )
- tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
-
-DEPEND="${RDEPEND}
- sys-devel/libtool
- >=sys-devel/autoconf-2.58
- sys-devel/automake
- >=sys-apps/sed-4"
-
-S="${WORKDIR}/cyrus-imapd-${PV}"
-
-src_unpack() {
- unpack ${A} && cd "${S}"
-
- # Add libwrap defines as we don't have a dynamicly linked library.
- if use tcpd ; then
- epatch "${FILESDIR}/cyrus-imapd-libwrap.patch"
- fi
-
- # DB4 detection and versioned symbols.
- epatch "${FILESDIR}/cyrus-imapd-${PV}-db4.patch"
-
- # Recreate configure.
- export WANT_AUTOCONF="2.5"
- ebegin "Recreating configure"
- rm -f configure config.h.in
- sh SMakefile &>/dev/null || die "SMakefile failed"
- eend $?
-
- # When linking with rpm, you need to link with more libraries.
- sed -e "s:lrpm:lrpm -lrpmio -lrpmdb:" -i configure || die "sed failed"
-}
-
-src_compile() {
- local myconf
- myconf="${myconf} `use_with afs`"
- myconf="${myconf} `use_with ssl openssl`"
- myconf="${myconf} `use_with snmp ucdsnmp`"
- myconf="${myconf} `use_with tcpd libwrap`"
- myconf="${myconf} `use_enable kerberos gssapi`"
-
- econf \
- --enable-murder \
- --enable-listext \
- --enable-netscapehack \
- --with-cyrus-group=mail \
- --with-com_err=yes \
- --with-auth=unix \
- --without-perl \
- --disable-cyradm \
- ${myconf} || die "econf failed"
-
- emake -C "${S}/lib" all || die "compile problem"
-}
-
-src_install() {
- dodir /usr/include/cyrus
-
- make -C "${S}/lib" DESTDIR="${D}" install || die "make install failed"
- dodoc COPYRIGHT README*
-}
+++ /dev/null
-diff -urN cyrus-sasl-2.1.14/cmulocal/berkdb.m4 cyrus-sasl-2.1.14-modified/cmulocal/berkdb.m4
---- cyrus-sasl-2.1.14/cmulocal/berkdb.m4 2003-04-15 17:25:41.000000000 -0500
-+++ cyrus-sasl-2.1.14-modified/cmulocal/berkdb.m4 2003-07-09 03:17:48.000000000 -0500
-@@ -211,12 +211,20 @@
- BDB_LIBADD=""
- fi
-
-- for dbname in 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.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
- do
-- AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname";
-- dblib="berkeley"; break, dblib="no")
-+ AC_CHECK_LIB($dbname, db_create_4000, BDB_LIBADD="$BDB_LIBADD -l$dbname";
-+ dblib="berkeley"; break, AC_CHECK_LIB($dbname, db_create_4001, BDB_LIBADD="$BDB_LIBADD -l$dbname";
-+ dblib="berkeley"; break, dblib="no"))
- done
- if test "$dblib" = "no"; then
-+ for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
-+ do
-+ AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname";
-+ dblib="berkeley"; break, dblib="no")
-+ done
-+ fi
-+ if test "$dblib" = "no"; then
- AC_CHECK_LIB(db, db_open, BDB_LIBADD="$BDB_LIBADD -ldb";
- dblib="berkeley"; dbname=db,
- dblib="no")
-diff -urN cyrus-sasl-2.1.14/cmulocal/sasl2.m4 cyrus-sasl-2.1.14-modified/cmulocal/sasl2.m4
---- cyrus-sasl-2.1.14/cmulocal/sasl2.m4 2003-05-14 13:36:41.000000000 -0500
-+++ cyrus-sasl-2.1.14-modified/cmulocal/sasl2.m4 2003-07-09 03:18:31.000000000 -0500
-@@ -25,8 +25,9 @@
- dnl
- dnl The choice is reflected in GSSAPIBASE_LIBS
- dnl we might need libdb
-- AC_CHECK_LIB(db, db_open)
--
-+ AC_CHECK_LIB(db, db_open,,
-+ AC_CHECK_LIB(db, db_open_4001,,
-+ AC_CHECK_LIB(db, db_open_4000)))
- gss_impl="mit";
- AC_CHECK_LIB(resolv,res_search)
- if test -d ${gssapi}; then
+++ /dev/null
-diff -urN cyrus-imapd-2.1.11/master/master.c cyrus-imapd-2.1.11-modified/master/master.c
---- cyrus-imapd-2.1.11/master/master.c 2002-11-01 10:44:33.000000000 -0600
-+++ cyrus-imapd-2.1.11-modified/master/master.c 2002-12-07 18:21:41.000000000 -0600
-@@ -103,6 +103,10 @@
- static int verbose = 0;
- static int listen_queue_backlog = 32;
-
-+int allow_severity = LOG_DEBUG;
-+int deny_severity = LOG_ERR;
-+int hosts_ctl;
-+
- struct service *Services = NULL;
- int allocservices = 0;
- int nservices = 0;
+++ /dev/null
-diff -urN cyrus-imapd-2.1.12/configure cyrus-imapd-2.1.12-modified/configure
---- cyrus-imapd-2.1.12/configure 2003-02-03 15:31:13.000000000 -0600
-+++ cyrus-imapd-2.1.12-modified/configure 2003-02-11 04:40:39.000000000 -0600
-@@ -1499,10 +1499,10 @@
- CFLAGS="-Wall ${CFLAGS}"
- GCC_VERSION=`$CC -v 2>&1 | sed -n -e '/version/s/.*version \([0-9]\)\..*/\1/p'`
- if test "$GCC_VERSION" != "3"; then
-- CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
-+ CPPFLAGS="${CPPFLAGS}"
- fi
- else
-- CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
-+ CPPFLAGS="${CPPFLAGS}"
- fi
-
- # this is CMU ADD LIBPATH
-@@ -4501,7 +4501,7 @@
- if test "${with_afs+set}" = set; then
- withval="$with_afs"
- with_afs="${withval}"
-- CFLAGS="${CFLAGS} -I${withval}/include"
-+ CFLAGS="${CFLAGS}"
- else
- with_afs="/usr/local"
- fi
-@@ -5028,7 +5028,7 @@
-
-
- ;;
-- *) OPENSSL_INC="-I${with_openssl}/include"
-+ *) OPENSSL_INC=""
- OPENSSL_LIBPATH="${with_openssl}/lib"
- CPPFLAGS="${CPPFLAGS} ${OPENSSL_INC}"
-
-@@ -5131,7 +5131,7 @@
- *) if test -d ${with_zephyr}/include/zephyr; then
- ZEPHYR_CPPFLAGS="-I${with_zephyr}/include/zephyr"
- else
-- ZEPHYR_CPPFLAGS="-I${with_zephyr}/include"
-+ ZEPHYR_CPPFLAGS=""
- fi
- ZEPHYR_LIBS="-lzephyr";;
- esac
-@@ -5384,7 +5384,7 @@
- *) # use whatever they told us, or whatever we found
- COMPILE_ET="${with_com_err}/bin/compile_et"
- COM_ERR_LIBS="${with_com_err}/lib/libcom_err.a"
-- COM_ERR_CPPFLAGS="-I${with_com_err}/include"
-+ COM_ERR_CPPFLAGS=""
- # Ever get the feeling people hide this stuff on purpose?
- if test -d "${with_com_err}/include/et" ; then
- COM_ERR_CPPFLAGS="-I${with_com_err}/include"
-@@ -5796,7 +5796,7 @@
-
- if test "$gssapi" != no; then
- if test -d ${gssapi}; then
-- CPPFLAGS="$CPPFLAGS -I$gssapi/include"
-+ CPPFLAGS="$CPPFLAGS"
- LDFLAGS="$LDFLAGS -L$gssapi/lib"
- fi
- ac_safe=`echo "gssapi.h" | sed 'y%./+-%__p_%'`
-@@ -5970,7 +5970,7 @@
- fi
-
- if test -d ${gssapi}; then
-- CPPFLAGS="$CPPFLAGS -I$gssapi/include"
-+ CPPFLAGS="$CPPFLAGS"
- LDFLAGS="$LDFLAGS -L$gssapi/lib"
- fi
-
-@@ -6587,7 +6587,7 @@
-
- if test "$with_libwrap" != no; then
- if test -d "$with_libwrap"; then
-- CPPFLAGS="$CPPFLAGS -I${with_libwrap}/include"
-+ CPPFLAGS="$CPPFLAGS"
- LDFLAGS="$LDFLAGS -L${with_libwrap}/lib"
- fi
- cmu_save_LIBS="$LIBS"
-@@ -6733,7 +6733,7 @@
-
- if test "$with_ucdsnmp" != no; then
- if test -d "$with_ucdsnmp"; then
-- CPPFLAGS="$CPPFLAGS -I${with_ucdsnmp}/include"
-+ CPPFLAGS="$CPPFLAGS"
- LDFLAGS="$LDFLAGS -L${with_ucdsnmp}/lib"
- fi
- cmu_save_LIBS="$LIBS"
+++ /dev/null
-diff -urN cyrus-imapd-2.2.3/cmulocal/berkdb.m4 cyrus-imapd-2.2.3/cmulocal/berkdb.m4
---- cyrus-imapd-2.2.3/cmulocal/berkdb.m4 2003-04-15 17:25:41.000000000 -0500
-+++ cyrus-imapd-2.2.3/cmulocal/berkdb.m4 2003-07-09 03:17:48.000000000 -0500
-@@ -211,12 +211,21 @@
- BDB_LIBADD=""
- fi
-
-- 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 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db
- do
-- AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname";
-- dblib="berkeley"; break, dblib="no")
-+ AC_CHECK_LIB($dbname, db_create_4000, BDB_LIBADD="$BDB_LIBADD -l$dbname";
-+ dblib="berkeley"; break, AC_CHECK_LIB($dbname, db_create_4001, BDB_LIBADD="$BDB_LIBADD -l$dbname";
-+ dblib="berkeley"; break, AC_CHECK_LIB($dbname, db_create_4002, BDB_LIBADD="$BDB_LIBADD -l$dbname";
-+ dblib="berkeley"; break, dblib="no")))
- done
- if test "$dblib" = "no"; then
-+ 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 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
-+ do
-+ AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname";
-+ dblib="berkeley"; break, dblib="no")
-+ done
-+ fi
-+ if test "$dblib" = "no"; then
- AC_CHECK_LIB(db, db_open, BDB_LIBADD="$BDB_LIBADD -ldb";
- dblib="berkeley"; dbname=db,
- dblib="no")
+++ /dev/null
-MD5 dc3355d0170509ccebd9788ed2daad39 cyrus-imapd-2.1.12.tar.gz 1664202
+++ /dev/null
-MD5 ac3a4773c2f0fb2d0f9c5ec8669b7e65 cyrus-imapd-2.1.13.tar.gz 1664658
+++ /dev/null
-MD5 e30da9749e926f847be5ab4e75eaf110 cyrus-imapd-2.1.14.tar.gz 1691926
-MD5 04ea9b030caf0cf2caf95b6ba1486c36 cyrus-imapd-2.1.14-ipv6-20030703.diff.gz 33049
+++ /dev/null
-MD5 32888c5120edeb2867d6283fedbdb7d5 cyrus-imapd-2.2.3.tar.gz 1887717