Bump to 4.5.0, fixes #271316

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

3 files changed, 262 insertions, 13 deletions

diff --git a/net-mail/courier-imap/ChangeLog b/net-mail/courier-imap/ChangeLog
index 4f5119ad0f09..349cc8c7d4ae 100644
--- a/net-mail/courier-imap/ChangeLog
+++ b/net-mail/courier-imap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/courier-imap
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.168 2008/12/22 20:03:44 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.169 2009/06/28 10:06:12 patrick Exp $
+
+*courier-imap-4.5.0 (28 Jun 2009)
+
+  28 Jun 2009; Patrick Lauer <patrick@gentoo.org>
+  +courier-imap-4.5.0.ebuild:
+  Bump to 4.5.0, fixes #271316
 
   22 Dec 2008; Raúl Porcel <armin76@gentoo.org>
   courier-imap-4.0.6-r3.ebuild:
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index c9067cd92e7f..6f548c9f4e5e 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX authdaemond-3.0.4-r1 1062 RMD160 5e9184dc8c8ccbb528252c0795b5cd62b1d1b9c8 SHA1 55180242453ee47c951d265615da7a0902a5dc1f SHA256 2731b87fec98ae4ecdb5cfdb5917894e28eaf768f68555462d801c116cfa2a0d
 AUX authdaemond.conf-3.0.4-r1 544 RMD160 52c3d3ec3c720ef36d03b531e9f4408149769d19 SHA1 f433ce39a182b7e2d7c91d22c59546e5fc552d83 SHA256 6bbf884df95152b5f8e1b0cd404a1833c1e337ccd44360156296122d2c9bb72f
 AUX courier-imap-3.0.8-db4-bdbobj_configure.in.patch 1263 RMD160 3f5c2a5f4818a138e3fe118d790ceb1fb6b4aff4 SHA1 72cc2d43835efe8833ece60602ebd839d5480729 SHA256 e33f23799ffb934b083512c9cc58f81803610123f4ad38fda800431f0d67fa73
@@ -59,6 +56,7 @@ DIST courier-imap-4.0.4.tar.bz2 3156707 RMD160 438559fe800ca47fb2d1cf5c3c3605964
 DIST courier-imap-4.0.6.tar.bz2 3157577 RMD160 4006c5ec4db6b2adac393e2ebdf9ee99af3a8b2a SHA1 d7fee884cc0015586459c511dbe03bc2a8466c7f SHA256 27e6847507ddecfab1672fdf52447f8351f4cf046145974768ea93ebfea6ddbb
 DIST courier-imap-4.1.2.tar.bz2 3257311 RMD160 56546e90fc16f92daab6d7540154bc5f7ad06e27 SHA1 73ed09528f440ef07ba98f59a83172f4f6f4106b SHA256 37c3530b31e0b9b5a5bcd639ac3db4862f12e77ec39d8d67f19e630d76853d71
 DIST courier-imap-4.4.1.tar.bz2 3383036 RMD160 ae1feff71b6dbd893ba1866bf4bf974e84210236 SHA1 c5d7a2790f6ce0ed7eda90a36268a1e772627bd7 SHA256 d7cff71f0aaf34ea8dc6823550dadf62def4f616b750548bf0512f12d1b4725f
+DIST courier-imap-4.5.0.tar.bz2 3565751 RMD160 eb53e59521d6c8799e6c28546258b77ded67be2c SHA1 e9828ae7f6880b546d4d4316952a26a5da640c12 SHA256 3d7de2ba6d5f7fa2e7ac4bfeb053055e127234c3442a09f36aa5dd71b9f44ffa
 EBUILD courier-imap-3.0.8.ebuild 9383 RMD160 7b30a1c9b048417ba29406a7ac5930303181201e SHA1 e637f44d350b994aa4a0384c8d313da7df6f0856 SHA256 a429c8cd455c7a85613afd2a6d7d8131c7031d2f1104078d4a8d661c1ebaa57b
 EBUILD courier-imap-4.0.1-r1.ebuild 10410 RMD160 cc48826c384e7cfe40ecf64d1debffa8b9264276 SHA1 1bb5931e33f2c9cde50b9ee41e34e85b56f0097f SHA256 2abe9eebf66c18270ea47346a252a0f617067ef9e94b87e9e63e089b3a0c7929
 EBUILD courier-imap-4.0.1-r2.ebuild 10513 RMD160 d9d129a6e065d863fd6379079caf5022a3b1109a SHA1 fdc540c375332324fec2e035072fd3a1d8f3eb6a SHA256 0ed1bc000bc34d63e3647180fcbe1d424755318bd178ba33f06baae54c0dd715
