aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanilo G. Baio <dbaio@FreeBSD.org>2020-06-15 11:17:49 +0000
committerDanilo G. Baio <dbaio@FreeBSD.org>2020-06-15 11:17:49 +0000
commita1b0612cecc36bbbb69dc1586a111c0875d425b2 (patch)
tree310e93bf905fe1d27d899d9c688ceca2f1fc2bf6
parenta2d05f72bd90e84adc4e9fe0e4501d88259a3a33 (diff)
downloadports-a1b0612cecc36bbbb69dc1586a111c0875d425b2.tar.gz
ports-a1b0612cecc36bbbb69dc1586a111c0875d425b2.zip
MFH: r535638 r538669
Update python38 doc to 3.8.3 after r535463 lang/python36: Update to 3.6.10, Fix security issues The patches for CVE-2019-18348 and CVE-2020-8492 are in the 3.6 branch and will be present on the next release. Patch for applying CVE-2020-8492 fix here in the ports tree was reported and submitted by Mike Fisher <mfisher911@gmail.com> and Dani <i.dani@outlook.com>. PR: 246984 Security: ca595a25-91d8-11ea-b470-080027846a02 (CVE-2019-18348) Security: a27b0bb6-84fc-11ea-b5b4-641c67a117d8 (CVE-2020-8492) Approved by: ports-secteam (joneum)
Notes
Notes: svn path=/branches/2020Q2/; revision=538871
-rw-r--r--lang/python-doc-html/distinfo34
-rw-r--r--lang/python36/Makefile5
-rw-r--r--lang/python36/Makefile.version2
-rw-r--r--lang/python36/distinfo10
4 files changed, 28 insertions, 23 deletions
diff --git a/lang/python-doc-html/distinfo b/lang/python-doc-html/distinfo
index a18271adf84a..0dc95a325087 100644
--- a/lang/python-doc-html/distinfo
+++ b/lang/python-doc-html/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1587430333
+TIMESTAMP = 1591480200
SHA256 (python/python-2.7.18-docs-html.tar.bz2) = 3d05142817615e77cec99f686dca58289bbfe008af22f94a93262e8663db81c7
SIZE (python/python-2.7.18-docs-html.tar.bz2) = 4732851
SHA256 (python/python-2.7.18-docs-pdf-a4.tar.bz2) = ead357695e43c824ae1a83dd6cd3b4a47215658f3fa20111726ff7ef16a16dd2
@@ -15,14 +15,14 @@ SHA256 (python/python-3.5.9-docs-pdf-letter.tar.bz2) = 75f76df9aa7849a2e453d7b36
SIZE (python/python-3.5.9-docs-pdf-letter.tar.bz2) = 10776220
SHA256 (python/python-3.5.9-docs-text.tar.bz2) = d56ebb09057f27abcb717f21c250a7c84f41e750a009bcf8e1e0850ff269098c
SIZE (python/python-3.5.9-docs-text.tar.bz2) = 2058975
-SHA256 (python/python-3.6.9-docs-html.tar.bz2) = a5272e517c3b71c89a647cfa55390aec394407ee224017e1288fc3d22141d013
-SIZE (python/python-3.6.9-docs-html.tar.bz2) = 5992329
-SHA256 (python/python-3.6.9-docs-pdf-a4.tar.bz2) = bf95834d777ebe3252ad0bee2a36e4772e41414331c8068332961ebad3a89761
-SIZE (python/python-3.6.9-docs-pdf-a4.tar.bz2) = 13818889
-SHA256 (python/python-3.6.9-docs-pdf-letter.tar.bz2) = 656e70bfff58d1815507ca7cd82cc74ee5d30a9c575ba0488df6edaa8d290c24
-SIZE (python/python-3.6.9-docs-pdf-letter.tar.bz2) = 13819027
-SHA256 (python/python-3.6.9-docs-text.tar.bz2) = bbcce937a6853310f987c2a9434224f03180927622b86ab60feb4176cfcd8ec5
-SIZE (python/python-3.6.9-docs-text.tar.bz2) = 2165791
+SHA256 (python/python-3.6.10-docs-html.tar.bz2) = 2269cb0693f8838793206353b1e5684d8ba4d77ec7cce07ff7f749170f96e768
+SIZE (python/python-3.6.10-docs-html.tar.bz2) = 5994263
+SHA256 (python/python-3.6.10-docs-pdf-a4.tar.bz2) = 1151a7b6a38e9f167d6f5d9f58071904ee210282580f5a0a30657d99f20074c9
+SIZE (python/python-3.6.10-docs-pdf-a4.tar.bz2) = 13822421
+SHA256 (python/python-3.6.10-docs-pdf-letter.tar.bz2) = 89f80cd44f8595f5f7bb1d5b9e019f21c54ed0b83a15854dcbf922ffad4bb166
+SIZE (python/python-3.6.10-docs-pdf-letter.tar.bz2) = 13822156
+SHA256 (python/python-3.6.10-docs-text.tar.bz2) = 870c2f188f7ebafe0dcdf2438fc0652ec8c866ad8a96f6e2524464bbc347528a
+SIZE (python/python-3.6.10-docs-text.tar.bz2) = 2167559
SHA256 (python/python-3.7.7-docs-html.tar.bz2) = f9f2a375eaf847ea927edafd0d64aaef76e32db7cfdcafc7d5a198feff48613f
SIZE (python/python-3.7.7-docs-html.tar.bz2) = 6259882
SHA256 (python/python-3.7.7-docs-pdf-a4.tar.bz2) = b14cf18f78b8db5e099869256f9cd959056d22e2f98321dd4fa162e32dc1f655
@@ -31,11 +31,11 @@ SHA256 (python/python-3.7.7-docs-pdf-letter.tar.bz2) = ff6399745e5efdbd7dabff823
SIZE (python/python-3.7.7-docs-pdf-letter.tar.bz2) = 14289660
SHA256 (python/python-3.7.7-docs-text.tar.bz2) = 26231081c1214e2ab1af1001607bafb25ee10ef8671e7f5722782f63e9415bd8
SIZE (python/python-3.7.7-docs-text.tar.bz2) = 2288271
-SHA256 (python/python-3.8.2-docs-html.tar.bz2) = e12135b29ef231fce0d20c5865cf7fb37cecea11f2304e389325b04e9281558a
-SIZE (python/python-3.8.2-docs-html.tar.bz2) = 6536475
-SHA256 (python/python-3.8.2-docs-pdf-a4.tar.bz2) = 9cf8ac9960c5db0594c7c9d9cee33d31fa8619277c496a257e434f9887b8053e
-SIZE (python/python-3.8.2-docs-pdf-a4.tar.bz2) = 14635317
-SHA256 (python/python-3.8.2-docs-pdf-letter.tar.bz2) = c37cb6bd119f76b717d27f205156405638df0299814d9566f943dcdd25cdd5b2
-SIZE (python/python-3.8.2-docs-pdf-letter.tar.bz2) = 14740766
-SHA256 (python/python-3.8.2-docs-text.tar.bz2) = c80ffdbc76af13327344e7ef0c1da3ac04c6f77cf1bb3bc6886b2e4dbf39f729
-SIZE (python/python-3.8.2-docs-text.tar.bz2) = 2399195
+SHA256 (python/python-3.8.3-docs-html.tar.bz2) = 2d792badec2d2146397c53b8f67bc2b1a6f3047a4587f49f410839d30ad0d8c9
+SIZE (python/python-3.8.3-docs-html.tar.bz2) = 6556303
+SHA256 (python/python-3.8.3-docs-pdf-a4.tar.bz2) = cda93cca155ddca7d788b8396b29a5f4655333f9c781b158974f3a08c1dab481
+SIZE (python/python-3.8.3-docs-pdf-a4.tar.bz2) = 14650484
+SHA256 (python/python-3.8.3-docs-pdf-letter.tar.bz2) = 7df31d400ebd0dfff81b101396c31cf453e6506b1b80563090f4e96ca8127c20
+SIZE (python/python-3.8.3-docs-pdf-letter.tar.bz2) = 14755407
+SHA256 (python/python-3.8.3-docs-text.tar.bz2) = 5dc814c6003580554ff1ddb131502b50beedbb15e0be908e0186b134719d85d1
+SIZE (python/python-3.8.3-docs-text.tar.bz2) = 2402463
diff --git a/lang/python36/Makefile b/lang/python36/Makefile
index a0e258e53a61..db592fb76cd8 100644
--- a/lang/python36/Makefile
+++ b/lang/python36/Makefile
@@ -3,7 +3,6 @@
PORTNAME= python
PORTVERSION= ${PYTHON_PORTVERSION}
-PORTREVISION= 3
CATEGORIES= lang python
MASTER_SITES= PYTHON/ftp/python/${PORTVERSION}
PKGNAMESUFFIX= ${PYTHON_SUFFIX}
@@ -13,7 +12,9 @@ DIST_SUBDIR= python
# Resolve sinpi name clash with libm (IEEE-754 violation)
PATCH_SITES= https://github.com/python/cpython/commit/
PATCHFILES= f57cd8288dbe6aba99c057f37ad6d58f8db75350.patch:-p1 \
- f9c01a16dae8aa15d264a1937fb589e8598d1c88.patch:-p1
+ f9c01a16dae8aa15d264a1937fb589e8598d1c88.patch:-p1 \
+ 69cdeeb93e0830004a495ed854022425b93b3f3e.patch:-p1 \
+ 83fc70159b24f5b11a5ef87c9b05c2cf4c7faeba.patch:-p1
MAINTAINER= python@FreeBSD.org
COMMENT= Interpreted object-oriented programming language
diff --git a/lang/python36/Makefile.version b/lang/python36/Makefile.version
index fe7216a610a5..92aa6239930e 100644
--- a/lang/python36/Makefile.version
+++ b/lang/python36/Makefile.version
@@ -3,4 +3,4 @@
# Do not forget to update python documentation (lang/python-doc-*)
# Run "make -C lang/python-doc-html makesum"
-PYTHON_PORTVERSION= 3.6.9
+PYTHON_PORTVERSION= 3.6.10
diff --git a/lang/python36/distinfo b/lang/python36/distinfo
index 1cc84ef9ad84..64ea60cf77b1 100644
--- a/lang/python36/distinfo
+++ b/lang/python36/distinfo
@@ -1,7 +1,11 @@
-TIMESTAMP = 1575752359
-SHA256 (python/Python-3.6.9.tar.xz) = 5e2f5f554e3f8f7f0296f7e73d8600c4e9acbaee6b2555b83206edf5153870da
-SIZE (python/Python-3.6.9.tar.xz) = 17212164
+TIMESTAMP = 1591492360
+SHA256 (python/Python-3.6.10.tar.xz) = 0a833c398ac8cd7c5538f7232d8531afef943c60495c504484f308dac3af40de
+SIZE (python/Python-3.6.10.tar.xz) = 17212220
SHA256 (python/f57cd8288dbe6aba99c057f37ad6d58f8db75350.patch) = 44340896504b297bbab06db0bb0a71ddf9f25bbe02ab3dcdfeec2772c957b69f
SIZE (python/f57cd8288dbe6aba99c057f37ad6d58f8db75350.patch) = 2542
SHA256 (python/f9c01a16dae8aa15d264a1937fb589e8598d1c88.patch) = a5cf6ef701d6afb14417232c6723fe2c50d7bf35d87bf6b3e3bcbfa1000a38f9
SIZE (python/f9c01a16dae8aa15d264a1937fb589e8598d1c88.patch) = 2888
+SHA256 (python/69cdeeb93e0830004a495ed854022425b93b3f3e.patch) = e935493892358bf5a82dd6299fd9d1f0dadb28395bc1d8e0dd031fde0bf4c68c
+SIZE (python/69cdeeb93e0830004a495ed854022425b93b3f3e.patch) = 10887
+SHA256 (python/83fc70159b24f5b11a5ef87c9b05c2cf4c7faeba.patch) = f0bf09c945bc3be4cc692452454d2bf4c434a15dcd9c468ad9bcba8d73f3a3dd
+SIZE (python/83fc70159b24f5b11a5ef87c9b05c2cf4c7faeba.patch) = 6691