commit: 1d914fbcf38e35f7e66c8f0a4c78b903e2f216db
Author: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 5 15:10:38 2015 +0000
Commit: Jason Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Mon Oct 5 15:11:06 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d914fbc
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 ----------------------
....7.2_p1-r1.ebuild => opensmtpd-5.7.3_p1.ebuild} | 2 --
3 files changed, 1 insertion(+), 29 deletions(-)
diff --git a/mail-mta/opensmtpd/Manifest b/mail-mta/opensmtpd/Manifest
index 1e736f2..f33bba9 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 f9da33b..0000000
--- 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.3_p1.ebuild
similarity index 97%
rename from mail-mta/opensmtpd/opensmtpd-5.7.2_p1-r1.ebuild
rename to mail-mta/opensmtpd/opensmtpd-5.7.3_p1.ebuild
index deba857..fe35e0f 100644
--- a/mail-mta/opensmtpd/opensmtpd-5.7.2_p1-r1.ebuild
+++ b/mail-mta/opensmtpd/opensmtpd-5.7.3_p1.ebuild
@@ -47,8 +47,6 @@ 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
}
