Attachment 172152 Details for Bug 205960 – svn diff for lang/python35

[patch] svn diff for lang/python35

patch-lang_python35-issue24557 (text/plain), 3.17 KB, created by Bernard Spil on 2016-07-05 20:18:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Spil

Created: 2016-07-05 20:18:14 UTC

Size: 3.17 KB

patch

obsolete

>Index: lang/python35/Makefile
>===================================================================
>--- lang/python35/Makefile	(revision 418099)
>+++ lang/python35/Makefile	(working copy)
>@@ -14,14 +14,12 @@
> 
> LICENSE=	PSFL
> 
>-USES=		cpe ncurses pkgconfig readline tar:xz
>-USE_OPENSSL=	yes
>+USES=		cpe ncurses pkgconfig readline ssl tar:xz
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
> 
> CPE_VENDOR=	python
> CPE_PRODUCT=	${CPE_VENDOR}
>-CPE_VERSION=	${DISTVERSION}
> 
> # Duplicate python.mk variables. TODO: Let lang/python?? ports use python.mk bits.
> PYTHON_VER=		${PYTHON_PORTVERSION:R}
>@@ -31,6 +29,7 @@
> DISABLED_EXTENSIONS=	_sqlite3 _tkinter _gdbm
> CONFIGURE_ARGS+=	--enable-shared --without-ensurepip
> CONFIGURE_ENV+=		OPT="" DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS}"	# Null out OPT to respect user CFLAGS and remove optimizations
>+CFLAGS+=		-I${OPENSSLINC}						# Move OpenSSL include path to beginning of parameters. Issue 205960 
> 
> INSTALL_TARGET=		altinstall						# Don't want cloberring of unprefixed files
> 
>Index: lang/python35/files/patch-issue24557
>===================================================================
>--- lang/python35/files/patch-issue24557	(revision 0)
>+++ lang/python35/files/patch-issue24557	(working copy)
>@@ -0,0 +1,49 @@
>+https://github.com/python/cpython/pull/26
>+
>+As of OpenSSL 1.1 EGD is disabled by default and OPENSSL_NO_EGD is defined.
>+EGD default disabled https://github.com/openssl/openssl/blob/master/Configure#L363 
>+EGD methods not available https://github.com/openssl/openssl/blob/master/include/openssl/rand.h#L61
>+
>+As of LibreSSL 2.2.3 the headers define OPENSSL_NO_EGD in the same way that other missing features are documented there.
>+
>+In addition this fixes a build failure on FreeBSD where configure does not use the correct libraries to detect RAND_egd in libcrypto.
>+--- Modules/_ssl.c.orig	2015-12-07 01:39:10 UTC
>++++ Modules/_ssl.c
>+@@ -3916,7 +3916,7 @@ _ssl_RAND_status_impl(PyModuleDef *modul
>+     return PyLong_FromLong(RAND_status());
>+ }
>+ 
>+-#ifdef HAVE_RAND_EGD
>++#ifndef OPENSSL_NO_EGD
>+ /*[clinic input]
>+ _ssl.RAND_egd
>+     path: object(converter="PyUnicode_FSConverter")
>+@@ -3942,7 +3942,7 @@ _ssl_RAND_egd_impl(PyModuleDef *module, 
>+     }
>+     return PyLong_FromLong(bytes);
>+ }
>+-#endif /* HAVE_RAND_EGD */
>++#endif /* OPENSSL_NO_EGD */
>+ 
>+ 
>+ 
>+--- Modules/clinic/_ssl.c.h.orig	2015-12-07 01:39:10 UTC
>++++ Modules/clinic/_ssl.c.h
>+@@ -893,7 +893,7 @@ _ssl_RAND_status(PyModuleDef *module, Py
>+     return _ssl_RAND_status_impl(module);
>+ }
>+ 
>+-#if defined(HAVE_RAND_EGD)
>++#if !defined(OPENSSL_NO_EGD)
>+ 
>+ PyDoc_STRVAR(_ssl_RAND_egd__doc__,
>+ "RAND_egd($module, path, /)\n"
>+@@ -924,7 +924,7 @@ exit:
>+     return return_value;
>+ }
>+ 
>+-#endif /* defined(HAVE_RAND_EGD) */
>++#endif /* defined(OPENSSL_NO_EGD) */
>+ 
>+ PyDoc_STRVAR(_ssl_get_default_verify_paths__doc__,
>+ "get_default_verify_paths($module, /)\n"
>
>Property changes on: lang/python35/files/patch-issue24557
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 205960: 165181 | 172123 | 172145 | 172152 | 172190 | 172191 | 172245 | 172247