Version bump. In-sync with cyrus-imapd-2.1.14

6 files changed, 257 insertions, 12 deletions

diff --git a/dev-libs/cyrus-imap-dev/ChangeLog b/dev-libs/cyrus-imap-dev/ChangeLog
index 4d815bb75e60..5a00eae35014 100644
--- a/dev-libs/cyrus-imap-dev/ChangeLog
+++ b/dev-libs/cyrus-imap-dev/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/cyrus-imap-dev
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-imap-dev/ChangeLog,v 1.9 2003/06/10 08:06:18 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-imap-dev/ChangeLog,v 1.10 2003/07/09 09:56:30 raker Exp $
+
+*cyrus-imap-dev-2.1.13 (09 Jul 2003)
+
+  09 Jun 2003; Nick Hadaway <raker@gentoo.org>
+  cyrus-imapd-dev-2.1.14.ebuild,
+  files/2.1.14-db4.patch, files/cyrus-imapd-2.1.12-includepath.patch:
+  Version bump.  In-sync with net-mail/cyrus-imapd.
 
 *cyrus-imap-dev-2.1.13 (09 Jun 2003)
 
diff --git a/dev-libs/cyrus-imap-dev/Manifest b/dev-libs/cyrus-imap-dev/Manifest
index d51e9d7e398f..f8128443462e 100644
--- a/dev-libs/cyrus-imap-dev/Manifest
+++ b/dev-libs/cyrus-imap-dev/Manifest
@@ -1,16 +1,20 @@
-MD5 86761cabdb2db244e47b2185c083acc9 files/config.diff 389
+MD5 3227d76ae74f27e8fab8aa230acfae87 cyrus-imap-dev-2.1.11.ebuild 2097
+MD5 bd3fd74edb8cdbf8ccc4de7619e6de8b cyrus-imap-dev-2.1.9.ebuild 1755
+MD5 6bafaa91ed0931997e9ef62c0eb03f7f cyrus-imap-dev-2.1.13.ebuild 2427
+MD5 941bdffe142a7c2ee3a3ab51f35b732a cyrus-imap-dev-2.1.12.ebuild 2415
+MD5 8eeee2949f1891b3079fbb438e2e3793 ChangeLog 1783
+MD5 953cc8af6385668f26bb839d7f7d7492 cyrus-imap-dev-2.1.14.ebuild 2996
+MD5 28d7c08256c21770006b8d63d134d99b cyrus-imap-dev-2.1.9-r1.ebuild 2085
+MD5 374ae77d5cbb38777c1416e60b12c1d6 files/libsieve-overflow.diff 1898
 MD5 e2c00049c69e3eca58d5a635dd3fd6dc files/configure.diff 6285
 MD5 24cfd296507c04e376368f15665041d1 files/cyrus-imap-dev-2.1.12-libwrap.patch 494
-MD5 074362acae4027842361a769407b8645 files/digest-cyrus-imap-dev-2.1.11 71
-MD5 a73606d0350e6883a11a4c525af59551 files/digest-cyrus-imap-dev-2.1.12 71
+MD5 419f3372b21d1eea29593634a57bc134 files/cyrus-imapd-2.1.12-includepath.patch 2721
 MD5 cb725a049e69aaf090ea308ecf7b41ab files/digest-cyrus-imap-dev-2.1.9 70
-MD5 cb725a049e69aaf090ea308ecf7b41ab files/digest-cyrus-imap-dev-2.1.9-r1 70
 MD5 a26c1601811d0fd0cc3da0bae6d76693 files/imap-overflow.diff 871
-MD5 374ae77d5cbb38777c1416e60b12c1d6 files/libsieve-overflow.diff 1898
+MD5 074362acae4027842361a769407b8645 files/digest-cyrus-imap-dev-2.1.11 71
+MD5 a73606d0350e6883a11a4c525af59551 files/digest-cyrus-imap-dev-2.1.12 71
 MD5 d63d317f0f8fa042638be86b663fffc0 files/digest-cyrus-imap-dev-2.1.13 71
-MD5 3227d76ae74f27e8fab8aa230acfae87 cyrus-imap-dev-2.1.11.ebuild 2097
-MD5 941bdffe142a7c2ee3a3ab51f35b732a cyrus-imap-dev-2.1.12.ebuild 2415
-MD5 28d7c08256c21770006b8d63d134d99b cyrus-imap-dev-2.1.9-r1.ebuild 2085
-MD5 bd3fd74edb8cdbf8ccc4de7619e6de8b cyrus-imap-dev-2.1.9.ebuild 1755
-MD5 18f6fbbaa1af4a4858b046c7a21f20dc ChangeLog 1542
-MD5 6bafaa91ed0931997e9ef62c0eb03f7f cyrus-imap-dev-2.1.13.ebuild 2427
+MD5 aa678d0f596367397edeea90763ab29e files/digest-cyrus-imap-dev-2.1.14 155
+MD5 86761cabdb2db244e47b2185c083acc9 files/config.diff 389
+MD5 b398dd3696347604a52a40bf1a77291b files/2.1.14-db4.patch 2032
+MD5 cb725a049e69aaf090ea308ecf7b41ab files/digest-cyrus-imap-dev-2.1.9-r1 70
diff --git a/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.1.14.ebuild b/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.1.14.ebuild
new file mode 100644
index 000000000000..74a2718e87ae
--- /dev/null
+++ b/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.1.14.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/cyrus-imap-dev/cyrus-imap-dev-2.1.14.ebuild,v 1.1 2003/07/09 09:56:30 raker 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/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/glibc
+	afs? ( >=net-fs/openafs-1.2.2 )
+	snmp? ( >=net-analyzer/ucd-snmp-4.2.3 )
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	kerberos? ( virtual/krb5 )
+	>=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}
+
+	# 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"
+}
diff --git a/dev-libs/cyrus-imap-dev/files/2.1.14-db4.patch b/dev-libs/cyrus-imap-dev/files/2.1.14-db4.patch
new file mode 100644
index 000000000000..27c0cea48638
--- /dev/null
+++ b/dev-libs/cyrus-imap-dev/files/2.1.14-db4.patch
@@ -0,0 +1,42 @@
+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 
diff --git a/dev-libs/cyrus-imap-dev/files/cyrus-imapd-2.1.12-includepath.patch b/dev-libs/cyrus-imap-dev/files/cyrus-imapd-2.1.12-includepath.patch
new file mode 100644
index 000000000000..4a59a0c0c541
--- /dev/null
+++ b/dev-libs/cyrus-imap-dev/files/cyrus-imapd-2.1.12-includepath.patch
@@ -0,0 +1,88 @@
+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"
diff --git a/dev-libs/cyrus-imap-dev/files/digest-cyrus-imap-dev-2.1.14 b/dev-libs/cyrus-imap-dev/files/digest-cyrus-imap-dev-2.1.14
new file mode 100644
index 000000000000..6a609fc50d0d
--- /dev/null
+++ b/dev-libs/cyrus-imap-dev/files/digest-cyrus-imap-dev-2.1.14
@@ -0,0 +1,2 @@
+MD5 e30da9749e926f847be5ab4e75eaf110 cyrus-imapd-2.1.14.tar.gz 1691926
+MD5 04ea9b030caf0cf2caf95b6ba1486c36 cyrus-imapd-2.1.14-ipv6-20030703.diff.gz 33049