[gentoo-commits] repo/gentoo:master commit in: mail-mta/msmtp/files/, mail-mta/msmtp/

[Lars Wendler]

commit:     589832f11fcf11ccc25f50e49d869ee403ee3228
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  5 08:54:42 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Sep  5 08:56:11 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=589832f1

mail-mta/msmtp: Bump to version 1.8.0

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 mail-mta/msmtp/Manifest           |   1 +
 mail-mta/msmtp/files/msmtpd.confd |  16 +++++
 mail-mta/msmtp/files/msmtpd.init  |  10 +++
 mail-mta/msmtp/metadata.xml       |   1 +
 mail-mta/msmtp/msmtp-1.8.0.ebuild | 144 ++++++++++++++++++++++++++++++++++++++
 5 files changed, 172 insertions(+)

diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index 453ca3bcd85..a6ff5e03d34 100644
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -1,3 +1,4 @@
 DIST msmtp-1.6.6.tar.xz 283744 BLAKE2B 41745d9f20a33b0e4c6f7eee3ad5897c5a555a8cd1e27eb0bf7d347054d072b9eadfc7a31583e12a4f35f071aa710bb403980cba0e06920f65fdb727c786447b SHA512 30f33648b66a6b230cd38d0eee4c916a631a51bddcc1a15c9f7b324305506cb83b9c95f95def9150d0b783d38000db409981331b3c6a756232f0ce49e9b343ab
 DIST msmtp-1.6.7.tar.xz 293208 BLAKE2B 9d493c45a96a0e5e7278d9af89ff74dff92b8699076f17ae556030df55861b2fa9a06f677d2641744ba2a55989ebdc981ae1902c99884675562dd03586768ec9 SHA512 453d4196168a7ad2413cf2a91af25ed8ec73b04ea12f8cc40f6342a892baeb9edfbeba4a555a3a22d11881b831b4cd11b5f2844f66f2a6e7b891422edd9c68d9
 DIST msmtp-1.6.8.tar.xz 294872 BLAKE2B 156237dcc10c320ef15b368ebfe823d6f30f1a740061c5846878a8e478c1f3a3129c52af8327995933ecb15cd8cec0c18a3104993b030bcbfa09e3b0b6c2a58b SHA512 58ccdb6f16ab31959aeb1929c11f820219d4be062edca209c5986e4e0932d718f6f39c81727d05cd448779cedc4ab3e7bb557ce9f5dd3e7cc95e0aa5c3b623bf
+DIST msmtp-1.8.0.tar.xz 302680 BLAKE2B 41537a883dd59e1f2281c0428aa57af985a74aeaa9aad34bdce882c3cca79ad65a796b6ef509c7546079d8f3e647eb493481ddbd5f7781a92c560986cb9958a9 SHA512 986cf8ceca847b857f3884fcef26202429b3099820aa20e4e458768a80421bfb163d8aab9d950da2190ae0e2e95bafb80f4c2647d28dbd470d78c439bfba4f77

diff --git a/mail-mta/msmtp/files/msmtpd.confd b/mail-mta/msmtp/files/msmtpd.confd
new file mode 100644
index 00000000000..a42aa5323ca
--- /dev/null
+++ b/mail-mta/msmtp/files/msmtpd.confd
@@ -0,0 +1,16 @@
+# The user msmtpd should be run as. Default is "msmtpd".
+#MSMTPD_USER="joe"
+
+
+# Uncomment one of the following arguments for msmtpd or write your own
+# argument list.
+
+# Start single SMTP session on stdin/stdout
+#MSMTPD_ARGS="--inetd"
+
+# Listen on a specific IP and a specific port.
+# Default IP is 127.0.0.1 and default port is 25.
+#MSMTPD_ARGS="--interface=192.168.100.1 --port=25000"
+
+# Pipe mails to a specific command instead of msmtp. Please read msmtpd man page.
+#MSMTPD_ARGS="--command='/usr/bin/msmtp -f %F'"

diff --git a/mail-mta/msmtp/files/msmtpd.init b/mail-mta/msmtp/files/msmtpd.init
new file mode 100644
index 00000000000..29f799099fe
--- /dev/null
+++ b/mail-mta/msmtp/files/msmtpd.init
@@ -0,0 +1,10 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Local mta daemon that pipes mails (by default) to msmtp"
+pidfile="/var/run/msmtpd.pid"
+command="/usr/bin/msmtpd"
+command_user="${MSMTPD_USER:-msmtpd}"
+command_args="${MSMTPD_ARGS}"
+command_background="true"

diff --git a/mail-mta/msmtp/metadata.xml b/mail-mta/msmtp/metadata.xml
index 423cd3ac03f..96c999d09ea 100644
--- a/mail-mta/msmtp/metadata.xml
+++ b/mail-mta/msmtp/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Net-Mail</name>
 	</maintainer>
 	<use>
