version bump. added ipv6 to IUSE. fix for db4 versioned symbols.

5 files changed, 300 insertions, 14 deletions

diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog
index 81aa90e4190b..5ac64171b5da 100644
--- a/net-mail/cyrus-imapd/ChangeLog
+++ b/net-mail/cyrus-imapd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/cyrus-imapd
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.26 2003/06/10 07:54:29 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.27 2003/07/09 09:39:35 raker Exp $
+
+*cyrus-imapd-2.1.14 (09 Jul 2003)
+
+  09 Jul 2003; Nick Hadaway <raker@gentoo.org> cyrus-imapd-2.1.14.ebuild,
+  files/2.1.14-db4.patch:
+  Version bump.  patch for versioned symbols in db4.  Added ipv6 support
+  thanks to the heads up from Bernhard Schmidt on bug #23690.
 
 *cyrus-imapd-2.1.13 (09 Jun 2003)
 
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 16f171292cd9..0142ff42b4e1 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,19 +1,22 @@
+MD5 b354cf699fb14cf670b3d4d5a14d24c4 cyrus-imapd-2.1.13.ebuild 6905
+MD5 f87cd5a05541e3c4f357bf6108a695da cyrus-imapd-2.1.12.ebuild 6877
+MD5 e2494a6bb94bf802cd1b0d0a8dc4ef0e cyrus-imapd-2.1.11-r1.ebuild 6299
+MD5 920a0c8cf1a55c75d30e1fd4701cfdd0 cyrus-imapd-2.1.14.ebuild 7328
+MD5 a698ac5ad8a70d90ff6a4f84052e8c08 ChangeLog 5365
+MD5 374ae77d5cbb38777c1416e60b12c1d6 files/libsieve-overflow.diff 1898
 MD5 e2c00049c69e3eca58d5a635dd3fd6dc files/configure.diff 6285
-MD5 419f3372b21d1eea29593634a57bc134 files/cyrus-imapd-2.1.12-includepath.patch 2721
-MD5 24cfd296507c04e376368f15665041d1 files/cyrus-imapd-2.1.12-libwrap.patch 494
-MD5 0e719522fa5fdeeb6299875a7ab67f36 files/cyrus.conf 1340
-MD5 49f1642ca5d96db10f40a7c37a52dbd8 files/cyrus.rc6_2 631
 MD5 8ef2ff8ab18c79ca0fc96e0ec58e084a files/cyrus_2.conf 1340
-MD5 d63d317f0f8fa042638be86b663fffc0 files/digest-cyrus-imapd-2.1.13 71
+MD5 419f3372b21d1eea29593634a57bc134 files/cyrus-imapd-2.1.12-includepath.patch 2721
 MD5 074362acae4027842361a769407b8645 files/digest-cyrus-imapd-2.1.11-r1 71
-MD5 a73606d0350e6883a11a4c525af59551 files/digest-cyrus-imapd-2.1.12 71
-MD5 cbd00df5ef9288b1c830d95fa5e5831f files/gentestcrt.sh 8799
+MD5 49f1642ca5d96db10f40a7c37a52dbd8 files/cyrus.rc6_2 631
 MD5 a26c1601811d0fd0cc3da0bae6d76693 files/imap-overflow.diff 871
-MD5 df60f59cb6da75d7ca5e71a0d1ad52e7 files/imapd_2.conf 765
-MD5 374ae77d5cbb38777c1416e60b12c1d6 files/libsieve-overflow.diff 1898
+MD5 24cfd296507c04e376368f15665041d1 files/cyrus-imapd-2.1.12-libwrap.patch 494
+MD5 cbd00df5ef9288b1c830d95fa5e5831f files/gentestcrt.sh 8799
 MD5 959399de17330ea5f52ef56cb6c5ffcd files/master.8.diff 1280
+MD5 b398dd3696347604a52a40bf1a77291b files/2.1.14-db4.patch 2032
+MD5 a73606d0350e6883a11a4c525af59551 files/digest-cyrus-imapd-2.1.12 71
+MD5 d63d317f0f8fa042638be86b663fffc0 files/digest-cyrus-imapd-2.1.13 71
+MD5 bf05dcd17f739aebcab47c779e7b821d files/digest-cyrus-imapd-2.1.14 71
 MD5 f4074e463596703804133990ab7b00fd files/pam.d-imap 209
