dev-lang/python: Backport CVE-2020-14422 & emailaddr CRLF fixes

Bug: https://bugs.gentoo.org/728668
Signed-off-by: Michał Górny <mgorny@gentoo.org>

4 files changed, 6 insertions, 6 deletions

diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 6b7d0dd04e8d..58d265682c19 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -9,9 +9,9 @@ DIST Python-3.9.0b3.tar.xz 18518204 BLAKE2B fa1707f0d55a83e739e9ad51979f8aff9720
 DIST Python-3.9.0b4.tar.xz 18602256 BLAKE2B 9f260f2b3c6380745c343d2883db430dda1b76b120050df16e53c1021e5a746c7e4a6aa8e83c746c3705c6872e83369a649c48ffdaef972a7049c44f7bc3030b SHA512 1c9bac850159352effb163b41590b3e9c05100b449798b5615f7a51a59a3877fe9558d593bb47c24915226637e3394e7864a1b1555cd6c5b5e5e308972208ecf
 DIST python-gentoo-patches-2.7.18.tar.xz 15012 BLAKE2B f691e231c793bb8f11fb64c89b90e022af8e0fe0e28839822c2ae6214fdab6c6fd9c07466c4b5797d3964b7db09fd979597774fb7872dc674e8df59321b6bf95 SHA512 a2952b27bfc0a52f322b2f3e177cbe09fa288c9ca5967c13fb9c2d45d3e81033407e30e86bdaaaa258f0b3cfa2cef6eda5502bddb6390f9512a493d145d34e03
 DIST python-gentoo-patches-3.6.10-r1.tar.xz 15556 BLAKE2B 3d4755a083172fc878d3454797a4a7fa809c7767b7f2ba0919b95076b8ecba62ac604a7db349d8dd71f83aa44d4580d0c433ae6cd2027078e7779cec79185ba2 SHA512 b361ff3fe9545bb59a7e85f179a094d58219be35d20cef83db02672d0a9a58fccfda62fbe8c2bf64250c4043b8517cbc2091380611c5f1e63bfac9ca7c4e47b0
-DIST python-gentoo-patches-3.6.11.tar.xz 11180 BLAKE2B ac4be3da8510d64efcd902ea1408e9c2530e6f1cb5f4ab74ef3280bc3d4d554a04cfcebf417297586e2992af91ff5da511b3e371ac88237218d6e837714e2fec SHA512 b29aec6ac02b71dec4884a8b2b24f929fa3c8709d985c8b134d3ab835be78fd4e9da4f9006d491382442a19895e748b806b7f27d30c6970cf42982bd16fa1946
+DIST python-gentoo-patches-3.6.11-r1.tar.xz 12180 BLAKE2B 68f217031c88be4b4b878a3878aa956578ff0051f1c3ba7b8add2f71c217e28e5f0e81718ebc983334d3e9876d0263996ee7e5010a380ef89796e1f2b98d7776 SHA512 360e1dafcbee621b7bf7d913acfb5cd5bd5149ee544af107aa48de1661be05b3865915aeb3c7b22fb9079d37e67d2581f5ad876526bbcca670c2259d07b40779
 DIST python-gentoo-patches-3.7.7.tar.xz 14644 BLAKE2B 1a377eac945310082ec9fa257bcb406c7eaf24b5e80469dd49e82a1bc0554b75394678609cae447cb0fc7a19059b29166bf110b6ed99a89a9919b3a56a323f87 SHA512 2c7fbcefd6f4d1674b78f3b67f2be3f1b168e08c318fefe8d4757f2d30c22477f5010ad6f2c0abb265d819ee667617f21f93e002242e216b4ee570200b0ddf74