+		<flag name="daemon">Build/install msmtpd MTA daemon</flag>
 		<flag name="mta">Enable this to install as system-wide MTA</flag>
 		<flag name="libsecret">Enable libsecret support to store login credentials</flag>
 	</use>

diff --git a/mail-mta/msmtp/msmtp-1.8.0.ebuild b/mail-mta/msmtp/msmtp-1.8.0.ebuild
new file mode 100644
index 00000000000..7308304effa
--- /dev/null
+++ b/mail-mta/msmtp/msmtp-1.8.0.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps multilib user
+
+DESCRIPTION="An SMTP client and SMTP plugin for mail user agents such as Mutt"
+HOMEPAGE="https://marlam.de/msmtp/"
+SRC_URI="https://marlam.de/msmtp/releases/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="daemon doc idn libsecret +mta nls sasl ssl vim-syntax"
+
+# Upstream discourages usage of openssl. See also
+# https://marlam.de/msmtp/news/openssl-discouraged/
+DEPEND="
+	libsecret? ( app-crypt/libsecret )
+	nls? ( virtual/libintl )
+	sasl? ( virtual/gsasl )
+	ssl? ( net-libs/gnutls[idn?] )
+	!ssl? ( idn? ( net-dns/libidn2:= ) )
+"
+
+RDEPEND="${DEPEND}
+	net-mail/mailbase
+	mta? (
+		!mail-mta/courier
+		!mail-mta/esmtp
+		!mail-mta/exim
+		!mail-mta/mini-qmail
+		!mail-mta/netqmail
+		!mail-mta/nullmailer
+		!mail-mta/postfix
+		!mail-mta/qmail-ldap
+		!mail-mta/sendmail
+		!mail-mta/opensmtpd
+		!<mail-mta/ssmtp-2.64-r2
+		!>=mail-mta/ssmtp-2.64-r2[mta]
+	)
+"
+
+BDEPEND="${DEPEND}
+	doc? ( virtual/texi2dvi )
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+"
+
+DOCS="AUTHORS ChangeLog NEWS README THANKS doc/msmtprc*"
+
+src_prepare() {
+	# Use default Gentoo location for mail aliases
+	sed -i 's:/etc/aliases:/etc/mail/aliases:' scripts/find_alias/find_alias_for_msmtp.sh || die
+
+	default
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable nls)
+		$(use_with daemon msmtpd)
+		$(use_with ssl tls gnutls)
+		$(use_with sasl libgsasl)
+		$(use_with idn libidn)
+		$(use_with libsecret)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use doc ; then
+		cd doc || die
+		emake html pdf
+	fi
+}
+
+src_install() {
+	default
+
+	if use daemon ; then
+		fcaps CAP_NET_BIND_SERVICE "${ED%/}"/usr/bin/msmtpd
+		newinitd "${FILESDIR}"/msmtpd.init msmtpd
+		newconfd "${FILESDIR}"/msmtpd.confd msmtpd
+	fi
+
+	if use doc ; then
+		dohtml doc/msmtp.html
+		dodoc doc/msmtp.pdf
+	fi
+
+	if use mta ; then
+		dodir /usr/sbin
+		dosym ../bin/msmtp /usr/sbin/sendmail
+		dosym msmtp /usr/bin/sendmail
+		dosym ../bin/msmtp /usr/$(get_libdir)/sendmail
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/syntax
+		doins scripts/vim/msmtp.vim
+	fi
+
+	insinto /etc
+	newins doc/msmtprc-system.example msmtprc
+
+	src_install_contrib find_alias find_alias_for_msmtp.sh
+	src_install_contrib msmtpqueue "*.sh" "README ChangeLog"
+	src_install_contrib msmtpq "msmtpq msmtp-queue" README.msmtpq
+	src_install_contrib set_sendmail set_sendmail.sh set_sendmail.conf
+}
+
+pkg_preinst() {
+	if use daemon ; then
+		enewuser msmtpd
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		einfo "Please edit ${EROOT%/}/etc/msmtprc before first use."
+		einfo "In addition, per user configuration files can be placed"
+		einfo "as '~/.msmtprc'.  See the msmtprc-user.example file under"
+		einfo "/usr/share/doc/${PF}/ for an example."
+	fi
+}
+
+src_install_contrib() {
+	subdir="$1"
+	bins="$2"
+	docs="$3"
+	local dir=/usr/share/${PN}/${subdir}
+	insinto ${dir}
+	exeinto ${dir}
+	for i in ${bins} ; do
+		doexe scripts/${subdir}/${i}
+	done
+	for i in ${docs} ; do
+		newdoc scripts/${subdir}/${i} ${subdir}.${i}
+	done
+}