From 1d914fbcf38e35f7e66c8f0a4c78b903e2f216db Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Mon, 5 Oct 2015 17:10:38 +0200 Subject: mail-mta/opensmtpd: Bump version, with more security fixes, so stablize it too. Package-Manager: portage-2.2.22 RepoMan-Options: --force --- mail-mta/opensmtpd/Manifest | 2 +- .../opensmtpd-5.7.2-remote-header-crash.patch | 26 ------ mail-mta/opensmtpd/opensmtpd-5.7.2_p1-r1.ebuild | 95 ---------------------- mail-mta/opensmtpd/opensmtpd-5.7.3_p1.ebuild | 93 +++++++++++++++++++++ 4 files changed, 94 insertions(+), 122 deletions(-) delete mode 100644 mail-mta/opensmtpd/files/opensmtpd-5.7.2-remote-header-crash.patch delete mode 100644 mail-mta/opensmtpd/opensmtpd-5.7.2_p1-r1.ebuild create mode 100644 mail-mta/opensmtpd/opensmtpd-5.7.3_p1.ebuild (limited to 'mail-mta') diff --git a/mail-mta/opensmtpd/Manifest b/mail-mta/opensmtpd/Manifest index 1e736f27bab7..f33bba905d7a 100644 --- a/mail-mta/opensmtpd/Manifest +++ b/mail-mta/opensmtpd/Manifest @@ -1 +1 @@ -DIST opensmtpd-5.7.2p1.tar.gz 708991 SHA256 daae044488d456b33aa9c84ebcc79aef2f9ab2d17ebe0c0f09e41e1f4b60d992 SHA512 ef9487ba38711fd2a4076022c8fef89c4daf0aac346a72814a9c17f20f830bcd3cba4d85da53867cbc726d2c10fd6773c907ae533e0e022165d7f4aa3bdf1260 WHIRLPOOL 3d5d3fff0f15b898219af62eb4152666120d60d528f3afa99d347be0fcdd58b9fe36694471cd4485d51041de53ee6249f4510e5a0af254794fe7465b8642cd44 +DIST opensmtpd-5.7.3p1.tar.gz 709178 SHA256 848a3c72dd22b216bb924b69dc356fc297e8b3671ec30856978950208cba74dd SHA512 e75ed2e148d25716df3af7b6746332c475eb671b91d3832b9a56b11a1e567749065f1332cd06d928cf6bd5122427cd33cc3e0f5f4e2bec0f2269db695be65b7e WHIRLPOOL 191fe5e30f71aa1076434f95b46c1ffbc893ef15d355c485bbb2df503d0af986af6602424ab04f984a9041ca6074cf975289e7708e1362fa483f423a6c1e0d51 diff --git a/mail-mta/opensmtpd/files/opensmtpd-5.7.2-remote-header-crash.patch b/mail-mta/opensmtpd/files/opensmtpd-5.7.2-remote-header-crash.patch deleted file mode 100644 index f9da33b5f2aa..000000000000 --- a/mail-mta/opensmtpd/files/opensmtpd-5.7.2-remote-header-crash.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/smtpd/filter.c b/smtpd/filter.c -index 062f00f..8af6eab 100644 ---- a/smtpd/filter.c -+++ b/smtpd/filter.c -@@ -726,7 +726,6 @@ filter_tx_io(struct io *io, int evt) - struct filter_session *s = io->arg; - size_t len, n; - char *data; -- char buf[65535]; - - log_trace(TRACE_FILTERS, "filter: filter_tx_io(%p, %s)", s, io_strevent(evt)); - -@@ -734,10 +733,9 @@ filter_tx_io(struct io *io, int evt) - case IO_DATAIN: - data = iobuf_data(&s->ibuf); - len = iobuf_len(&s->ibuf); -- memmove(buf, data, len); -- buf[len] = 0; -- log_trace(TRACE_FILTERS, "filter: filter_tx_io: datain (%zu) for req %016"PRIx64": %s", -- len, s->id, buf); -+ -+ log_trace(TRACE_FILTERS, "filter: filter_tx_io: datain (%zu) for req %016"PRIx64"", -+ len, s->id); - - n = fwrite(data, 1, len, s->ofile); - if (n != len) { diff --git a/mail-mta/opensmtpd/opensmtpd-5.7.2_p1-r1.ebuild b/mail-mta/opensmtpd/opensmtpd-5.7.2_p1-r1.ebuild deleted file mode 100644 index deba857e02ce..000000000000 --- a/mail-mta/opensmtpd/opensmtpd-5.7.2_p1-r1.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit multilib user flag-o-matic eutils pam toolchain-funcs autotools systemd versionator - -DESCRIPTION="Lightweight but featured SMTP daemon from OpenBSD" -HOMEPAGE="http://www.opensmtpd.org/" -MY_P="${P}" -if [ $(get_last_version_component_index) -eq 4 ]; then - MY_P="${PN}-$(get_version_component_range 4-)" -fi -SRC_URI="https://www.opensmtpd.org/archives/${MY_P/_}.tar.gz" - -LICENSE="ISC BSD BSD-1 BSD-2 BSD-4" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="pam +mta" - -DEPEND="dev-libs/openssl:0 - sys-libs/zlib - pam? ( virtual/pam ) - sys-libs/db:= - dev-libs/libevent - app-misc/ca-certificates - net-mail/mailbase - net-libs/libasr - !mail-mta/courier - !mail-mta/esmtp - !mail-mta/exim - !mail-mta/mini-qmail - !mail-mta/msmtp[mta] - !mail-mta/netqmail - !mail-mta/nullmailer - !mail-mta/postfix - !mail-mta/qmail-ldap - !mail-mta/sendmail - !mail-mta/ssmtp[mta] -" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${MY_P/_} - -src_prepare() { - # Use /run instead of /var/run - sed -i -e '/pidfile_path/s:_PATH_VARRUN:"/run/":' openbsd-compat/pidfile.c || die - - epatch "${FILESDIR}"/"${PN}"-5.7.2-remote-header-crash.patch - - epatch_user - eautoreconf -} - -src_configure() { - tc-export AR - AR="$(which "$AR")" econf \ - --enable-table-db \ - --with-privsep-user=smtpd \ - --with-queue-user=smtpq \ - --with-privsep-path=/var/empty \ - --with-sock-dir=/run \ - --sysconfdir=/etc/opensmtpd \ - --with-ca-file=/etc/ssl/certs/ca-certificates.crt \ - $(use_with pam) -} - -src_install() { - default - newinitd "${FILESDIR}"/smtpd.initd smtpd - systemd_dounit "${FILESDIR}"/smtpd.{service,socket} - use pam && newpamd "${FILESDIR}"/smtpd.pam smtpd - if use mta ; then - dodir /usr/sbin - dosym /usr/sbin/smtpctl /usr/sbin/sendmail - dosym /usr/sbin/smtpctl /usr/bin/sendmail - dosym /usr/sbin/smtpctl /usr/$(get_libdir)/sendmail - fi -} - -pkg_preinst() { - enewgroup smtpd 25 - enewuser smtpd 25 -1 /var/empty smtpd - enewgroup smtpq 252 - enewuser smtpq 252 -1 /var/empty smtpq -} - -pkg_postinst() { - einfo - einfo "Plugins for SQLite, MySQL, PostgreSQL, LDAP, socketmaps," - einfo "Redis, and many other useful addons and filters are" - einfo "available in the mail-filter/opensmtpd-extras package." - einfo -} diff --git a/mail-mta/opensmtpd/opensmtpd-5.7.3_p1.ebuild b/mail-mta/opensmtpd/opensmtpd-5.7.3_p1.ebuild new file mode 100644 index 000000000000..fe35e0f7025a --- /dev/null +++ b/mail-mta/opensmtpd/opensmtpd-5.7.3_p1.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit multilib user flag-o-matic eutils pam toolchain-funcs autotools systemd versionator + +DESCRIPTION="Lightweight but featured SMTP daemon from OpenBSD" +HOMEPAGE="http://www.opensmtpd.org/" +MY_P="${P}" +if [ $(get_last_version_component_index) -eq 4 ]; then + MY_P="${PN}-$(get_version_component_range 4-)" +fi +SRC_URI="https://www.opensmtpd.org/archives/${MY_P/_}.tar.gz" + +LICENSE="ISC BSD BSD-1 BSD-2 BSD-4" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="pam +mta" + +DEPEND="dev-libs/openssl:0 + sys-libs/zlib + pam? ( virtual/pam ) + sys-libs/db:= + dev-libs/libevent + app-misc/ca-certificates + net-mail/mailbase + net-libs/libasr + !mail-mta/courier + !mail-mta/esmtp + !mail-mta/exim + !mail-mta/mini-qmail + !mail-mta/msmtp[mta] + !mail-mta/netqmail + !mail-mta/nullmailer + !mail-mta/postfix + !mail-mta/qmail-ldap + !mail-mta/sendmail + !mail-mta/ssmtp[mta] +" +RDEPEND="${DEPEND}" + +S=${WORKDIR}/${MY_P/_} + +src_prepare() { + # Use /run instead of /var/run + sed -i -e '/pidfile_path/s:_PATH_VARRUN:"/run/":' openbsd-compat/pidfile.c || die + + epatch_user + eautoreconf +} + +src_configure() { + tc-export AR + AR="$(which "$AR")" econf \ + --enable-table-db \ + --with-privsep-user=smtpd \ + --with-queue-user=smtpq \ + --with-privsep-path=/var/empty \ + --with-sock-dir=/run \ + --sysconfdir=/etc/opensmtpd \ + --with-ca-file=/etc/ssl/certs/ca-certificates.crt \ + $(use_with pam) +} + +src_install() { + default + newinitd "${FILESDIR}"/smtpd.initd smtpd + systemd_dounit "${FILESDIR}"/smtpd.{service,socket} + use pam && newpamd "${FILESDIR}"/smtpd.pam smtpd + if use mta ; then + dodir /usr/sbin + dosym /usr/sbin/smtpctl /usr/sbin/sendmail + dosym /usr/sbin/smtpctl /usr/bin/sendmail + dosym /usr/sbin/smtpctl /usr/$(get_libdir)/sendmail + fi +} + +pkg_preinst() { + enewgroup smtpd 25 + enewuser smtpd 25 -1 /var/empty smtpd + enewgroup smtpq 252 + enewuser smtpq 252 -1 /var/empty smtpq +} + +pkg_postinst() { + einfo + einfo "Plugins for SQLite, MySQL, PostgreSQL, LDAP, socketmaps," + einfo "Redis, and many other useful addons and filters are" + einfo "available in the mail-filter/opensmtpd-extras package." + einfo +} -- cgit v1.2.3-65-gdbad