mrueg 15/02/09 17:01:23 Modified: metadata.xml ChangeLog Added: courier-imap-4.16.0.ebuild Log: 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. (Portage version: 2.2.16/cvs/Linux x86_64, signed Manifest commit with key )
Revision Changes Path 1.15 net-mail/courier-imap/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/courier-imap/metadata.xml?rev=1.15&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/courier-imap/metadata.xml?rev=1.15&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/courier-imap/metadata.xml?r1=1.14&r2=1.15 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-mail/courier-imap/metadata.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- metadata.xml 19 Nov 2014 14:10:12 -0000 1.14 +++ metadata.xml 9 Feb 2015 17:01:23 -0000 1.15 @@ -4,7 +4,7 @@ <herd>proxy-maintainers</herd> <maintainer> <email>[email protected]</email> - <name>David Heidelberger</name> + <name>David Heidelberg</name> <description>Assign bugs to him.</description> </maintainer> <maintainer> 1.226 net-mail/courier-imap/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/courier-imap/ChangeLog?rev=1.226&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/courier-imap/ChangeLog?rev=1.226&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/courier-imap/ChangeLog?r1=1.225&r2=1.226 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-mail/courier-imap/ChangeLog,v retrieving revision 1.225 retrieving revision 1.226 diff -u -r1.225 -r1.226 --- ChangeLog 21 Nov 2014 10:06:11 -0000 1.225 +++ ChangeLog 9 Feb 2015 17:01:23 -0000 1.226 @@ -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 <[email protected]> +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 <[email protected]> courier-imap-4.15-r1.ebuild: Drop MAKEOPTS=-j1 workaround now that eautoreconf is fixed #529404. 1.1 net-mail/courier-imap/courier-imap-4.16.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/courier-imap/courier-imap-4.16.0.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-mail/courier-imap/courier-imap-4.16.0.ebuild?rev=1.1&content-type=text/plain Index: courier-imap-4.16.0.ebuild =================================================================== # 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 [email protected] # 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 [email protected] # 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." }
