Add 8bit patch wrt #18706 and #80630

Package-Manager: portage-2.0.51-r15

5 files changed, 424 insertions, 11 deletions

diff --git a/net-mail/cyrus-imapd/ChangeLog b/net-mail/cyrus-imapd/ChangeLog
index 8d9c794f63c9..ae0ea4db0108 100644
--- a/net-mail/cyrus-imapd/ChangeLog
+++ b/net-mail/cyrus-imapd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/cyrus-imapd
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.71 2005/02/24 18:35:27 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/ChangeLog,v 1.72 2005/03/01 21:26:03 ferdy Exp $
+
+*cyrus-imapd-2.2.12-r1 (01 Mar 2005)
+
+  01 Mar 2005; Fernando J. Pereda <ferdy@gentoo.org>
+  +files/cyrus-imapd-unsupported-8bit.patch, +cyrus-imapd-2.2.12-r1.ebuild:
+  Add 8bit patch wrt #18706 and #80630
 
   24 Feb 2005; Markus Rothe <corsair@gentoo.org> cyrus-imapd-2.2.12.ebuild:
   Added ~ppc64 to KEYWORDS
diff --git a/net-mail/cyrus-imapd/Manifest b/net-mail/cyrus-imapd/Manifest
index c60df8a92989..32cbb5f05f5a 100644
--- a/net-mail/cyrus-imapd/Manifest
+++ b/net-mail/cyrus-imapd/Manifest
@@ -1,17 +1,30 @@
-MD5 a7deb0cf58f8a93fdac4f7fe9f3a4ef3 ChangeLog 13965
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 6ed9baa618ef3b0e280efbcc566b2c07 cyrus-imapd-2.2.10.ebuild 8725
-MD5 f75ac452fb76a7c243de65854824a59d cyrus-imapd-2.2.10-r1.ebuild 9124
+MD5 f20192c002476b7ccc5db19a1d4246b2 cyrus-imapd-2.2.12-r1.ebuild 9324
 MD5 cb3e6d2ad7e7c3a56e174140ff4fb2d0 cyrus-imapd-2.2.12.ebuild 9118
+MD5 f75ac452fb76a7c243de65854824a59d cyrus-imapd-2.2.10-r1.ebuild 9124
+MD5 4094a70f25e53e76554fc7505b75c973 ChangeLog 14170
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 88f50354abbcae1950a2d11c74db5fe5 files/cyrus-imapd-2.2.10-libwrap.patch 390
-MD5 5a1c49cf6018aa400e8836ee03238140 files/digest-cyrus-imapd-2.2.10 71
+MD5 756c504a8b0b90aaa0630c089ae42f50 files/cyrus.rc6 573
+MD5 945aad1ac6ce2e72b6dede038c37c934 files/cyrus-imapd-2.2.12-drac.patch 926
+MD5 e76f31d728a283bf2dd2fb5b5a853af8 files/cyrus-imapd-unsupported-8bit.patch 3342
 MD5 08017debe8d02c695ec456e1165d920d files/cyrus.confd 279
-MD5 945aad1ac6ce2e72b6dede038c37c934 files/cyrus-imapd-2.2.10-drac.patch 926
+MD5 66137eb399ec7760afc24491a10d8bd7 files/imapd.conf 1587
 MD5 5a1c49cf6018aa400e8836ee03238140 files/digest-cyrus-imapd-2.2.10-r1 71
-MD5 945aad1ac6ce2e72b6dede038c37c934 files/cyrus-imapd-2.2.12-drac.patch 926
+MD5 28d9bdef56c61af75a28f8ae2ea2b5c7 files/digest-cyrus-imapd-2.2.12-r1 71
+MD5 ef68faa77664a88f939cee2f12019507 files/imap.pam 195
+MD5 88f50354abbcae1950a2d11c74db5fe5 files/cyrus-imapd-2.2.10-libwrap.patch 390
+MD5 5a1c49cf6018aa400e8836ee03238140 files/digest-cyrus-imapd-2.2.10 71
+MD5 28d9bdef56c61af75a28f8ae2ea2b5c7 files/digest-cyrus-imapd-2.2.12 71
 MD5 88f50354abbcae1950a2d11c74db5fe5 files/cyrus-imapd-2.2.12-libwrap.patch 390
+MD5 945aad1ac6ce2e72b6dede038c37c934 files/cyrus-imapd-2.2.10-drac.patch 926
 MD5 d91b5eaa87ced6cb7efc8c716fc7476a files/cyrus.conf 1354
