New ebuild including patches for overflows found in bug #11537

5 files changed, 293 insertions, 1 deletions

diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog
index 5aba0b97d33f..ce06cbcb842e 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 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.15 2002/11/26 08:07:50 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.16 2002/12/04 01:22:06 raker Exp $
+
+*cyrus-imapd-2.1.10 (03 Dec 2002)
+
+  03 Dec 2002; Nick Hadaway <raker@gentoo.org>
+  cyrus-imapd-2.1.10.ebuild, files/digest-cyrus-imapd-2.1.10,
+  files/libsieve-overflow.diff, files/imap-overflow.diff :
+  New ebuild with overflow patches from bug #11537.
 
 *cyrus-imapd-2.1.9-r2 (26 Nov 2002)
 
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.1.10.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.1.10.ebuild
new file mode 100644
index 000000000000..c92f4d023ca2
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.1.10.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2002 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.10.ebuild,v 1.1 2002/12/04 01:22:06 raker Exp $
+
+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"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~x86 -ppc -sparc -sparc64"
+
+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/krb5-1.2.5 )
+	>=sys-libs/db-3.2
+	>=sys-libs/pam-0.75
+	>=dev-libs/cyrus-sasl-2.1.2
+	>=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}
+
+	# Quiet down warnings when compiling with SSL enabled
+	patch < ${FILESDIR}/config.diff || die "patch failed"
+
+	# Kerberos libraries have changed
+	cp configure configure.orig
+	sed -e "s:-ldes:-ldes425:" \
+		< configure.orig > configure || die "patch failed"
+
+	# libsieve buffer overflow fix - bug #11537
+	patch -p1 < ${FILESDIR}/libsieve-overflow.diff || die "patch failed"
+
+	# imap buffer overflow fix - bug #11537
+	patch -p1 < ${FILESDIR}/imap-overflow.diff || die "patch failed"
+
+}
+
+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 --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 \
+		${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 
+	mkdir -m 0755 ${D}var/imap/db
+	chown -R cyrus.mail ${D}var/imap/db
+	mkdir -m 0755 ${D}var/imap/log
+	chown -R cyrus.mail ${D}var/imap/log
+	mkdir -m 0755 ${D}var/imap/msg
+	chown -R cyrus.mail ${D}var/imap/msg
+	mkdir -m 0755 ${D}var/imap/user
+	chown -R cyrus.mail ${D}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
+	done
+	mkdir -m 0755 ${D}var/imap/proc
+	chown -R cyrus.mail ${D}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
+	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 ; done
+   	mkdir -m 0755 ${D}var/imap/socket
+        chown -R cyrus.mail ${D}var/imap/socket
+
+	mkdir ${D}var/spool
+	mkdir -m 0750 ${D}var/spool/imap
+        chown -R cyrus.mail ${D}var/spool/imap
+	mkdir -m 0755 ${D}var/spool/imap/stage.
+        chown -R cyrus.mail ${D}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 ; 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.10 b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.1.10
new file mode 100644
index 000000000000..58264e839b62
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.1.10
@@ -0,0 +1 @@
+MD5 5c7a6d97a472263aa8ade28c0d3c55cc cyrus-imapd-2.1.10.tar.gz 1636863
diff --git a/net-mail/cyrus-imapd/files/imap-overflow.diff b/net-mail/cyrus-imapd/files/imap-overflow.diff
new file mode 100644
index 000000000000..c6ee0cac3864
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/imap-overflow.diff
@@ -0,0 +1,29 @@
+diff -urN cyrus-imapd-2.1.10/imap/imapparse.c cyrus-imapd-2.1.10-modified/imap/imapparse.c
+--- cyrus-imapd-2.1.10/imap/imapparse.c	2002-12-03 17:08:02.000000000 -0600
++++ cyrus-imapd-2.1.10-modified/imap/imapparse.c	2002-12-03 17:45:52.000000000 -0600
+@@ -97,7 +97,7 @@
+ 	       struct buf *buf, int type)
+ {
+     int c;
+-    int i;
++    unsigned int i;
+     unsigned int len = 0;
+     int sawdigit = 0;
+     int isnowait;
+@@ -228,6 +228,16 @@
+ 	    if (c != EOF) prot_ungetc(c, pin);
+ 	    return EOF;
+ 	}
++	if (len > 65536) {
++	    if (isnowait) {
++	        for (i = 0; i < len; i++)
++	            c = prot_getc(pin);
++	    }
++	    prot_printf(pout, "* BAD Literal too large\r\n");
++	    prot_flush(pout);
++	    if (c != EOF) prot_ungetc(c, pin);
++	    return EOF;
++	}
+ 	if (len >= buf->alloc) {
+ 	    buf->alloc = len+1;
+ 	    buf->s = xrealloc(buf->s, buf->alloc+1);
diff --git a/net-mail/cyrus-imapd/files/libsieve-overflow.diff b/net-mail/cyrus-imapd/files/libsieve-overflow.diff
new file mode 100644
index 000000000000..6878a3074192
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/libsieve-overflow.diff
@@ -0,0 +1,53 @@
+diff -urN cyrus-imapd-2.1.10/sieve/addr.y cyrus-imapd-2.1.10-modified/sieve/addr.y
+--- cyrus-imapd-2.1.10/sieve/addr.y	2002-12-03 17:08:02.000000000 -0600
++++ cyrus-imapd-2.1.10-modified/sieve/addr.y	2002-12-03 17:06:38.000000000 -0600
+@@ -82,8 +82,9 @@
+ /* copy address error message into buffer provided by sieve parser */
+ int yyerror(char *s)
+ {
+-extern char addrerr[];
++extern char addrerr[512];
+ 
+-    strcpy(addrerr, s);
++    strncpy(addrerr, s, sizeof(addrerr)-1);
++    addrerr[sizeof(addrerr)-1] = '\0';
+     return 0;
+ }
+diff -urN cyrus-imapd-2.1.10/sieve/sieve.y cyrus-imapd-2.1.10-modified/sieve/sieve.y
+--- cyrus-imapd-2.1.10/sieve/sieve.y	2002-12-03 17:08:02.000000000 -0600
++++ cyrus-imapd-2.1.10-modified/sieve/sieve.y	2002-12-03 17:06:38.000000000 -0600
+@@ -810,7 +810,7 @@
+     addrptr = s;
+     addrerr[0] = '\0';	/* paranoia */
+     if (addrparse()) {
+-	sprintf(errbuf, "address '%s': %s", s, addrerr);
++	snprintf(errbuf, sizeof(errbuf), "address '%s': %s", s, addrerr);
+ 	yyerror(errbuf);
+ 	return 0;
+     }
+@@ -835,7 +835,7 @@
+ 	   ;  controls, SP, and
+ 	   ;  ":". */
+ 	if (!((*h >= 33 && *h <= 57) || (*h >= 59 && *h <= 126))) {
+-	    sprintf(errbuf, "header '%s': not a valid header", hdr);
++	    snprintf(errbuf, sizeof(errbuf), "header '%s': not a valid header", hdr);
+ 	    yyerror(errbuf);
+ 	    return 0;
+ 	}
+@@ -853,14 +853,14 @@
+ 	if (strcmp(f, "\\seen") && strcmp(f, "\\answered") &&
+ 	    strcmp(f, "\\flagged") && strcmp(f, "\\draft") &&
+ 	    strcmp(f, "\\deleted")) {
+-	    sprintf(errbuf, "flag '%s': not a system flag", f);
++	    snprintf(errbuf, sizeof(errbuf), "flag '%s': not a system flag", f);
+ 	    yyerror(errbuf);
+ 	    return 0;
+ 	}
+ 	return 1;
+     }
+     if (!imparse_isatom(f)) {
+-	sprintf(errbuf, "flag '%s': not a valid keyword", f);
++	snprintf(errbuf, sizeof(errbuf), "flag '%s': not a valid keyword", f);
+ 	yyerror(errbuf);
+ 	return 0;
+     }