Version bump. Proxy commit for David Heidelberg (okias). Fixes bug #537396. Fix metadata. Drop many arches due to new dependency on net-libs/courier-unicode. Rekeywording in bug #532520.

Package-Manager: portage-2.2.16/cvs/Linux x86_64

4 files changed, 231 insertions, 25 deletions

diff --git a/net-mail/courier-imap/ChangeLog b/net-mail/courier-imap/ChangeLog
index b3a72bdea3be..474a2984ecdf 100644
--- a/net-mail/courier-imap/ChangeLog
+++ b/net-mail/courier-imap/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-mail/courier-imap
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.225 2014/11/21 10:06:11 vapier Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v 1.226 2015/02/09 17:01:23 mrueg Exp $
+
+*courier-imap-4.16.0 (09 Feb 2015)
+
+  09 Feb 2015; Manuel Rüger <mrueg@gentoo.org> +courier-imap-4.16.0.ebuild,
+  metadata.xml:
+  Version bump. Proxy commit for David Heidelberg (okias). Fixes bug #537396.
+  Fix metadata. Drop many arches due to new dependency on net-libs/courier-
+  unicode. Rekeywording in bug #532520.
 
   21 Nov 2014; Mike Frysinger <vapier@gentoo.org> courier-imap-4.15-r1.ebuild:
   Drop MAKEOPTS=-j1 workaround now that eautoreconf is fixed #529404.
diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest
index b28b30f83bc6..5a8d6ffe074d 100644
--- a/net-mail/courier-imap/Manifest
+++ b/net-mail/courier-imap/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX courier-authdaemond-r1.service 373 SHA256 c5b647b2f72f8f3097a093d929d021b2ec758e5f8183c7990dfb56af2eed9f8e SHA512 5ef9b65c24700f93a31626d2a657e19165853151e5c33eb96b0d41b818b4669a2785dfb868054231df20acfdfc4218a0bbc7e21260e337a3075c54f97ba9c46b WHIRLPOOL edc6e642105862d7cc3a2b10ae28ea08a9d17a30d99c7620615da74fe2f587a4fae827d656cba0ae0395126dfd72d171172b4ada611e1b0cb8669e02b45bb4f8
 AUX courier-imap-4.0.6-r1-courier-imapd-ssl.rc6 1199 SHA256 7acf02d3dfbbfe691da7f89034a021b948999c125c1a83fb4742c4c219aaf01f SHA512 b0cc0fc54dde4cc2f5c81d2b3ce8223da1705d00f90d4cf72594b695ed203384baefe5ddc0b8ac9c3ed5d69b9bec393d367317a477e89f5ba7a9db3eea704324 WHIRLPOOL e32f0a8910934dde4bee8303772da3cd1a3ff9e66b389a840011551dd8dbba0fb7f87d150ae1f01ed4259439648f1f3f127eae2f463712e185dd2a7b955b4dfc
 AUX courier-imap-4.0.6-r1-courier-imapd.indirect 81 SHA256 5d2e175e20aa5d7b7049a76be847a9bd974d25625b5324ac8f23680cb7e734bc SHA512 22108e1a09e9fc6e6c035ca7f55ba382ec87bf889dd88c2f9934b087d285853a6eb8453fadfe456f9a6de57f973c988bbaba8ec449366f0df8396b430b1d64bf WHIRLPOOL c111c0cf627a4ca0287faeba60ed15a40b8925e1e0d0bec4b58a783feed2073a129a78b0578e0b309a0dafec00a2aac8b1427395bb65454a51d3c475c86a0f08