-MD5 e2494a6bb94bf802cd1b0d0a8dc4ef0e cyrus-imapd-2.1.11-r1.ebuild 6299
-MD5 b354cf699fb14cf670b3d4d5a14d24c4 cyrus-imapd-2.1.13.ebuild 6905
-MD5 f87cd5a05541e3c4f357bf6108a695da cyrus-imapd-2.1.12.ebuild 6877
-MD5 c8a68932a3efc372189628a0647058e3 ChangeLog 5094
+MD5 df60f59cb6da75d7ca5e71a0d1ad52e7 files/imapd_2.conf 765
+MD5 0e719522fa5fdeeb6299875a7ab67f36 files/cyrus.conf 1340
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.1.14.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.1.14.ebuild
new file mode 100644
index 000000000000..6588c78f3bb8
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.1.14.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.1.14.ebuild,v 1.1 2003/07/09 09:39:35 raker Exp $
+
+inherit eutils
+IPV6_P="${P}-ipv6-20030703"
+
+IUSE="afs snmp ssl kerberos ipv6"
+
+DESCRIPTION="The Cyrus IMAP Server"
+HOMEPAGE="http://asg.web.cmu.edu/cyrus/imapd/"
+SRC_URI="ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/${P}.tar.gz
+	ipv6? ( http://www.imasy.or.jp/~ume/ipv6/${IPV6_P}.diff.gz )"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86 -ppc -sparc"
+
+PROVIDE="virtual/imapd"
+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.14
+	>=sys-apps/tcp-wrappers-7.6
+	net-mail/mailbase"
+
+pkg_setup() {
+	if ! grep -q ^cyrus: /etc/passwd ; then
+		useradd -c cyrus -d /usr/cyrus -g mail -s /bin/false -u 96 cyrus \
+			|| die "problem adding user cyrus"
+	fi
+}
+
+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-imapd-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"
+
+	make || die "compile problem"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	# Remove the developer stuff (-> dev-libs/cyrus-imap-devel)
+	rm -rf ${D}usr/include ${D}usr/lib
+
+	# Rename the master from cyrus to cyrusmaster (postfix has a master too)
+	mv ${D}usr/cyrus/bin/master ${D}usr/cyrus/bin/cyrusmaster
+
+	# Fix manpage stuff
+	rm -rf ${D}usr/man
+
+	# master is renamed to cyrusmaster because postfix has a master too
+	mv man/master.8 man/cyrusmaster.8
+	patch man/cyrusmaster.8 ${FILESDIR}/master.8.diff || die "error patching master.8"
+
+	doman man/*.?
+
+	# remove man-pages from packet net-mail/cyrus-imapd-admin
+	rm ${D}usr/share/man/man1/installsieve.1.gz ${D}usr/share/man/man1/sieveshell.1.gz
+
+	dodir /etc 
+	cp ${FILESDIR}/imapd_2.conf ${D}etc/imapd.conf
+	cp ${FILESDIR}/cyrus_2.conf ${D}etc/cyrus.conf
+	dodir /etc/pam.d
+	cp ${FILESDIR}/pam.d-imap ${D}etc/pam.d/imap
+
+	dodir /var
+	mkdir -m 0750 ${D}var/imap
+	chown -R cyrus.mail ${D}var/imap 
+	keepdir /var/imap
+	mkdir -m 0755 ${D}var/imap/db
+	chown -R cyrus.mail ${D}var/imap/db
+	keepdir /var/imap/db
+	mkdir -m 0755 ${D}var/imap/log
+	chown -R cyrus.mail ${D}var/imap/log
+	keepdir /var/imap/log
+	mkdir -m 0755 ${D}var/imap/msg
+	chown -R cyrus.mail ${D}var/imap/msg
+	keepdir /var/imap/msg
+	mkdir -m 0755 ${D}var/imap/user
+	chown -R cyrus.mail ${D}var/imap/user
+	keepdir /var/imap/user
+	for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do mkdir -m 0755 ${D}var/imap/user/$i ; \
+		chown -R cyrus.mail ${D}var/imap/user/$i
+		keepdir /var/imap/user/$i
+	done
+	mkdir -m 0755 ${D}var/imap/proc
+	chown -R cyrus.mail ${D}var/imap/proc
+	keepdir /var/imap/proc
+	mkdir -m 0755 ${D}var/imap/quota
+	for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do mkdir -m 0755 ${D}var/imap/quota/$i ; \
+		chown -R cyrus.mail ${D}var/imap/quota/$i
+		keepdir /var/imap/quota/$i
+	done
+	mkdir -m 0755 ${D}var/imap/sieve
+        chown -R cyrus.mail ${D}var/imap/sieve
+	for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do mkdir -m 0755 ${D}var/imap/sieve/$i ; \
+		chown -R cyrus.mail ${D}var/imap/sieve/$i
+		keepdir /var/imap/sieve/$i
+	done
+   	mkdir -m 0755 ${D}var/imap/socket
+        chown -R cyrus.mail ${D}var/imap/socket
+	keepdir /var/imap/socket
+	mkdir ${D}var/spool
+	mkdir -m 0750 ${D}var/spool/imap
+        chown -R cyrus.mail ${D}var/spool/imap
+	keepdir /var/spool/imap
+	mkdir -m 0755 ${D}var/spool/imap/stage.
+        chown -R cyrus.mail ${D}var/spool/imap/stage.
+	keepdir /var/spool/imap/stage.
+	# For hashimapspool
+	for i in a b c d e f g h i j k l m n o p q r s t u v w x y z ; do mkdir -m 0755 ${D}var/spool/imap/$i ; \
+		chown -R cyrus.mail ${D}var/spool/imap/$i
+		keepdir /var/spool/imap/$i
+	done
+
+	dodoc COPYRIGHT README*
+	dohtml doc/*.html doc/murder.png
+	cp doc/cyrusv2.mc ${D}usr/share/doc/${PF}/html
+	cp -r contrib tools ${D}usr/share/doc/${PF}
+
+	# Remove the CVS directories
+	find 2>/dev/null ${D}usr/share/doc/ -type d -name CVS -exec rm -rf '{}' \;
+
+	exeinto /etc/init.d ; newexe ${FILESDIR}/cyrus.rc6_2 cyrus
+
+	if [ "'use ssl'" ]; then
+		# from mod_ssl
+		echo "Generating self-signed test certificate"
+		echo "(Ignore any message from the yes command below)"
+		mkdir certs
+		cd certs
+		yes "" | ${FILESDIR}/gentestcrt.sh >/dev/null 2>&1
+		mkdir ${D}etc/cyrusimapd
+		cp server.crt server.key ${D}etc/cyrusimapd
+		chown cyrus.root ${D}etc/cyrusimapd/server.crt ${D}etc/cyrusimapd/server.key
+		chmod 0400 ${D}etc/cyrusimapd/server.crt ${D}etc/cyrusimapd/server.key
+	fi
+}
+
+pkg_postinst() {
+	ewarn "If you change the fs-type of /var/imap or"
+	ewarn "/var/spool/imap you should read step 9 of"
+	ewarn "/usr/share/doc/${P}/html/install-configure.html."
+	echo ""
+
+	if df -T /var/imap | grep -q ' ext[23] ' ; then
+		ewarn "Setting /var/imap/user/* and /var/imap/quota/* to synchronous"
+		ewarn "updates."
+		chattr +S /var/imap/user /var/imap/user/* /var/imap/quota /var/imap/quota/*
+		echo ""
+	fi
+
+	if df -T /var/spool/imap | grep -q ' ext[23] ' ; then
+		ewarn "Setting /var/spool/imap/* to synchronous updates."
+		chattr +S /var/spool/imap /var/spool/imap/*
+		echo ""
+	fi
+
+	ewarn "If the queue directory of the mail daemon resides on an ext2"
+	ewarn "or ext3 partition you need to set it manually to update"
+	ewarn "synchronously. E.g. 'chattr +S /var/spool/mqueue'."
+	echo ""
+
+	einfo "For correct logging with syslog add"
+	einfo "\tlocal6.* /var/log/imapd.log"
+	einfo "\tauth.debug /var/log/auth.log"
+	einfo "to /etc/syslog.conf."
+	echo ""
+
+	ewarn "You have to add user cyrus to the sasldb2. Do this with:"
+	ewarn "\tsaslpasswd2 cyrus"
+}
diff --git a/net-mail/cyrus-imapd/files/2.1.14-db4.patch b/net-mail/cyrus-imapd/files/2.1.14-db4.patch
new file mode 100644
index 000000000000..27c0cea48638
--- /dev/null
+++ b/net-mail/cyrus-imapd/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/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.1.14 b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.1.14
new file mode 100644
index 000000000000..5491e3f5a9d5
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.1.14
@@ -0,0 +1 @@
+MD5 e30da9749e926f847be5ab4e75eaf110 cyrus-imapd-2.1.14.tar.gz 1691926