@@ -70,12 +68,6 @@ EBUILD courier-imap-4.1.2-r1.ebuild 8620 RMD160 40bbc20ffd238606fee0e4f4931ff501
 EBUILD courier-imap-4.1.2-r2.ebuild 8617 RMD160 7c1056d264a175a57a01fa0f31ae681a4cc65232 SHA1 8a197e21a46085aa236e999b1b9c0f751c81c14e SHA256 d85dac2b0bc549b1cce56c799c0cc0b94046cb9a2624cb4803c6fbe88ceeb373
 EBUILD courier-imap-4.4.1-r1.ebuild 8183 RMD160 1c4134f10409900b4806339bc50c3ee8120500e1 SHA1 3fe3dbb7e46dd940c2d0dc0981f93b7ad2830be6 SHA256 26cae5a1b12dfa0cad20f779f92fed457f89c7d7380c557f53897e7498d37e29
 EBUILD courier-imap-4.4.1.ebuild 8184 RMD160 7b03e06fac0d8e96bf280c88c19c729580c62012 SHA1 f16c9f0c5b823e71ed27ec1d79ca7b1435211ece SHA256 7ddab73021b79078d44e910d4cc53bee2a0a06f0ee1f24e0b81c12143df6b23b
-MISC ChangeLog 33000 RMD160 91058c94ffbb878429e24f4bb6c401c02211a6c5 SHA1 3b34cadeff42df4421836bf225e204488a23504b SHA256 1c72fbe6ec6c63c4bb6635b074c89c1ce20bc6f9a2b46076b925fc22bb3c8e50
+EBUILD courier-imap-4.5.0.ebuild 8231 RMD160 6d041a19276fe17aaa3aace9617070a3b5eebb98 SHA1 cb449c3c659655d24499f19232dd7e6c2bc5f9b6 SHA256 edacb3c6756dd9e2c989f3bb48a6c214dbdc93eb66034085e0c551651cae108f
+MISC ChangeLog 33147 RMD160 d3685548a6088ef5faee1c1fb2ac723b4a124066 SHA1 af82f6b5ee64025e85d289d628553e663a7558a4 SHA256 18952c4ca68c1b1c81816e787fd1e8d8713bc46a579a768b8435c8a6c1c739fa
 MISC metadata.xml 258 RMD160 897ec10251e2fc462bdbb9780e945c896f44c7c1 SHA1 4f790bcbe4149520174095bb7e048a8e39fbfc16 SHA256 87167a6f2c7b3c99a92806e11600b3c9bfb1b51126a670fd2bc9b4358935f810
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkldk8sACgkQn/5bYzqsSmGMGQCfWJveqOjAJ1Arv7OF5M95hShi
-pVEAoMfc7kY8ifpxJOyCcN2Rcuo3/uoj
-=IIqe
------END PGP SIGNATURE-----
diff --git a/net-mail/courier-imap/courier-imap-4.5.0.ebuild b/net-mail/courier-imap/courier-imap-4.5.0.ebuild
new file mode 100644
index 000000000000..899c820affaf
--- /dev/null
+++ b/net-mail/courier-imap/courier-imap-4.5.0.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/courier-imap-4.5.0.ebuild,v 1.1 2009/06/28 10:06:12 patrick Exp $
+
+inherit autotools eutils multilib libtool
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
+
+DESCRIPTION="An IMAP daemon designed specifically for maildirs."
+HOMEPAGE="http://www.courier-mta.org/"
+SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="berkdb debug fam gdbm ipv6 nls selinux gnutls"
+
+# userpriv breaks linking against vpopmail
+RESTRICT="userpriv"
+
+RDEPEND="gnutls? ( net-libs/gnutls )
+		!gnutls? ( >=dev-libs/openssl-0.9.6 )
+		>=net-libs/courier-authlib-0.61
+		>=net-mail/mailbase-0.00-r8
+		berkdb? ( sys-libs/db )
+		fam? ( virtual/fam )
+		gdbm? ( >=sys-libs/gdbm-1.8.0 )
+		selinux? ( sec-policy/selinux-courier-imap )"
+DEPEND="${RDEPEND}
+		dev-lang/perl
+		!mail-mta/courier
+		userland_GNU? ( sys-process/procps )"
+RDEPEND="${RDEPEND}
+		!virtual/imapd"
+
+PROVIDE="virtual/imapd"
+
+RC_VER="4.0.6-r1"
+INITD_VER="4.0.6-r1"
+
+pkg_setup() {
+	if ! use berkdb && ! use gdbm ; then
+		echo
+		eerror "Either the 'berkdb' or the 'gdbm' USE flag is required."
+		eerror "Please add it to '/etc/make.conf' or '/etc/portage/package.use'."
+		eerror "Use 'man 5 portage' for more info on '/etc/portage/package.use'."
+		echo
+		die "Required USE flag missing."
+	fi
+}
+
+vpopmail_setup() {
+	VPOPMAIL_INSTALLED=
+	VPOPMAIL_DIR=
+	export VPOPMAIL_INSTALLED VPOPMAIL_DIR
+	VPOPMAIL_DIR=$(grep ^vpopmail /etc/passwd 2>/dev/null | cut -d: -f6)
+	VPOPMAIL_INSTALLED=
+	if has_version 'net-mail/vpopmail' && [[ -n "${VPOPMAIL_DIR}" ]] && [[ -f "${VPOPMAIL_DIR}/etc/lib_deps" ]] ; then
+		VPOPMAIL_INSTALLED=1
+	else
+		VPOPMAIL_DIR=
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Bug #48838. Patch to enable/disable FAM support.
+	# 20 Aug 2004 langthang@gentoo.org
+	# This patch should fix bug #51540. fam USE flag is not needed for shared folder support.
+	epatch "${FILESDIR}"/${PN}-4.0.1-disable-fam-configure.in.patch
+
+	# Kill unneeded call to AC_PROG_SYSCONFTOOL (bug #168206).
+	epatch "${FILESDIR}"/${PN}-4.0.6-aclocal-fix.patch
+
+	# These patches should fix problems detecting BerkeleyDB.
+	# We now can compile with db4 support.
+	if use berkdb ; then
+		epatch "${FILESDIR}"/${PN}-4.0.6-db4-bdbobj_configure.in.patch
+		epatch "${FILESDIR}"/${PN}-4.0.6-db4-configure.in.patch
+	fi
+
+	ebegin "Recreating configure"
+	eautoreconf || die "eautoreconf failed"
+	eend $?
+}
+
+src_compile() {
+	vpopmail_setup
+
+	local myconf=""
+
+	# 19 Aug 2004 langthang@gentoo.org
+	# Default to gdbm if both berkdb and gdbm are present.
+	if use gdbm ; then
+		einfo "Building with GDBM support"
+		myconf="${myconf} --with-db=gdbm"
+	elif use berkdb ; then
+		einfo "Building with BerkeleyDB support"
+		myconf="${myconf} --with-db=db"
+	fi
+
+	# The default character set is ISO-8859-1/US-ASCII.
+	# USE 'nls' will enable all available character sets.
+	# Set ENABLE_UNICODE=iso-8859-1,utf-8,iso-8859-10
+	# to include only specified translation tables.
+	if use nls && [[ -z "${ENABLE_UNICODE}" ]] ; then
+		einfo "ENABLE_UNICODE is not set, building with all available character sets"
+		myconf="${myconf} --enable-unicode"
+	elif use nls ; then
+		einfo "ENABLE_UNICODE is set, building with unicode=${ENABLE_UNICODE}"
+		myconf="${myconf} --enable-unicode=${ENABLE_UNICODE}"
+	else
+		einfo "Disabling unicode support"
+		myconf="${myconf} --disable-unicode"
+	fi
+
+	use debug && myconf="${myconf} debug=true"
+
+	# Fix for bug #21330
+	CFLAGS="$(echo ${CFLAGS} | xargs)"
+	CXXFLAGS="$(echo ${CXXFLAGS} | xargs)"
+	LDFLAGS="$(echo ${LDFLAGS} | xargs)"
+
+	# Do the actual build now
+	LDFLAGS="${LDFLAGS} " econf \
+		--disable-root-check \
+		--bindir=/usr/sbin \
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc/${PN} \
+		--libexecdir=/usr/$(get_libdir)/${PN} \
+		--localstatedir=/var/lib/${PN} \
+		--with-authdaemonvar=/var/lib/${PN}/authdaemon \
+		--enable-workarounds-for-imap-client-bugs \
+		--with-mailuser=mail \
+		--with-mailgroup=mail \
+		$(use_with fam) \
+		$(use_with ipv6) \
+		$(use_with gnutls) \
+		${myconf} || die "econf failed"
+
+	# Change the pem file location.
+	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \
+		imap/imapd-ssl.dist || \
+		die "sed failed"
+
+	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \
+		imap/pop3d-ssl.dist || \
+		die "sed failed"
+
+	# spurious failures with parallel compiles
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	vpopmail_setup
+
+	dodir /var/lib/${PN} /etc/pam.d
+	emake DESTDIR="${D}" install || die "emake install failed"
+	rm -Rf "${D}/etc/pam.d"
+
+	# Avoid name collisions in /usr/sbin wrt imapd and pop3d
+	cd "${D}/usr/sbin"
+	for name in imapd pop3d ; do
+		mv -f "${name}" "courier-${name}" || die "Failed to mv ${name} to courier-${name}"
+	done
+
+	# Hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of
+	# 'Maildir', and to use /usr/sbin/courier-foo names.
+	cd "${D}/usr/$(get_libdir)/${PN}"
+	for service in {imapd,pop3d}{,-ssl} ; do
+		sed -i -e 's/Maildir/${MAILDIR}/' "${service}.rc" || die "sed failed"
+		sed -i -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" "${service}.rc" || die "sed failed"
+	done
+
+	# Rename the config files correctly and add a value for ${MAILDIR} to them.
+	cd "${D}/etc/${PN}"
+	for service in {imapd,pop3d}{,-ssl} ; do
+		mv -f "${service}.dist" "${service}" || die "Failed to mv ${service}.dist to ${service}"
+		echo -e '\n# Hardwire a value for ${MAILDIR}' >> "${service}"
+		echo 'MAILDIR=.maildir' >> "${service}"
+		echo 'MAILDIRPATH=.maildir' >> "${service}"
+	done
+	for service in imapd pop3d ; do
+		echo -e '# Put any program for ${PRERUN} here' >> "${service}"
+		echo 'PRERUN=' >> "${service}"
+		echo -e '# Put any program for ${LOGINRUN} here' >> "${service}"
+		echo -e '# this is for relay-ctrl-allow in 4*' >> "${service}"
+		echo 'LOGINRUN=' >> "${service}"
+	done
+
+	cd "${D}/usr/sbin"
+	for x in * ; do
+		if [[ -L "${x}" ]] ; then
+			rm -f "${x}" || die "Failed to rm ${x}"
+		fi
+	done
+
+	cd ../share
+	mv -f * ../sbin
+	mv -f ../sbin/man .
+	cd ..
+
+	for x in mkimapdcert mkpop3dcert ; do
+		mv -f "${D}/usr/sbin/${x}" "${D}/usr/sbin/${x}.orig" || die "Failed to mv /usr/sbin/${x} to /usr/sbin/${x}.orig"
+	done
+
+	exeinto /usr/sbin
+	doexe "${FILESDIR}/mkimapdcert" "${FILESDIR}/mkpop3dcert" || die "doexe failed"
+
+	dosym /usr/sbin/courierlogger /usr/$(get_libdir)/${PN}/courierlogger || die "dosym failed"
+
+	mkdir "${WORKDIR}/tmp" ; cd "${WORKDIR}/tmp"
+	for initd in courier-{imapd,pop3d}{,-ssl} ; do
+		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" "${FILESDIR}/${PN}-${INITD_VER}-${initd}.rc6" > "${initd}" || die "initd libdir-sed failed"
+		doinitd "${initd}" || die "doinitd ${initd} failed"
+	done
+	exeinto /usr/$(get_libdir)/${PN}
+	for exe in gentoo-{imapd,pop3d}{,-ssl}.rc courier-{imapd,pop3d}.indirect ; do
+		sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" "${FILESDIR}/${PN}-${RC_VER}-${exe}" > "${exe}" || die "exe libdir-sed failed"
+		doexe "${exe}" || die "doexe ${exe} failed"
+	done
+
+	dodir /usr/bin
+	mv -f "${D}/usr/sbin/maildirmake" "${D}/usr/bin/maildirmake" || die "Failed to mv /usr/sbin/maildirmake to /usr/bin/maildirmake"
+
+	# Bug #45953, more docs.
+	cd "${S}"
+	dohtml -r "${S}"/*
+	dodoc "${S}"/{00README.NOW.OR.SUFFER,AUTHORS,INSTALL,NEWS,README,ChangeLog} "${FILESDIR}"/${PN}-gentoo.readme
+	docinto imap
+	dodoc "${S}"/imap/{ChangeLog,BUGS,BUGS.html,README}
+	docinto maildir
+	dodoc "${S}"/maildir/{AUTHORS,INSTALL,README.maildirquota.txt,README.sharedfolders.txt}
+	docinto tcpd
+	dodoc "${S}"/tcpd/README.couriertls
+}
+
+pkg_postinst() {
+	elog "Authdaemond is no longer provided by this package."
+	elog "Authentication libraries are now in courier-authlib."
+	elog "For a quick-start howto please refer to:"
+	elog "/usr/share/doc/${P}/${PN}-gentoo.readme.gz"
+	# Some users have been reporting that permissions on this directory were
+	# getting scrambled, so let's ensure that they are sane.
+	chmod 0755 "${ROOT}/usr/$(get_libdir)/${PN}" || die "Failed to ensure sane permissions on ${ROOT}/usr/$(get_libdir)/${PN}"
+}
+
+src_test() {
+	ewarn "make check is not supported by this package due to the"
+	ewarn "--enable-workarounds-for-imap-client-bugs option."
+}