Attachment 205494 Details for Bug 238952 – update to 3.6.9

update to 3.6.9

python-3.6.9.diff.txt (text/plain), 5.55 KB, created by wen on 2019-07-03 07:51:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: wen

Created: 2019-07-03 07:51:00 UTC

Size: 5.55 KB

patch

obsolete

>Index: python36/Makefile
>===================================================================
>--- python36/Makefile	(revision 505727)
>+++ python36/Makefile	(working copy)
>@@ -3,7 +3,6 @@
> 
> PORTNAME=	python
> PORTVERSION=	${PYTHON_PORTVERSION}
>-PORTREVISION=	2
> CATEGORIES=	lang python ipv6
> MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
> PKGNAMESUFFIX=	${PYTHON_SUFFIX}
>Index: python36/Makefile.version
>===================================================================
>--- python36/Makefile.version	(revision 505727)
>+++ python36/Makefile.version	(working copy)
>@@ -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.8
>+PYTHON_PORTVERSION=	3.6.9
>Index: python36/distinfo
>===================================================================
>--- python36/distinfo	(revision 505727)
>+++ python36/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1545693407
>-SHA256 (python/Python-3.6.8.tar.xz) = 35446241e995773b1bed7d196f4b624dadcadc8429f26282e756b2fb8a351193
>-SIZE (python/Python-3.6.8.tar.xz) = 17212420
>+TIMESTAMP = 1562110897
>+SHA256 (python/Python-3.6.9.tar.xz) = 5e2f5f554e3f8f7f0296f7e73d8600c4e9acbaee6b2555b83206edf5153870da
>+SIZE (python/Python-3.6.9.tar.xz) = 17212164
>Index: python36/files/patch-bpo35746
>===================================================================
>--- python36/files/patch-bpo35746	(revision 505727)
>+++ python36/files/patch-bpo35746	(nonexistent)
>@@ -1,21 +0,0 @@
>-Obtained from:	https://github.com/python/cpython/commit/216a4d83c3b72f4fdcd81b588dc3f42cc461739a
>-
>-bpo-35746: Fix segfault in ssl's cert parser (GH-11569) (GH-11573)
>-
>-Fix a NULL pointer deref in ssl module. The cert parser did not handle CRL
>-distribution points with empty DP or URI correctly. A malicious or buggy
>-certificate can result into segfault.
>-
>---- Modules/_ssl.c.orig
>-+++ Modules/_ssl.c
>-@@ -1338,6 +1338,10 @@ _get_crl_dp(X509 *certificate) {
>-         STACK_OF(GENERAL_NAME) *gns;
>- 
>-         dp = sk_DIST_POINT_value(dps, i);
>-+        if (dp->distpoint == NULL) {
>-+            /* Ignore empty DP value, CVE-2019-5010 */
>-+            continue;
>-+        }
>-         gns = dp->distpoint->name.fullname;
>- 
>-         for (j=0; j < sk_GENERAL_NAME_num(gns); j++) {
>
>Property changes on: python36/files/patch-bpo35746
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: python36/pkg-plist
>===================================================================
>--- python36/pkg-plist	(revision 505727)
>+++ python36/pkg-plist	(working copy)
>@@ -5205,6 +5205,7 @@
> lib/python%%XYDOT%%/test/support/__pycache__/testresult.cpython-%%XY%%.pyc
> lib/python%%XYDOT%%/test/support/script_helper.py
> lib/python%%XYDOT%%/test/support/testresult.py
>+lib/python%%XYDOT%%/test/talos-2019-0758.pem
> lib/python%%XYDOT%%/test/test___all__.py
> lib/python%%XYDOT%%/test/test___future__.py
> lib/python%%XYDOT%%/test/test__locale.py
>Index: python-doc-html/distinfo
>===================================================================
>--- python-doc-html/distinfo	(revision 505727)
>+++ python-doc-html/distinfo	(working copy)
>@@ -1,4 +1,4 @@
>-TIMESTAMP = 1553834988
>+TIMESTAMP = 1562139598
> SHA256 (python/python-2.7.16-docs-html.tar.bz2) = 02d488e908ceaa793662c3ea17ee9b9259f32782d74705633151c19f5fd05fe5
> SIZE (python/python-2.7.16-docs-html.tar.bz2) = 4629448
> SHA256 (python/python-2.7.16-docs-pdf-a4.tar.bz2) = b8397a5ba1c8a205a9873c12899dd33c0d5f265abaad33ce200f2e9aad0fb492
>@@ -15,14 +15,14 @@
> SIZE (python/python-3.5.7-docs-pdf-letter.tar.bz2) = 10877760
> SHA256 (python/python-3.5.7-docs-text.tar.bz2) = 3d001c4a23f99a5c22116de7bc5c27fd985541b90fef29a7454b61add51b3d96
> SIZE (python/python-3.5.7-docs-text.tar.bz2) = 2067002
>-SHA256 (python/python-3.6.8-docs-html.tar.bz2) = d17ebdc57a6590b7c86c98047c4f90723c5a1846343a4640e0596161922cf9eb
>-SIZE (python/python-3.6.8-docs-html.tar.bz2) = 6010329
>-SHA256 (python/python-3.6.8-docs-pdf-a4.tar.bz2) = 4734db2cea99bbd2d3b6523cc3aa969c88cebfce7c705e8918677fce96cdd1c8
>-SIZE (python/python-3.6.8-docs-pdf-a4.tar.bz2) = 13672468
>-SHA256 (python/python-3.6.8-docs-pdf-letter.tar.bz2) = 76562a113644bc01b1107aab8dafe8680227c8ee384946a07ce67f21b7e31086
>-SIZE (python/python-3.6.8-docs-pdf-letter.tar.bz2) = 13673043
>-SHA256 (python/python-3.6.8-docs-text.tar.bz2) = 4a48632298ac7ed94aedb2c3093170b739b4c7cd607419cbb5bf3edb8f9d8c0a
>-SIZE (python/python-3.6.8-docs-text.tar.bz2) = 2163182
>+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.7.3-docs-html.tar.bz2) = 38bac7ff3330fab68c57ee9ce553f2f9ccce4365ff4ae646c0d06868bd0c9bd8
> SIZE (python/python-3.7.3-docs-html.tar.bz2) = 6223981
> SHA256 (python/python-3.7.3-docs-pdf-a4.tar.bz2) = e998213bf0e8117b58fa3653d0d46a70ae79d1e05a4c2d6995687c179b7310a6

Actions: View

Attachments on bug 238952: 205494