-DIST python-gentoo-patches-3.7.8.tar.xz 10304 BLAKE2B dc1bff35bdf3f7e97d15fbd0af4c3278ea54b43cb204641f666293dec507431987445fe6ecb991814842b8c58c65a6185b4c24e3ae08d682ef98916263af7cd4 SHA512 5871121e514dd6af4d9298550a5e01ee114950fd6db58bb8bdb879ede602a228f64d7bf8f6e04317ababc42a502b1192f4a010122745d5a8bc7a40866106479a
+DIST python-gentoo-patches-3.7.8-r1.tar.xz 11344 BLAKE2B 745f1947c3ba011f49f76e021ede7055896d40d015706547c3e383ba26525172aef982c07d8590c91d49d0dfa937b086301767f3ff532202459659e21f3e6b2a SHA512 4c2e1fa550b2a27f5cd716299a8bc16dbad982d26c0597a212525aa4735c9eb9302151bca69e115dd34c33cb9c2cc18e1d19169b63d9dca7343ff2723eda8dfe
 DIST python-gentoo-patches-3.8.2-r1.tar.xz 16112 BLAKE2B 9ae197a56bbd96afa11c4312c68ac030138773df22dedc3a3e6fb9e81b366d6522fb2c147946eb604a87d749cbea7e5e5eed8ae0e737294c0949a8c2791dd327 SHA512 00f31c3b7227dd443f05234fbb7744338ce687e1ea4d236a6b1d386d76082acb34259f59442018c9ace54e0004dea9ac822ae2a4470159b83d00112e258baff0
-DIST python-gentoo-patches-3.8.3.tar.xz 10704 BLAKE2B 6fdd13139b1132313153af2de774abeca7c1fe9acb34a87e5d96875a4cbe8c22c201acbb11c15eeaf828493c32f6acd89e3b5d4012fa2c9d216da556aadb9f01 SHA512 6f67d77e8240983c0dd749620e5df81df5816b831032e190c82c8d73ea8a995daf2631640234a1350e483bd13276466457d110176612bfde3281d1b6a8bf97bb
+DIST python-gentoo-patches-3.8.3-r1.tar.xz 12492 BLAKE2B c580918faba7b13137f108bee28d8425a69501d1f06e114eaf259512d6e9ceb19e6a6355ffbf860210578d2696ecf8f252b411d385dbf3f08ceb7f1bfee589ce SHA512 5e09d61c6d6bd41f5652b39dc502be50b8f85fa9731b4e07af0dbde79101148f6216a8ad56c06047a9b19c4e190ab8316c57654ee03e4773d2b93f55629e4ede
 DIST python-gentoo-patches-3.9.0b3.tar.xz 8592 BLAKE2B 261dc9a5c7b370eb3f693f5bfb15562a5ee8b24b038db1b16571f096ff0d451ef8830c7f51db53366ebcf6e378dfab57e186f1789dc3ecc95e65595708f4428e SHA512 4c630b1b15e752ae154bfc9d0f5c8a17ac02127f96ccf114469bb92d02fe7d2ac13acd2415bfe6af0169c823b4aec09e2d6886c031df8e8c809ccb94efa60b62
diff --git a/dev-lang/python/python-3.6.11.ebuild b/dev-lang/python/python-3.6.11-r1.ebuild
index cebadb559b7d..a4be36874b19 100644
--- a/dev-lang/python/python-3.6.11.ebuild
+++ b/dev-lang/python/python-3.6.11-r1.ebuild
@@ -8,7 +8,7 @@ inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs
 
 MY_P="Python-${PV}"
 PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-3.6.11"
+PATCHSET="python-gentoo-patches-3.6.11-r1"
 
 DESCRIPTION="An interpreted, interactive, object-oriented programming language"
 HOMEPAGE="https://www.python.org/"
diff --git a/dev-lang/python/python-3.7.8.ebuild b/dev-lang/python/python-3.7.8-r1.ebuild
index c88e819e8b18..d39fe7fff94a 100644
--- a/dev-lang/python/python-3.7.8.ebuild
+++ b/dev-lang/python/python-3.7.8-r1.ebuild
@@ -8,7 +8,7 @@ inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs
 
 MY_P="Python-${PV}"
 PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-3.7.8"
+PATCHSET="python-gentoo-patches-3.7.8-r1"
 
 DESCRIPTION="An interpreted, interactive, object-oriented programming language"
 HOMEPAGE="https://www.python.org/"
diff --git a/dev-lang/python/python-3.8.3.ebuild b/dev-lang/python/python-3.8.3-r1.ebuild
index c1cb51ab328b..c127777442f4 100644
--- a/dev-lang/python/python-3.8.3.ebuild
+++ b/dev-lang/python/python-3.8.3-r1.ebuild
@@ -8,7 +8,7 @@ inherit autotools flag-o-matic pax-utils python-utils-r1 toolchain-funcs
 
 MY_P="Python-${PV}"
 PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-3.8.3"
+PATCHSET="python-gentoo-patches-3.8.3-r1"
 
 DESCRIPTION="An interpreted, interactive, object-oriented programming language"
 HOMEPAGE="https://www.python.org/"