Headtail fix.

3 files changed, 237 insertions, 2 deletions

diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index 662d40bdbfc6..f7a101192478 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,10 +1,10 @@
 MD5 b01c408b0da4bcb933633ef4957395cb cyrus-imapd-2.1.13.ebuild 6876
 MD5 b02d78daa9e8077f9cb1545011fa74d8 cyrus-imapd-2.1.15.ebuild 6984
 MD5 8137607660547cbe261c7efcae936491 cyrus-imapd-2.1.12.ebuild 6848
-MD5 66bfc553631bdd5c3a675efe42040989 cyrus-imapd-2.1.15-r1.ebuild 7038
+MD5 2c63f3db93067a8b7c7dce460d2f9345 cyrus-imapd-2.1.15-r1.ebuild 7044
 MD5 0fc20824009e6d624507789570c22e88 cyrus-imapd-2.1.11-r1.ebuild 6270
 MD5 55a3646a96dbe9e7659d543f46a1b5f0 cyrus-imapd-2.1.14.ebuild 7002
-MD5 0e8b342343b4e626e97c386ba46545e5 ChangeLog 6332
+MD5 9363f91adcba86426b9369c904d8e4a1 ChangeLog 6472
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 374ae77d5cbb38777c1416e60b12c1d6 files/libsieve-overflow.diff 1898
 MD5 e2c00049c69e3eca58d5a635dd3fd6dc files/configure.diff 6285
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.1.15-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.1.15-r1.ebuild
new file mode 100644
index 000000000000..f7fe5658fb4c
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.1.15-r1.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.1.15-r1.ebuild,v 1.1 2003/10/04 09:32:52 pyrania Exp $
+
+inherit eutils fixheadtails
+IPV6_P="${P}-ipv6-20030819"
+
+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? ( >=app-crypt/mit-krb5-1.2.6 )
+	>=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.15-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
+
+	cd ${S}
+	ht_fix_file imap/xversion.sh
+}
+
+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} --enable-gssapi" \
+		|| myconf="${myconf} --disable-gssapi"
+
+	econf \
+		--enable-listext \
+		--with-cyrus-group=mail \
+		--enable-netscapehack \
+		--with-com_err=yes \
+		--without-perl \
+		--disable-cyradm \
+		--with-auth=unix \
+		--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/digest-cyrus-imapd-2.1.15-r1 b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.1.15-r1
new file mode 100644
index 000000000000..556a6f5137cc
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.1.15-r1
@@ -0,0 +1,2 @@
+MD5 17f1272218478bcc71665d9a756d5c07 cyrus-imapd-2.1.15.tar.gz 1698648
+MD5 de6e1de7a65938d1561cea38c39d77db cyrus-imapd-2.1.15-ipv6-20030819.diff.gz 33437