-MD5 756c504a8b0b90aaa0630c089ae42f50 files/cyrus.rc6 573
-MD5 28d9bdef56c61af75a28f8ae2ea2b5c7 files/digest-cyrus-imapd-2.2.12 71
-MD5 ef68faa77664a88f939cee2f12019507 files/imap.pam 195
-MD5 66137eb399ec7760afc24491a10d8bd7 files/imapd.conf 1587
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.0 (GNU/Linux)
+
+iD8DBQFCJN3/ViELBEf1JB0RApqcAJ9SpDZjEtQ+mCZvRlMJjcugMM7cmQCfYSj4
+ES4Cp5fQaIa61YVpQ1C7hvY=
+=EBVO
+-----END PGP SIGNATURE-----
diff --git a/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r1.ebuild b/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r1.ebuild
new file mode 100644
index 000000000000..8c6160e7103c
--- /dev/null
+++ b/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r1.ebuild
@@ -0,0 +1,314 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/cyrus-imapd/cyrus-imapd-2.2.12-r1.ebuild,v 1.1 2005/03/01 21:26:03 ferdy Exp $
+
+inherit eutils ssl-cert gnuconfig fixheadtails
+
+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 ~sparc ~amd64 ~ppc ~hppa"
+IUSE="afs drac idled kerberos pam snmp ssl tcpd unsupported_8bit"
+
+PROVIDE="virtual/imapd"
+RDEPEND=">=sys-libs/db-3.2
+	>=dev-libs/cyrus-sasl-2.1.13
+	afs? ( >=net-fs/openafs-1.2.2 )
+	pam? (
+			>=sys-libs/pam-0.75
+			>=net-mail/mailbase-0.00-r8
+		)
+	kerberos? ( virtual/krb5 )
+	snmp? ( virtual/snmp )
+	ssl? ( >=dev-libs/openssl-0.9.6 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	drac? ( >=mail-client/drac-1.12-r1 )"
+
+DEPEND="$RDEPEND
+	sys-devel/libtool
+	>=sys-devel/autoconf-2.58
+	sys-devel/automake
+	>=sys-apps/sed-4"
+
+# "borrow" this from eldad in bug 60495 util portage can handle dep USE flags.
+check_useflag() {
+	local my_pkg=$(best_version ${1})
+	local my_flag=${2}
+
+	if [[ $(grep -wo ${my_flag} /var/db/pkg/${my_pkg}/USE) ]]; then
+		return 0
+	fi
+
+	return 1
+}
+
+tcpd_flag_check() {
+	local tcpd_flag
+	local cyrus_imapd_has_tcpd_flag
+	local my_pkg=${1}
+	einfo "${my_pkg} found"
+	check_useflag ${my_pkg} tcpd
+	tcpd_flag="$?"
+
+	if [ "${tcpd_flag}" == "0" ]; then
+		einfo "\"${my_pkg}\" has been emerged with \"tcpd\" USE flag"
+	else
+		einfo "\"${my_pkg}\" has been emerged without \"tcpd\" USE flag"
+	fi
+
+	if use tcpd; then
+		cyrus_imapd_has_tcpd_flag="0"
+	else
+		cyrus_imapd_has_tcpd_flag="1"
+	fi
+
+	if [ "${tcpd_flag}" != "${cyrus_imapd_has_tcpd_flag}" ]; then
+		eerror "both \"net-mail/cyrus-imapd\" and \"${my_pkg}\" have to be emerged"
+		eerror "with or without \"tcpd\" USE flag if you want to emerge"
+		eerror "this package with \"snmp\" USE flag. Bug #68254"
+		die "see above error message."
+	fi
+}
+
+net-snmp_check() {
+	if has_version ucd-snmp; then
+		tcpd_flag_check net-analyzer/ucd-snmp
+	fi
+
+	if has_version net-snmp; then
+		tcpd_flag_check net-analyzer/net-snmp
+		# check for minimal USE flag.
+		local has_minimal
+		check_useflag net-analyzer/net-snmp minimal
+		has_minimal="$?"
+		if [ "${has_minimal}" == "0" ]; then
+			eerror "If you want to emerge this package with \"snmp\" USE flag"
+			eerror "reemerge \"net-snmp\" without \"minimal\" USE flag"
+			die "see error message above"
+		fi
+
+		# check for tcpd USE flag in sync for both packages.
+
+		if [ "${net_snmp_has_tcpd_flag}" != "${cyrus_imapd_has_tcpd_flag}" ]; then
+			eerror "both \"cyrus-imapd\" and \"net-snmp\" have to be emerged"
+			eerror "with or without \"tcpd\" USE flag if you want to emerge"
+			eerror "this package with \"snmp\" USE flag. Bug #68254"
+			die "see above error message."
+		fi
+
+		# an atemptto solve bug #67411. Is there a better solution?
+		# check for net-snmp-config exit and executable.
+		if [ -x "$(type -p net-snmp-config)" ]; then
+			einfo "$(type -p net-snmp-config) is found and executable."
+			NSC_AGENTLIBS="$(net-snmp-config --agent-libs)"
+			einfo "NSC_AGENTLIBS=\""${NSC_AGENTLIBS}"\""
+			if [ -z "$NSC_AGENTLIBS" ]; then
+				eerror "NSC_AGENTLIBS is null"
+				einfo "please report this to bugs.gentoo.org"
+			fi
+			for i in ${NSC_AGENTLIBS}; do
+				# check for the DynaLoader path.
+				if [ "$(expr "$i" : '.*\(DynaLoader\)')" == "DynaLoader" ] ; then
+					DYNALOADER_PATH="$i"
+					einfo "DYNALOADER_PATH=\""${DYNALOADER_PATH}"\""
+					if [[ ! -f "${DYNALOADER_PATH}" ]]; then
+						eerror "\""${DYNALOADER_PATH}"\" is not found."
+						einfo "Have you upgraded \"perl\" after"
+						einfo "you emerged \"net-snmp\". Please re-emerge"
+						einfo "\"net-snmp\" then try again. Bug #67411."
+						die "\""${DYNALOADER_PATH}"\" is not found."
+					fi
+				fi
+			done
+		else
+			eerror "\"net-snmp-config\" not found or not executable!"
+			die "You have \"net-snmp\" installed but \"net-snmp-config\" is not found or not executable. Please re-emerge \"net-snmp\" and try again!"
+		fi
+	fi
+}
+
+pkg_setup() {
+	if use snmp; then
+		net-snmp_check
+	fi
+}
+
+
+src_unpack() {
+	unpack ${A} && cd "${S}"
+
+	ht_fix_file ${S}/imap/xversion.sh
+
+	# Add unsupported patch wrt #18706 and #80630
+	use unsupported_8bit && epatch "${FILESDIR}/${PN}-unsupported-8bit.patch"
+
+	# Add drac database support.
+	if use drac ; then
+		# better check for drac. Bug #79442.
+		epatch "${FILESDIR}/${P}-drac.patch" || die "epatch failed"
+		epatch "${S}/contrib/drac_auth.patch" || die "epatch failed"
+	fi
+
+	# Add libwrap defines as we don't have a dynamicly linked library.
+	if use tcpd ; then
+		epatch "${FILESDIR}/${P}-libwrap.patch" || die "epatch failed"
+	fi
+
+	# DB4 detection and versioned symbols.
+	# The new cyrus-imapd has a new DB detection.
+	# Hopefully we don't need this patch anymore.
+	# epatch "${FILESDIR}/${P}-db4.patch" || die "epatch failed"
+
+	# Fix master(8)->cyrusmaster(8) manpage.
+	for i in `grep -rl -e 'master\.8' -e 'master(8)' "${S}"` ; do
+		sed -e 's:master\.8:cyrusmaster.8:g' \
+			-e 's:master(8):cyrusmaster(8):g' \
+			-i "${i}" || die "sed failed" || die "sed failed"
+	done
+	mv man/master.8 man/cyrusmaster.8 || die "mv failed"
+	sed -e "s:MASTER:CYRUSMASTER:g" \
+		-e "s:Master:Cyrusmaster:g" \
+		-e "s:master:cyrusmaster:g" \
+		-i man/cyrusmaster.8 || die "sed failed"
+
+	# Recreate configure.
+	export WANT_AUTOCONF="2.5"
+	gnuconfig_update
+	rm -rf configure config.h.in autom4te.cache || die
+	ebegin "Recreating configure"
+	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 drac)"
+	myconf="${myconf} $(use_with ssl openssl)"
+	myconf="${myconf} $(use_with snmp ucdsnmp)"
+	myconf="${myconf} $(use_with tcpd libwrap)"
+	myconf="${myconf} $(use_enable kerberos gssapi)"
+
+	if use idled; then
+		myconf="${myconf} --with-idle=idled"
+	else
+		myconf="${myconf} --with-idle=poll"
+	fi
+
+	econf \
+		--enable-murder \
+		--enable-listext \
+		--enable-netscapehack \
+		--with-extraident=Gentoo \
+		--with-service-path=/usr/lib/cyrus \
+		--with-cyrus-user=cyrus \
+		--with-cyrus-group=mail \
+		--with-com_err=yes \
+		--with-auth=unix \
+		--without-perl \
+		--disable-cyradm \
+		${myconf} || die "econf failed"
+
+	# needed for parallel make. Bug #72352.
+	cd ${S}/imap
+	emake xversion.h || die "emake xversion.h failed"
+
+	cd ${S}
+	emake || die "compile problem"
+}
+
+src_install() {
+	dodir /usr/bin /usr/lib
+	for subdir in master imap imtest timsieved notifyd sieve; do
+		make -C "${subdir}" DESTDIR="${D}" install || die "make install failed"
+	done
+
+	# Link master to cyrusmaster (postfix has a master too)
+	dosym /usr/lib/cyrus/master /usr/lib/cyrus/cyrusmaster
+
+	doman man/*.[0-8]
+	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}"
+	find "${D}/usr/share/doc" -name CVS -print0 | xargs -0 rm -rf
+
+	insinto /etc
+	doins "${FILESDIR}/cyrus.conf" "${FILESDIR}/imapd.conf"
+
+	newinitd "${FILESDIR}/cyrus.rc6" cyrus
+	newconfd "${FILESDIR}/cyrus.confd" cyrus
+
+	if use pam ; then
+		insinto /etc/pam.d
+	# This is now provided by mailbase-0.00-r8. See #79240
+	# 	newins "${FILESDIR}/imap.pam" imap
+	#	newins "${FILESDIR}/imap.pam" pop3
+		newins "${FILESDIR}/imap.pam" sieve
+	fi
+
+	if use ssl ; then
+		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Cyrus IMAP Server}"
+		insinto /etc/ssl/cyrus
+		docert server
+		fowners cyrus:mail /etc/ssl/cyrus/server.{key,pem}
+	fi
+
+	for subdir in imap/{,db,log,msg,proc,socket,sieve} spool/imap/{,stage.} ; do
+		keepdir "/var/${subdir}"
+		fowners cyrus:mail "/var/${subdir}"
+		fperms 0750 "/var/${subdir}"
+	done
+	for subdir in imap/{user,quota,sieve} spool/imap ; do
+		for i in a b c d e f g h i j k l m n o p q r s t v u w x y z ; do
+			keepdir "/var/${subdir}/${i}"
+			fowners cyrus:mail "/var/${subdir}/${i}"
+			fperms 0750 "/var/${subdir}/${i}"
+		done
+	done
+}
+
+pkg_postinst() {
+	ewarn "*****NOTE*****"
+	ewarn "If you're upgrading from versions prior to 2.2.2_BETA"
+	ewarn "be sure to read the following thoroughly:"
+	ewarn "http://asg.web.cmu.edu/cyrus/download/imapd/install-upgrade.html"
+	ewarn "*****NOTE*****"
+	echo
+
+	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
+		ebegin "Making /var/imap/user/* and /var/imap/quota/* synchronous."
+		chattr +S /var/imap/{user,quota}{,/*}
+		eend $?
+	fi
+
+	if df -T /var/spool/imap | grep -q ' ext[23] ' ; then
+		ebegin "Making /var/spool/imap/* synchronous."
+		chattr +S /var/spool/imap{,/*}
+		eend $?
+	fi
+
+	ewarn "If the queue directory of the mail daemon resides on an ext2"
+	ewarn "or ext3 filesystem you need to set it manually to update"
+	ewarn "synchronously. E.g. 'chattr +S /var/spool/mqueue'."
+	echo
+
+	einfo "For correct logging add the following to /etc/syslog.conf:"
+	einfo "    local6.*         /var/log/imapd.log"
+	einfo "    auth.debug       /var/log/auth.log"
+	echo
+
+	ewarn "You have to add user cyrus to the sasldb2. Do this with:"
+	ewarn "    saslpasswd2 cyrus"
+}
diff --git a/net-mail/cyrus-imapd/files/cyrus-imapd-unsupported-8bit.patch b/net-mail/cyrus-imapd/files/cyrus-imapd-unsupported-8bit.patch
new file mode 100644
index 000000000000..cf6084456bae
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/cyrus-imapd-unsupported-8bit.patch
@@ -0,0 +1,79 @@
+--- cyrus-imapd-2.2.10/imap/message.c.munge8bit	2004-02-27 18:44:55.000000000 +0100
++++ cyrus-imapd-2.2.10/imap/message.c	2004-07-27 18:20:13.725563440 +0200
+@@ -227,6 +227,7 @@
+     int n;
+     int sawcr = 0, sawnl;
+     int reject8bit = config_getswitch(IMAPOPT_REJECT8BIT);
++    int munge8bit = config_getswitch(IMAPOPT_MUNGE8BIT);
+     int inheader = 1, blankline = 1;
+ 
+     while (size) {
+@@ -262,7 +263,7 @@
+ 			/* We have been configured to reject all mail of this
+ 			   form. */
+ 			if (!r) r = IMAP_MESSAGE_CONTAINS8BIT;
+-		    } else {
++		    } else if (munge8bit) {
+ 			/* We have been configured to munge all mail of this
+ 			   form. */
+ 			*p = 'X';
+--- cyrus-imapd-2.2.10/imap/spool.c.munge8bit	2004-03-04 17:09:34.000000000 +0100
++++ cyrus-imapd-2.2.10/imap/spool.c	2004-07-27 18:20:13.726563149 +0200
+@@ -140,6 +140,7 @@
+     state s = NAME_START;
+     int r = 0;
+     int reject8bit = config_getswitch(IMAPOPT_REJECT8BIT);
++    int munge8bit = config_getswitch(IMAPOPT_MUNGE8BIT);
+     const char **skip = NULL;
+ 
+     if (namelen == 0) {
+@@ -266,7 +267,7 @@
+ 			   form. */
+ 			r = IMAP_MESSAGE_CONTAINS8BIT;
+ 			goto ph_error;
+-		    } else {
++		    } else if (munge8bit) {
+ 			/* We have been configured to munge all mail of this
+ 			   form. */
+ 			c = 'X';
+--- cyrus-imapd-2.2.10/lib/imapoptions.munge8bit	2004-07-21 21:07:45.000000000 +0200
++++ cyrus-imapd-2.2.10/lib/imapoptions	2004-07-27 18:20:13.722564314 +0200
+@@ -458,6 +458,12 @@
+ { "mboxlist_db", "skiplist", STRINGLIST("flat", "berkeley", "skiplist")}
+ /* The cyrusdb backend to use for the mailbox list. */
+ 
++{ "munge8bit", 1, SWITCH }
++/* If enabled, lmtpd munges messages with 8-bit characters.  These characters
++   are changed to .  If \fBreject8bit\fR is enabled, setting \fBmunge8bit\fR
++   has no effect.  (A proper soultion to non-ASCII characters in headers is
++   offered by RFC 2047 and its predecessors.) */
++
+ # xxx badly worded
+ { "mupdate_connections_max", 128, INT }
+ /* The max number of connections that a mupdate process will allow, this
+@@ -670,9 +676,7 @@
+ 
+ { "reject8bit", 0, SWITCH }
+ /* If enabled, lmtpd rejects messages with 8-bit characters in the
+-   headers.  Otherwise, 8-bit characters are changed to `X'.  (A
+-   proper soultion to non-ASCII characters in headers is offered by  
+-   RFC 2047 and its predecessors.) */
++   headers. */
+ 
+ { "rfc2046_strict", 0, SWITCH }
+ /* If enabled, imapd will be strict (per RFC 2046) when matching MIME
+--- cyrus-imapd-2.2.10/man/deliver.8.munge8bit	2004-06-21 20:40:10.000000000 +0200
++++ cyrus-imapd-2.2.10/man/deliver.8	2004-07-27 18:20:13.719565188 +0200
+@@ -147,8 +147,10 @@
+ Accept messages using the LMTP protocol.
+ .SH NOTES
+ Depending on the setting of \fBreject8bit\fR in \fBimapd.conf(5)\fR, deliver
+-either rejects messages with 8-bit-set characters in the headers or 
+-changes these characters to `X'.
++either rejects/accepts messages with 8-bit-set characters in the headers.
++If we accept messages with 8-bit-set characters in the headers, then depending
++on the setting of \fBmunge8bit\fR, these characters are either left un-touched
++or changed to .
+ This is because such characters can't be interpreted since the
+ character set is not known, although some communities not well-served by
+ US-ASCII assume that those characters can be used to represent characters not
diff --git a/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.12-r1 b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.12-r1
new file mode 100644
index 000000000000..9ba8fcd5d938
--- /dev/null
+++ b/net-mail/cyrus-imapd/files/digest-cyrus-imapd-2.2.12-r1
@@ -0,0 +1 @@
+MD5 70b3bba526a8d36d3bb23a87d37e9188 cyrus-imapd-2.2.12.tar.gz 1961161