@@ -22,23 +19,8 @@ AUX courier-imapd-ssl-r1.service 310 SHA256 c4705212124c13f01dd386ed4342c2a9d3ea
 AUX mkimapdcert 996 SHA256 1ebd9ae44e3ca5fb906f5f399abec7d6f117d231db5725be0a1c4e043eaec4f6 SHA512 502eec64d1db7106ca83a38c18bb48ea9fa9d9a2526076fe45fbf54f7313866d9a4cf3bda7b0a8984af88fb8e8f35a24447071d3bc6882c8f158395d55548bf4 WHIRLPOOL de07fbe8ef656223a5fe43c5e8b6df909257e0c171978db30d0c43e3ef56a927dd26b11468545c89e431dceb34f75a44b290192d304c5e32eb29fe54aaf6d111
 AUX mkpop3dcert 996 SHA256 c241ccca359b5d126dc56fc73f21991d8a7bffb5c211d8b0a1e4e88e693eb7cb SHA512 eab113a442dd6b22b5d4eaa6beb755849e2af61dbb3f0bc3eb93c6e9240058c46e5220971504a18587eb2af8f5c8d8c7c44ce24ad898603319a78c1b11dec078 WHIRLPOOL 7b30ab63852376236717eb7cd230b453e2144f56641f506bd47b5fbea645fd7ac53c9147a9e3707a8b0233e74218f69c6b6d8c0f8ff764b3aa13a18d22d966b8
 DIST courier-imap-4.15.tar.bz2 3266353 SHA256 6c34107e7ba9e5396d50b58fb414a495806335cab7135c96ad85a3816785b109 SHA512 7829662282db5e6f414a1d34f06a94c2dd028e263510f01b49ebd3a1a4994055ecc08604568f5a44a30f6411e3a34e0d6c38807c29eaf255752191e885f82e1a WHIRLPOOL 1b5e42bd1f72e3205030b54e9564ce45c4eccb394b31c64a616f225def5a5df05f74ef62c59fbea63b18ce336d77cc2368170a982abb7a6e94d309d0c6ee4dd2
+DIST courier-imap-4.16.0.tar.bz2 3021228 SHA256 20ee63fbb5eef671dfcceecf3ed3eb48663cff3bcb607ecc904d0bc4f8c0b4b2 SHA512 5f84c035e3936cf2b435efee7ecb98f98da8ecdd3afa3661ba03737d870aa038586a49c3a696fd8d028302349279139e90b1befc1d42a8488909c0ca0ea96a5c WHIRLPOOL be8b916ff9526c0a34cbad210bb026ab176a327eba4c4e5d76da7d99e800418749b0ab50bff9ce9a7378ddfd9342a86ad3462e4418e0d36bad159ed2db3af069
 EBUILD courier-imap-4.15-r1.ebuild 7463 SHA256 781a942d00ef4afaa33beb9777d1022523c4d1be01a5a1614854851946755e0f SHA512 fd9abfdbd42f8c93626da89fe91ba2a3ace48994e3a8a9bb8fa6862cb4da93a17f87b9a82e272a9a7774b9073624df7e51590e064dca658314608f80a707e9f2 WHIRLPOOL 9d160b263cd34868aa539c9ec634bb244f500c4b3c1f6ac7929c7b607df8e4acac5f19afc87861a7b50b5094af0a51ce3738071af3a4ada7e9d446b08ca34053
