diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-02-29 18:01:47 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-02-29 18:01:47 +0000 |
commit | ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (patch) | |
tree | 9f47ee47c31a0f13f9496879cd88a1042550aa81 /mail-mta/opensmtpd | |
parent | 53cba99042fa967e2a93da9f8db806fe2d035543 (diff) |
gentoo (leap year) resync : 29.02.2020
Diffstat (limited to 'mail-mta/opensmtpd')
-rw-r--r-- | mail-mta/opensmtpd/Manifest | 8 | ||||
-rw-r--r-- | mail-mta/opensmtpd/files/opensmtpd-6.0.3_p1-security-fixes.patch | 32 | ||||
-rw-r--r-- | mail-mta/opensmtpd/opensmtpd-6.0.3_p1-r3.ebuild (renamed from mail-mta/opensmtpd/opensmtpd-6.0.3_p1-r2.ebuild) | 0 | ||||
-rw-r--r-- | mail-mta/opensmtpd/opensmtpd-6.6.4_p1.ebuild (renamed from mail-mta/opensmtpd/opensmtpd-6.6.2_p1.ebuild) | 0 |
4 files changed, 36 insertions, 4 deletions
diff --git a/mail-mta/opensmtpd/Manifest b/mail-mta/opensmtpd/Manifest index 06266e3a18ce..fe73333c487b 100644 --- a/mail-mta/opensmtpd/Manifest +++ b/mail-mta/opensmtpd/Manifest @@ -1,12 +1,12 @@ AUX opensmtpd-6.0.3_p1-fix-crash-on-auth.patch 1130 BLAKE2B ca2a207549056dc729c34d394ffcc6b3f565ca3963a7c9b56f9f2a2ed68997f2839716945c412f6ba2340931297a8e0afeebae93ef6d767ec251dbe66b196a05 SHA512 23558294281527c679c563f35103ccaac04efa4c62a1494e9907480c38a554b551b86a838204df8a314f7fa86452cbf816690abedf3b5c0179758a9205616c38 AUX opensmtpd-6.0.3_p1-openssl_1.1.patch 21039 BLAKE2B 05e6e416f8253bb42d3d0cb213c14d2d07ec8d6beee3058621ac41f7a3815562098be4e5eed863d78443d08ad55f70a94d0c9c031630e87a73388510f4e42c55 SHA512 7e6567889ca823ada283153861806e69cee0185d6dc98aa15675c18ee81d2e118e9bc3a9848551b9f49e772de38234b7d4170e66fb6e6b932a50654b5d9a3806 -AUX opensmtpd-6.0.3_p1-security-fixes.patch 3018 BLAKE2B 6ee6e23f50e705c3ed34eee7cfb38bf73ab4cf057104ab829cc0005063f75cf7c628e01de5258688b896861ac6dedfc40b45e7ce11d9f50a777c6ed5fa7653ad SHA512 751497713dc02fa512d4c61ac7feea792c44841673ede4b92ac474605fa2a2808fc6919336a3d53b5b9b8001d45c3dd321c8746c68d36076c2da94ca83a1b0ab +AUX opensmtpd-6.0.3_p1-security-fixes.patch 4365 BLAKE2B cd6a64173137cad61bf7d6d5925a7d7147973a1b65eeb49d9c35f2ed72b6adf62e386ca9ab1035d31c114c49338817d5478f4999137e62d92bab18b5428305e4 SHA512 a51994fb8e064d652a319cf0acbf7aa2c30e2335712df3cacbc7b9a403f1e5496b29f7d6e97b81723f543e8f78eee82e02c62762fe5adfc12cf1cf35fa4aa7d1 AUX smtpd.initd 231 BLAKE2B a4991c9226daa2289cb20238dcee0dad8b4ff83474327649b61c7394e46fc929c7792b885f58bf76769567ad2058134b97e5019b508e2edec108a4bafb9cc2b4 SHA512 e4c8386bd7e8d8171172aa181305a55ca67cba6d4c82d77d8846e1bd3301dd9d118bb39dad6c144677f050194de813e4d83e06ea6dd591d4f07da8c4a1edde37 AUX smtpd.pam 147 BLAKE2B 1706fe27cf53621428f563af146d1197dfc59133dda79fe08141ec4ca9b240880ef63da3f27e4fb8b653af4ae413ca42cdeb343e1f4e737b7e6258c0d338223d SHA512 d0574cc732138fefffe3ca78da2d689f0849de70dfd65204c99a98a58b2165eb46b23a1c32b356ea2eaf8abd56a4929c7419b29cec1d6b284e344680bab24086 AUX smtpd.service 138 BLAKE2B c76db1847110622621701cdf1fdb764d26bf28b86a25adf9ae8e0ba15838a2a9ddc677f54f5d5fe191591b2bd5c7f20067fc00b6679f448e25371e27f231589d SHA512 b70b173ac275b871d78bac0e55b2e0c8d8a6538c7f2c4dc86fe67fb37a1ee942e0442353b338b286759618299f51b144396251db13f82c9afa035dcaae11a258 AUX smtpd.socket 114 BLAKE2B e684727be39592dce128cc0ab02f8e5bc4510591dcb2c170b49c120e84319b53e10eae275bc6a26ed8c9d51e53a21e41c551f18afd2441602cefc4e93344d50c SHA512 fbbccb4aab80a4a4612609e590965940642321119a65359cf2490530f81d55706a0105309d321a624d40348f12776724d2cf6b8bf29ea24391e60ef8b8bc8ba2 DIST opensmtpd-6.0.3p1.tar.gz 699702 BLAKE2B 49f08e8329adc049a562b6ef7efa4c0a39cbcfe8a158cb905cfc726a7302ffe9833ccfb52041340767d55d0f2ae2087e8eac92b7359016c6c76b4d963a334558 SHA512 e579818a0ddbe637deb5a4e40f43eaf797783903ceac18fd89a57581b135b9e407d424e1a70ff7b4b06a0ee50bafb6e8ab2451371917887904b06ff1b55d320f -DIST opensmtpd-6.6.2p1.tar.gz 777422 BLAKE2B e372a10f618e83ccb6c782d056750f89a5224898a28957509ab306fbe8bb4ea94462c1bbccbbe9c0dea64623c250d9fe9f3b74f2e26eda5d6c232bec50bff1d0 SHA512 b0f7ea94514a4a1880a22996064caa7da0a15e6453236ca2f004402125affa80e9d8c25d3e63826b45045305851959bc58c2c855829e46d6967bf6cd13bd1e91 -EBUILD opensmtpd-6.0.3_p1-r2.ebuild 1910 BLAKE2B e2f00b235de73368d49e209cabc7f0ef80e2a2fd3e967c91a6fe905fa2b3ea0f3e90085d1c7e4c72a9028c1fb5ecfc6ef1f51daf9ddac3c0109fc3394f2d20e7 SHA512 f8c3bf0561a798a4ff39fbf0b123a84626fc7d0e90c7ef7b7357bda4530c9cfb90f64c853bc2f5424bc594c21e2883a3111db30693e6d4da06e9cbb29be94d1c -EBUILD opensmtpd-6.6.2_p1.ebuild 1998 BLAKE2B 6d24269e834350693240f9a0cbbd702994b027102cbaa26c7a98653e2e6f89e3a80fff36c3386a669475520e8b9bdf79f348deb062b6b71f6e88ed6fbf15c2b1 SHA512 bd9791a7fcec94ecc29835942089abb61bdce74e1d442e27072b6c544c505d43d8417dcc1a27a599be1684ec3e0f228e05d3f4bc68a2f78ddeb719683897eece +DIST opensmtpd-6.6.4p1.tar.gz 790754 BLAKE2B 18cc19569ae764eff3d672cbfb87df7bd00afcce93705ad128e935c0a47a246c3a6166fca7b6f844c0dd5e728492d8aeb7e0f8a8c1f5a756bf356ae9afb80852 SHA512 267307c91f4fcf21624b0897dfb1f5638b77da7b8d9a02211d734ed2cc5bd39ea7542ae7f200255e2945518fbe7609a0e5aa4e5c6dcb8146014f08b3845c108b +EBUILD opensmtpd-6.0.3_p1-r3.ebuild 1910 BLAKE2B e2f00b235de73368d49e209cabc7f0ef80e2a2fd3e967c91a6fe905fa2b3ea0f3e90085d1c7e4c72a9028c1fb5ecfc6ef1f51daf9ddac3c0109fc3394f2d20e7 SHA512 f8c3bf0561a798a4ff39fbf0b123a84626fc7d0e90c7ef7b7357bda4530c9cfb90f64c853bc2f5424bc594c21e2883a3111db30693e6d4da06e9cbb29be94d1c +EBUILD opensmtpd-6.6.4_p1.ebuild 1998 BLAKE2B 6d24269e834350693240f9a0cbbd702994b027102cbaa26c7a98653e2e6f89e3a80fff36c3386a669475520e8b9bdf79f348deb062b6b71f6e88ed6fbf15c2b1 SHA512 bd9791a7fcec94ecc29835942089abb61bdce74e1d442e27072b6c544c505d43d8417dcc1a27a599be1684ec3e0f228e05d3f4bc68a2f78ddeb719683897eece MISC metadata.xml 595 BLAKE2B c13a49c15ec7c4430834682a4428b80e81be9832cbf6fbdd506ce9bcfc625aabf342d094ee83c689e63573cff9bfb2abee86196374c617c75aa487eb83ad0e4c SHA512 aa7344806cd011cec6c7afa277345eb2988f11970ea3038d969efa50d5b1f485f199f15a1b632197700791c2242ed8f712ff3cc382b1491e44c14ee94075a1d5 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 index 58f3ed8c38b1..b22f3af1fbe4 100644 --- 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 @@ -89,3 +89,35 @@ diff -ru OpenSMTPD-opensmtpd-6.0.3/smtpd/smtp_session.c OpenSMTPD-opensmtpd-6.0. return (1); } +diff -ru opensmtpd-6.0.3p1/smtpd/mta_session.c opensmtpd-6.0.3p1-modified/smtpd/mta_session.c +--- opensmtpd-6.0.3p1/smtpd/mta_session.c 2018-01-10 21:06:40.000000000 +0800 ++++ opensmtpd-6.0.3p1-modified/smtpd/mta_session.c 2020-02-25 09:57:04.624147227 +0800 +@@ -1214,7 +1214,7 @@ + if (cont) { + if (s->replybuf[0] == '\0') + (void)strlcat(s->replybuf, line, sizeof s->replybuf); +- else { ++ else if (len > 4) { + line = line + 4; + if (isdigit((int)*line) && *(line + 1) == '.' && + isdigit((int)*line+2) && *(line + 3) == '.' && +@@ -1229,7 +1229,9 @@ + /* last line of a reply, check if we're on a continuation to parse out status and ESC. + * if we overflow reply buffer or are not on continuation, log entire last line. + */ +- if (s->replybuf[0] != '\0') { ++ if (s->replybuf[0] == '\0') ++ (void)strlcat(s->replybuf, line, sizeof s->replybuf); ++ else if (len > 4) { + p = line + 4; + if (isdigit((int)*p) && *(p + 1) == '.' && + isdigit((int)*p+2) && *(p + 3) == '.' && +@@ -1238,8 +1240,6 @@ + if (strlcat(s->replybuf, p, sizeof s->replybuf) >= sizeof s->replybuf) + (void)strlcpy(s->replybuf, line, sizeof s->replybuf); + } +- else +- (void)strlcpy(s->replybuf, line, sizeof s->replybuf); + + if (s->state == MTA_QUIT) { + log_info("%016"PRIx64" mta event=closed reason=quit messages=%zu", diff --git a/mail-mta/opensmtpd/opensmtpd-6.0.3_p1-r2.ebuild b/mail-mta/opensmtpd/opensmtpd-6.0.3_p1-r3.ebuild index 14d9fa69ea4a..14d9fa69ea4a 100644 --- a/mail-mta/opensmtpd/opensmtpd-6.0.3_p1-r2.ebuild +++ b/mail-mta/opensmtpd/opensmtpd-6.0.3_p1-r3.ebuild diff --git a/mail-mta/opensmtpd/opensmtpd-6.6.2_p1.ebuild b/mail-mta/opensmtpd/opensmtpd-6.6.4_p1.ebuild index 143540cb4f1c..143540cb4f1c 100644 --- a/mail-mta/opensmtpd/opensmtpd-6.6.2_p1.ebuild +++ b/mail-mta/opensmtpd/opensmtpd-6.6.4_p1.ebuild |