[gentoo-commits] repo/gentoo:master commit in: net-mail/courier-imap/

[Alfredo Tupone]

commit:     52a96cc0fe6858f286691984b6fcb3beec23aca9
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  4 16:59:48 2019 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Thu Jul  4 16:59:48 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52a96cc0

net-mail/courier-imap: Move dhparams.pem directory to /etc/courier-imap

Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

 net-mail/courier-imap/courier-imap-5.0.7.ebuild | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/net-mail/courier-imap/courier-imap-5.0.7.ebuild 
b/net-mail/courier-imap/courier-imap-5.0.7.ebuild
index ca3d3db1800..c109323e7fa 100644
--- a/net-mail/courier-imap/courier-imap-5.0.7.ebuild
+++ b/net-mail/courier-imap/courier-imap-5.0.7.ebuild
@@ -61,6 +61,7 @@ For a quick-start howto please refer to
 ${PN}-gentoo.readme in /usr/share/doc/${PF}
 
 Please convert maildir to utf8
+and rerun mkdhparams if needed. Locatio has changed
 "
 
 PATCHES=(
@@ -111,19 +112,11 @@ src_configure() {
                --enable-workarounds-for-imap-client-bugs \
                --with-mailuser=mail \
                --with-mailgroup=mail \
+               --with-certsdir="/etc/courier-imap" \
                $(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() {
@@ -190,7 +183,7 @@ src_install() {
 
        dosbin "${FILESDIR}/mkimapdcert" "${FILESDIR}/mkpop3dcert"
 
-       dosym /usr/sbin/courierlogger "/usr/$(get_libdir)/${PN}/courierlogger"
+       dosym ../../sbin/courierlogger "/usr/$(get_libdir)/${PN}/courierlogger"
 
        for initd in courier-{imapd,pop3d}{,-ssl} ; do
                sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" \