Skip to content

Commit

Permalink
mail-mta/courier: Version bump.
Browse files Browse the repository at this point in the history 
Change permission of ldapaliasrc (#394417).
Change mysql dependency (#665918).
Switch to EAPI 7.
Use upstream default libexecdir.
Warn about Unicode maildir changes.

Closes: https://bugs.gentoo.org/394417
Closes: https://bugs.gentoo.org/665918
Closes: https://bugs.gentoo.org/671042
Signed-off-by: Hanno Boeck <[email protected]>
Package-Manager: Portage-2.3.53, Repoman-2.3.12
  • Loading branch information
@hannob
hannob committed Jan 3, 2019
1 parent df6dcf2 commit 01e1690
Show file tree
Hide file tree
Showing 2 changed files with 315 additions and 0 deletions.
1 change: 1 addition & 0 deletions mail-mta/courier/Manifest
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
DIST courier-0.75.0.tar.bz2 6970339 BLAKE2B 2c2f9900ab0370eff8b1a62759295e2d0598153075ea9a2f832d59272c5a21d5ab912fc852c7e75d7510d5ddf2d1484e830e6bf57c6952839f8688f174b6f27d SHA512 37e66329f157e18176d4ac8c5e814be78e80ff7dec234886bec8dce2ae5c58ac68bc18e07c739295c25fae8ec778b162bab505d85ea0998db7192d52c47e7bc6
DIST courier-0.76.4.tar.bz2 7237424 BLAKE2B 7dbfb43cef75ed5187e044130c6cb793848791956a8531fcc54ae7a444e475c16219816c2ad7834e3b5349cf945f59023f0b9e2415c7c64352b5aa71eaf00bbd SHA512 6350ef5e30bd1e4921350bf3a09de0b56513530852c93f9a06e23625e49ae09d7ff26558da1f816a5bb492579afb5c1cbcf7573199bf898a039cd3607e847c30
DIST courier-0.78.2.tar.bz2 7379529 BLAKE2B 5ba1ef013e513b269746999b2dd75f37fe8a9f1d87a51b61db1a8100c9a5cd022039462c235d35a95cf14ac5c406becf0f5d4f9344462e862045dc7333b7a0b7 SHA512 376de08cbaf9c2c74cd79e5d42680d8d6c31ecf0b0ef014f4152aa857224ba3e6d9e0f91b5097d15dcb5de9a5603a4707bc9b78902a5934c0a0ca68b74212055
DIST courier-1.0.5.tar.bz2 7465054 BLAKE2B 55e9ba2a85889e7210652475149f4d3e687fd63a27b44a5a16c888b2f60bb18c4156e3344792585fed2ee3d81770e79c55ce5791842c255b8701bad5d2f8af4e SHA512 99a8e98633da99abd1f6f4e24328d4655526d51dc9fc03ffcb9c1e0cce0e608dedb2ac9511829af4487ff5af4618500d6fbbee26568f2a05e3c9d3cf3b48b2a5
314 changes: 314 additions & 0 deletions mail-mta/courier/courier-1.0.5.ebuild
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,314 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=7
inherit eutils flag-o-matic multilib

DESCRIPTION="An MTA designed specifically for maildirs"
SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
HOMEPAGE="http://www.courier-mta.org/"
SLOT="0"
LICENSE="GPL-2"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
IUSE="postgres ldap libressl mysql pam nls ipv6 spell fax crypt norewrite \
fam web webmail gnutls"
REQUIRED_USE="?? ( gnutls libressl )"

DEPEND="
>=net-libs/courier-authlib-0.69.0-r1
>=net-libs/courier-unicode-2.1
!gnutls? ( !libressl? ( dev-libs/openssl:0= ) )
libressl? ( dev-libs/libressl:= )
gnutls? ( net-libs/gnutls )
>=sys-libs/gdbm-1.8.0
dev-libs/libpcre
app-misc/mime-types
fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 )
pam? ( virtual/pam )
mysql? ( dev-db/mysql-connector-c )
ldap? ( >=net-nds/openldap-1.2.11 )
postgres? ( dev-db/postgresql:= )
spell? ( app-text/aspell )
fam? ( virtual/fam )
!mail-filter/maildrop
!mail-mta/esmtp
!mail-mta/exim
!mail-mta/mini-qmail
!mail-mta/msmtp
!mail-mta/netqmail
!mail-mta/nullmailer
!mail-mta/postfix
!mail-mta/qmail-ldap
!mail-mta/sendmail
!mail-mta/ssmtp
!mail-mta/opensmtpd
!net-mail/dot-forward
!sys-apps/ucspi-tcp
"

RDEPEND="${DEPEND}
dev-lang/perl
sys-process/procps"

# get rid of old style virtual/imapd - bug 350792
# all blockers really needed?
RDEPEND="${RDEPEND}
!net-mail/bincimap
!net-mail/courier-imap
!net-mail/cyrus-imapd
!net-mail/uw-imap"

PDEPEND="pam? ( net-mail/mailbase )
crypt? ( >=app-crypt/gnupg-1.0.4 )"

src_prepare() {
use norewrite && epatch "${FILESDIR}/norewrite.patch"
default
}

src_configure() {
filter-flags '-fomit-frame-pointer'

local myconf
myconf=""

use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf"

econf ${myconf} \
$(use_with fam) \
$(use_with ipv6) \
$(use_with spell ispell) \
$(use_with ldap ldapaliasd) \
$(use_enable ldap maildroldap) \
$(use_with gnutls) \
--with-notice=unicode \
--enable-mimetypes=/etc/mime.types \
--prefix=/usr \
--disable-root-check \
--mandir=/usr/share/man \
--sysconfdir=/etc/courier \
--datadir=/usr/share/courier \
--sharedstatedir=/var/lib/courier/com \
--localstatedir=/var/lib/courier \
--with-piddir=/var/run/courier \
--with-authdaemonvar=/var/lib/courier/authdaemon \
--with-mailuser=mail \
--with-mailgroup=mail \
--with-paranoid-smtpext \
--with-db=gdbm \
--disable-autorenamesent \
--cache-file="${S}/configuring.cache" \
--host="${CHOST}" debug=true || die "./configure"
sed -e'/^install-perms-local:/a\ sed -e\"s|^|'"${D}"'|g\" -i permissions.dat' -i Makefile
}

src_compile() {
default
}

etc_courier() {
# Import existing /etc/courier/file if it exists.
# Add option only if it was not already set or even commented out
file="${1}" ; word="`echo \"${2}\" | sed -e\"s|=.*$||\" -e\"s|^.*opt ||\"`"
[ ! -e "${D}/etc/courier/${file}" ] && [ -e "/etc/courier/${file}" ] && \
cp "/etc/courier/${file}" "${D}/etc/courier/${file}"
grep -q "${word}" "${D}/etc/courier/${file}" || \
echo "${2}" >> "${D}/etc/courier/${file}"
}

etc_courier_chg() {
file="${1}" ; key="${2}" ; value="${3}" ; section="${4}"
[ -z "${section}" ] && section="${2}"
grep -q "${key}" "${file}" && elog "Changing ${file}: ${key} to ${value}"
sed -i -e"/\#\#NAME: ${section}/,+30 s|${key}=.*|${key}=\"${value}\"|g" ${file}
}

src_install() {
local f
diropts -o mail -g mail
keepdir /var/lib/courier/tmp
keepdir /var/lib/courier/msgs
make install DESTDIR="${D}" || die "install"
make install-configure || die "install-configure"

# init script takes care of this
rm -rf "${D}/var/run"

# Get rid of files we dont want
if ! use webmail ; then
rm -rf "${D}/usr/$(get_libdir)/courier/courier/webmail" \
"${D}/usr/$(get_libdir)/courier/courier/sqwebmaild" \
"${D}/usr/share/courier/sqwebmail/" \
"${D}/usr/sbin/webmaild" \
"${D}/usr/sbin/webgpg" \
"${D}/etc/courier/webmail.authpam" \
"${D}/var/lib/courier/webmail-logincache" \
"${D}"/etc/courier/sqwebmaild*
fi

if ! use web ; then
rm -rf "${D}/usr/share/courier/courierwebadmin/" \
"${D}/etc/courier/webadmin"
fi

for dir2keep in $(cd "${D}" && find ./var/lib/courier -type d) ; do
keepdir "$dir2keep" || die "failed running keepdir: $dir2keep"
done

newinitd "${FILESDIR}/courier-init-r4" "courier"
use fam || sed -i -e's|^.*use famd$||g' "${D}/etc/init.d/courier"

cd "${D}/etc/courier"
if use webmail ; then
insinto /etc/courier
newins "${FILESDIR}/apache-sqwebmail.inc" apache-sqwebmail.inc
fi

for f in *.dist ; do cp "${f}" "${f%%.dist}" ; done
if use ldap ; then
[ -e ldapaliasrc ] && ( chown root:mail ldapaliasrc ; chmod 640 ldapaliasrc )
else
rm -f ldapaliasrc
fi

( [ -e /etc/courier/sizelimit ] && cat /etc/courier/sizelimit || echo 0 ) \
> "${D}/etc/courier/sizelimit"
etc_courier maildroprc ""
etc_courier esmtproutes ""
etc_courier backuprelay ""
etc_courier locallowercase ""
etc_courier bofh "opt BOFHBADMIME=accept"
etc_courier bofh "opt BOFHSPFTRUSTME=1"
etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none,error,softfail,fail"
etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none"
etc_courier bofh "opt BOFHSPFFROM=all"
etc_courier bofh "opt BOFHSPFMAILFROM=all"
etc_courier bofh "#opt BOFHSPFHARDERROR=fail"
etc_courier esmtpd "BOFHBADMIME=accept"
etc_courier esmtpd-ssl "BOFHBADMIME=accept"
etc_courier esmtpd-msa "BOFHBADMIME=accept"

use fam && etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256 IDLE"
use fam || etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256"

# Fix for a sandbox violation on subsequential merges
# - [email protected], 2005-07-10
dosym ../share/courier/pop3d /usr/sbin/courier-pop3d
dosym ../share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl
dosym ../share/courier/imapd /usr/sbin/courier-imapd
dosym ../share/courier/imapd-ssl /usr/sbin/courier-imapd-ssl

cd "${S}"
cp imap/README README.imap
use nls && cp unicode/README README.unicode
dodoc AUTHORS BENCHMARKS COPYING* ChangeLog* INSTALL NEWS README* TODO courier/doc/*.txt
dodoc libs/tcpd/README.couriertls
mv "${D}/usr/share/courier/htmldoc" "${D}/usr/share/doc/${PF}/html"

if use webmail ; then
insinto /usr/$(get_libdir)/courier/courier
insopts -m 755 -o mail -g mail
doins "${S}/courier/webmaild"
fi

if use web ; then
insinto /etc/courier/webadmin
insopts -m 400 -o mail -g mail
doins "${FILESDIR}/password.dist"
fi

# avoid name collisions in /usr/sbin, make webadmin match
cd "${D}/usr/sbin"
for f in imapd imapd-ssl pop3d pop3d-ssl ; do mv "${f}" "courier-${f}" ; done
if use web ; then
sed -i -e 's:\$sbindir\/imapd:\$sbindir\/courier-imapd:g' \
-e 's:\$sbindir\/imapd-ssl:\$sbindir\/courier-imapd-ssl:g' \
"${D}/usr/share/courier/courierwebadmin/admin-40imap.pl" \
|| ewarn "failed to fix webadmin"
sed -i -e 's:\$sbindir\/pop3d:\$sbindir\/courier-pop3d:g' \
-e 's:\$sbindir\/pop3d-ssl:\$sbindir\/courier-pop3d-ssl:g' \
"${D}/usr/share/courier/courierwebadmin/admin-45pop3.pl" \
|| ewarn "failed to fix webadmin"
fi

# users should be able to send mail. Could be restricted with suictl.
chmod u+s "${D}/usr/bin/sendmail"

dosym ../bin/sendmail /usr/sbin/sendmail
}

src_test() {
if [ `whoami` != 'root' ]; then
emake -j1 check || die "Make check failed."
else
einfo "make check skipped, can't run as root."
einfo "You can enable it with FEATURES=\"userpriv\""
fi
}

pkg_postinst() {
use fam && elog "fam daemon is needed for courier-imapd" \
|| ewarn "courier was built without fam support"

ewarn "If you are updating from pre-1.0 courier versions to"
ewarn "1.x versions you may need to update your maildir's"
ewarn "to the new Unicode format, see also:"
ewarn "https://www.courier-mta.org/maildirmake.html"
}

pkg_config() {
mailhost="$(hostname)"
export mailhost

domainname="$(domainname)"
if [ "x$domainname" = "x(none)" ] ; then
domainname="$(echo ${mailhost} | sed -e "s/[^\.]*\.\(.*\)/\1/")"
fi
export domainname

if [ "${ROOT}" = "/" ] ; then
file="${ROOT}/etc/courier/locals"
if [ ! -f "${file}" ] ; then
echo "localhost" > "${file}";
echo "${domainname}" >> "${file}";
fi
file="${ROOT}/etc/courier/esmtpacceptmailfor.dir/${domainname}"
if [ ! -f "${file}" ] ; then
echo "${domainname}" > "${file}"
/usr/sbin/makeacceptmailfor
fi

file="${ROOT}/etc/courier/smtpaccess/${domainname}"
if [ ! -f "${file}" ]
then
netstat -nr | grep "^[1-9]" | while read network gateway netmask rest
do
i=1
net=""
TIFS="${IFS}"
IFS="."
for o in "${netmask}"
do
if [ "${o}" == "255" ]
then
[ "_${net}" == "_" ] || net="${net}."
t="$(echo "${network}" | cut -d " " -f ${i})"
net="${net}${t}"
fi
i="$((${i} + 1))"
done
IFS="${TIFS}"
echo "doing configuration - relay control for the network ${net} !"
echo "${net} allow,RELAYCLIENT" >> ${file}
done
/usr/sbin/makesmtpaccess
fi
fi

echo "creating cert for esmtpd-ssl:"
/usr/sbin/mkesmtpdcert
echo "creating cert for imapd-ssl:"
/usr/sbin/mkpop3dcert
echo "creating cert for pop3d-ssl:"
/usr/sbin/mkimapdcert
}

0 comments on commit 01e1690

Please sign in to comment.