-MISC ChangeLog 44578 SHA256 551aa08440d77e3a2d0566d2eee0202c7f2903de7648a10f918cc219a384aded SHA512 2581cdc8e85bca64a64f7037345a5ae669dfd7eb005c1eb535578a0339580bf4bf16ffa357552cc8267b86c276f15549ec1e6f572c990c9a4506f74a57978823 WHIRLPOOL 7017d17a539734b2f7a39a3b78c3ab126de451c8981e4f0ba1f99f194fa73420eb62e0e53f18f3e02abca7e41ed3fb56892b40ec2cd7093f658010ed1a692015
-MISC metadata.xml 578 SHA256 294f89e2d5605d2c0587af64c19e7b03152fe8ec9d3de808f258dbea18b9745a SHA512 7aa6e2e377c98660dabcfbac7408e116aaa9fe950a8c572e7b52543060fd94dbf030e64192706be07cc2d6bc747f0b261f1f9e054f5525fdc7cf1d8abc0dc53f WHIRLPOOL a96c8151d50203ece1ba55e8f38207eb1c46f328502bf8b227599ae9d1e0e2a50851311038309d0ab2e45a90b4d0510a75b18a47124f2a4fa027aca732dc48f1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAEBCAAGBQJUbw6UAAoJEPGu1DbS6WIA4XAP/iqBwLyAA7KbKaSkyrisQnFM
-gQUXmKm+4+efD4ygrvmASDaah8BtyQ0W8GAdR6fum1DaRlitdNvDoZj2E39I+AyL
-IiRTdf3+N5BHC79Xby2mukfBZnHRj5FOKEzR/fqDRMIKw9ZkC8fQsOX0dMuWOjlf
-LBP3C6FCNsNSkdMJ5XklzIAMSsEOMswQPxVRm9LxAWpPQ3z2S8ejZps1glUZ8K9L
-0TOalpk0LSXTo0cMYP7DlwnaMA/SOk9KFMJYYDr/W5SwTrcGWXUP1UB+sEzT1mFF
-dGJJjhANyUQuSiNs7R1jdZiDDf9xf9mzxIyiLuq2sioGU3jep1Ar9/AoXHFPCYtU
-fuj+qLdIe0WizJz5dxacVzONz2xCsVpVEQkrTDYsY+ycuQ/olx5Vyb0HJJ7HnSZX
-rgeWZCLpmOj3rme3HN3f4rARYRS5Ure4wkWsTL3Z9xKihCFH5pqWUmf5xY/LQt+K
-kWU3hyr6iKKh74a5tlxsLE1wlyMnc0kaSAYVSjCuTMq3Lz9hG251bRnvFukCZEnV
-0175ite6s8e27QCtleV7Wu9GF5J30jCp0Tk6A1LtbyTpT1bMI9WbHqigIVG0ds6g
-/wrfX8N4AdRCmOcA4Ck9F+yf8FeS1y8/hUwgdbi1vj9G60jrMYWAJ9BY4c/SER8W
-JsuDvme/faPI8JL7OraW
-=uGEK
------END PGP SIGNATURE-----
+EBUILD courier-imap-4.16.0.ebuild 6953 SHA256 3a434fbfd576aa3c633a73f62d7101930f7f642d72d131da2e97a83e0a61268d SHA512 1d3bbd2505fcee20effe61ea3934172e8b091d90fb6e12c610e10537404dfce88851c6e9e4238dbe3407c3660f0a2833f6f2d8e0c1888fe733c8a4001331b116 WHIRLPOOL 69488c2bf3e9540a32af7ecce3b9a5552dd3da4750f9c54deb9bb18b72e8a8ef6111fe29595d3e383b68b3cee9162961a9dcff0abd63cb940c0566c9f064c151
+MISC ChangeLog 44901 SHA256 78f619962c62f23434a5791be24d5580b1de632b2e4feddf9f6fb61d6dab4c01 SHA512 9d0ccc76449077621fdd7f4313380663a98957d3bb6b9131c02da1c9f1bee5175968ffa8d2ad678ff2effe5ba4cb2363b1c4eacec6b62a0bbdba3fa0476a7dba WHIRLPOOL a0f823d0e5abeb87e54dc842f281697ae7a5234974051241387d3d36aa6ab738a898b56ebb8233b5c2511dee4afd5db7e94ac76fdc70ff00bc6b5bf5a6bf284c
+MISC metadata.xml 576 SHA256 aab2906be52f2b1987f006050f22a439308e1b140285ed086221f0bffa4f4702 SHA512 54dab1ce583b4003961fd2e19aef6b575f04c92381007bfe530c05dcae0c8e2f004dcd8e337b5541a89bf4be4a71ba5652649f8edd2135c9962287a7fbd61310 WHIRLPOOL 7b92ef48fefc565f6737cffb4f7f7404d7a95cfa50f40c051f9e0d98edeb2a022c3c168823bc3387f002723961afc5ec045b90c525e83c719762b2d70fa7ec5e
diff --git a/net-mail/courier-imap/courier-imap-4.16.0.ebuild b/net-mail/courier-imap/courier-imap-4.16.0.ebuild
new file mode 100644
index 000000000000..61dfe96c2f04
--- /dev/null
+++ b/net-mail/courier-imap/courier-imap-4.16.0.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2015 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.16.0.ebuild,v 1.1 2015/02/09 17:01:23 mrueg Exp $
+
+EAPI=5
+inherit autotools eutils multilib libtool systemd
+
+KEYWORDS="~amd64 ~hppa ~x86"
+
+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 selinux gnutls trashquota"
+REQUIRED_USE="|| ( berkdb gdbm )"
+
+CDEPEND="gnutls? ( net-libs/gnutls )
+		!gnutls? ( >=dev-libs/openssl-0.9.6 )
+		>=net-libs/courier-authlib-0.61
+		>=net-libs/courier-unicode-1.1
+		>=net-mail/mailbase-0.00-r8
+		berkdb? ( sys-libs/db )
+		fam? ( virtual/fam )
+		gdbm? ( >=sys-libs/gdbm-1.8.0 )"
+DEPEND="${CDEPEND}
+		dev-lang/perl
+		!mail-mta/courier
+		userland_GNU? ( sys-process/procps )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-courier )"
+
+# get rid of old style virtual - bug 350792
+# all blockers really needed?
+RDEPEND="${RDEPEND}
+	!mail-mta/courier
+	!net-mail/bincimap
+	!net-mail/cyrus-imapd
+	!net-mail/uw-imap"
+
+RC_VER="4.0.6-r1"
+INITD_VER="4.0.6-r1"
+
+src_prepare() {
+	# 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.15-disable-fam-configure.ac.patch
+
+	# Kill unneeded call to AC_PROG_SYSCONFTOOL (bug #168206).
+	epatch "${FILESDIR}"/${PN}-4.15-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.15-db4-bdbobj_configure.ac.patch\
+			"${FILESDIR}"/${PN}-4.15-db4-configure.ac.patch
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	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
+
+	if use trashquota ; then
+		einfo "Building with Trash Quota Support"
+		myconf="${myconf} --with-trashquota"
+	fi
+
+	use debug && myconf="${myconf} debug=true"
+
+	# Do the actual build now
+	econf \
+		--disable-root-check \
+		--bindir=/usr/sbin \
+		--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}
+
+	# Change the pem file location.
+	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/imapd.pem:" \
+		libs/imap/imapd-ssl.dist || \
+		die "sed failed"
+
+	sed -i -e "s:^\(TLS_CERTFILE=\).*:\1/etc/courier-imap/pop3d.pem:" \
+		libs/imap/pop3d-ssl.dist || \
+		die "sed failed"
+}
+
+src_compile() {
+	# spurious failures with parallel compiles
+	emake -j1
+}
+
+src_install() {
+	dodir /var/lib/${PN} /etc/pam.d
+	emake DESTDIR="${D}" install
+	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"
+
+	dosym /usr/sbin/courierlogger /usr/$(get_libdir)/${PN}/courierlogger
+
+	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}"
+	done
+
+	systemd_newunit "${FILESDIR}"/courier-authdaemond-r1.service courier-authdaemond.service
+	systemd_newunit "${FILESDIR}"/courier-imapd-ssl-r1.service courier-imapd-ssl.service
+	systemd_newunit "${FILESDIR}"/courier-imapd-r1.service courier-imapd.service
+
+	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}"
+	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}"/{AUTHORS,INSTALL,NEWS,README,ChangeLog} "${FILESDIR}"/${PN}-gentoo.readme
+	docinto imap
+	dodoc "${S}"/libs/imap/{ChangeLog,BUGS,BUGS.html,README}
+	docinto maildir
+	dodoc "${S}"/libs/maildir/{AUTHORS,INSTALL,README.maildirquota.txt,README.sharedfolders.txt}
+	docinto tcpd
+	dodoc "${S}"/libs/tcpd/README.couriertls
+}
+
+pkg_postinst() {
+	elog "Please read http://www.courier-mta.org/imap/INSTALL.html#upgrading"
+	elog "and remove TLS_DHPARAMS from configuration files or run mkdhparams"
+
+	elog "For a quick-start howto please refer to"
+	elog "${PN}-gentoo.readme in /usr/share/doc/${PF}"
+	# 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."
+}
diff --git a/net-mail/courier-imap/metadata.xml b/net-mail/courier-imap/metadata.xml
index ffb848571eb5..2cef66b55639 100644
--- a/net-mail/courier-imap/metadata.xml
+++ b/net-mail/courier-imap/metadata.xml
@@ -4,7 +4,7 @@
 <herd>proxy-maintainers</herd>
 <maintainer>
 	<email>david@ixit.cz</email>
-	<name>David Heidelberger</name>
+	<name>David Heidelberg</name>
 	<description>Assign bugs to him.</description>
 </maintainer>
 <maintainer>