| 1 |
commit: bdcfa74624ec6f20fb94661457a3ba5fe70e56c3 |
| 2 |
Author: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 25 02:01:47 2020 +0000 |
| 4 |
Commit: Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 25 02:02:51 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdcfa746 |
| 7 |
|
| 8 |
mail-mta/opensmtpd: apply security fixes |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.88, Repoman-2.3.20 |
| 11 |
Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org> |
| 12 |
|
| 13 |
mail-mta/opensmtpd/Manifest | 2 +- |
| 14 |
.../files/opensmtpd-6.0.3_p1-security-fixes.patch | 32 ++++++++++++++++++++++ |
| 15 |
...3_p1-r2.ebuild => opensmtpd-6.0.3_p1-r3.ebuild} | 0 |
| 16 |
...d-6.6.2_p1.ebuild => opensmtpd-6.6.4_p1.ebuild} | 0 |
| 17 |
4 files changed, 33 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/mail-mta/opensmtpd/Manifest b/mail-mta/opensmtpd/Manifest |
| 20 |
index 725fb596054..0c001fb94e6 100644 |
| 21 |
--- a/mail-mta/opensmtpd/Manifest |
| 22 |
+++ b/mail-mta/opensmtpd/Manifest |
| 23 |
@@ -1,2 +1,2 @@ |
| 24 |
DIST opensmtpd-6.0.3p1.tar.gz 699702 BLAKE2B 49f08e8329adc049a562b6ef7efa4c0a39cbcfe8a158cb905cfc726a7302ffe9833ccfb52041340767d55d0f2ae2087e8eac92b7359016c6c76b4d963a334558 SHA512 e579818a0ddbe637deb5a4e40f43eaf797783903ceac18fd89a57581b135b9e407d424e1a70ff7b4b06a0ee50bafb6e8ab2451371917887904b06ff1b55d320f |
| 25 |
-DIST opensmtpd-6.6.2p1.tar.gz 777422 BLAKE2B e372a10f618e83ccb6c782d056750f89a5224898a28957509ab306fbe8bb4ea94462c1bbccbbe9c0dea64623c250d9fe9f3b74f2e26eda5d6c232bec50bff1d0 SHA512 b0f7ea94514a4a1880a22996064caa7da0a15e6453236ca2f004402125affa80e9d8c25d3e63826b45045305851959bc58c2c855829e46d6967bf6cd13bd1e91 |
| 26 |
+DIST opensmtpd-6.6.4p1.tar.gz 790754 BLAKE2B 18cc19569ae764eff3d672cbfb87df7bd00afcce93705ad128e935c0a47a246c3a6166fca7b6f844c0dd5e728492d8aeb7e0f8a8c1f5a756bf356ae9afb80852 SHA512 267307c91f4fcf21624b0897dfb1f5638b77da7b8d9a02211d734ed2cc5bd39ea7542ae7f200255e2945518fbe7609a0e5aa4e5c6dcb8146014f08b3845c108b |
| 27 |
|
| 28 |
diff --git a/mail-mta/opensmtpd/files/opensmtpd-6.0.3_p1-security-fixes.patch b/mail-mta/opensmtpd/files/opensmtpd-6.0.3_p1-security-fixes.patch |
| 29 |
index 58f3ed8c38b..b22f3af1fbe 100644 |
| 30 |
--- a/mail-mta/opensmtpd/files/opensmtpd-6.0.3_p1-security-fixes.patch |
| 31 |
+++ b/mail-mta/opensmtpd/files/opensmtpd-6.0.3_p1-security-fixes.patch |
| 32 |
@@ -89,3 +89,35 @@ diff -ru OpenSMTPD-opensmtpd-6.0.3/smtpd/smtp_session.c OpenSMTPD-opensmtpd-6.0. |
| 33 |
return (1); |
| 34 |
} |
| 35 |
|
| 36 |
+diff -ru opensmtpd-6.0.3p1/smtpd/mta_session.c opensmtpd-6.0.3p1-modified/smtpd/mta_session.c |
| 37 |
+--- opensmtpd-6.0.3p1/smtpd/mta_session.c 2018-01-10 21:06:40.000000000 +0800 |
| 38 |
++++ opensmtpd-6.0.3p1-modified/smtpd/mta_session.c 2020-02-25 09:57:04.624147227 +0800 |
| 39 |
+@@ -1214,7 +1214,7 @@ |
| 40 |
+ if (cont) { |
| 41 |
+ if (s->replybuf[0] == '\0') |
| 42 |
+ (void)strlcat(s->replybuf, line, sizeof s->replybuf); |
| 43 |
+- else { |
| 44 |
++ else if (len > 4) { |
| 45 |
+ line = line + 4; |
| 46 |
+ if (isdigit((int)*line) && *(line + 1) == '.' && |
| 47 |
+ isdigit((int)*line+2) && *(line + 3) == '.' && |
| 48 |
+@@ -1229,7 +1229,9 @@ |
| 49 |
+ /* last line of a reply, check if we're on a continuation to parse out status and ESC. |
| 50 |
+ * if we overflow reply buffer or are not on continuation, log entire last line. |
| 51 |
+ */ |
| 52 |
+- if (s->replybuf[0] != '\0') { |
| 53 |
++ if (s->replybuf[0] == '\0') |
| 54 |
++ (void)strlcat(s->replybuf, line, sizeof s->replybuf); |
| 55 |
++ else if (len > 4) { |
| 56 |
+ p = line + 4; |
| 57 |
+ if (isdigit((int)*p) && *(p + 1) == '.' && |
| 58 |
+ isdigit((int)*p+2) && *(p + 3) == '.' && |
| 59 |
+@@ -1238,8 +1240,6 @@ |
| 60 |
+ if (strlcat(s->replybuf, p, sizeof s->replybuf) >= sizeof s->replybuf) |
| 61 |
+ (void)strlcpy(s->replybuf, line, sizeof s->replybuf); |
| 62 |
+ } |
| 63 |
+- else |
| 64 |
+- (void)strlcpy(s->replybuf, line, sizeof s->replybuf); |
| 65 |
+ |
| 66 |
+ if (s->state == MTA_QUIT) { |
| 67 |
+ log_info("%016"PRIx64" mta event=closed reason=quit messages=%zu", |
| 68 |
|
| 69 |
diff --git a/mail-mta/opensmtpd/opensmtpd-6.0.3_p1-r2.ebuild b/mail-mta/opensmtpd/opensmtpd-6.0.3_p1-r3.ebuild |
| 70 |
similarity index 100% |
| 71 |
rename from mail-mta/opensmtpd/opensmtpd-6.0.3_p1-r2.ebuild |
| 72 |
rename to mail-mta/opensmtpd/opensmtpd-6.0.3_p1-r3.ebuild |
| 73 |
|
| 74 |
diff --git a/mail-mta/opensmtpd/opensmtpd-6.6.2_p1.ebuild b/mail-mta/opensmtpd/opensmtpd-6.6.4_p1.ebuild |
| 75 |
similarity index 100% |
| 76 |
rename from mail-mta/opensmtpd/opensmtpd-6.6.2_p1.ebuild |
| 77 |
rename to mail-mta/opensmtpd/opensmtpd-6.6.4_p1.ebuild |
Archives