Attachment 172247 Details for Bug 205960 – svn diff for lang/python3*

[patch] svn diff for lang/python3*

patch-lang_python3-issue24557 (text/plain), 5.19 KB, created by Bernard Spil on 2016-07-08 16:37:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Spil

Created: 2016-07-08 16:37:33 UTC

Size: 5.19 KB

patch

obsolete

>Index: lang/python33/Makefile
>===================================================================
>--- lang/python33/Makefile	(revision 418118)
>+++ lang/python33/Makefile	(working copy)
>@@ -16,14 +16,12 @@
> DEPRECATED=	No longer receives bug fixes, only security updates. Please update to Python 3.5
> EXPIRATION_DATE=	2017-09-01
> 
>-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=	${PORTVERSION}
> 
> CONFIGURE_ARGS+=	--enable-shared
> CONFIGURE_ENV+=		OPT=""							# Null out OPT to respect user CFLAGS and remove optimizations
>Index: lang/python34/Makefile
>===================================================================
>--- lang/python34/Makefile	(revision 418118)
>+++ lang/python34/Makefile	(working copy)
>@@ -13,14 +13,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=	${PORTVERSION}
> 
> DISABLED_EXTENSIONS=	_sqlite3 _tkinter _gdbm
> CONFIGURE_ARGS+=	--enable-shared --without-ensurepip
>Index: lang/python34/files/patch-issue24557
>===================================================================
>--- lang/python34/files/patch-issue24557	(revision 0)
>+++ lang/python34/files/patch-issue24557	(working copy)
>@@ -0,0 +1,23 @@
>+http://bugs.python.org/issue24557
>+assume egd unless OPENSSL_NO_EGD is defined-remove configure check
>+
>+--- Modules/_ssl.c.orig	2016-06-25 21:52:32 UTC
>++++ Modules/_ssl.c
>+@@ -3325,7 +3325,7 @@ Returns 1 if the OpenSSL PRNG has been s
>+ It is necessary to seed the PRNG with RAND_add() on some platforms before\n\
>+ using the ssl() function.");
>+ 
>+-#ifdef HAVE_RAND_EGD
>++#ifndef OPENSSL_NO_EGD
>+ static PyObject *
>+ PySSL_RAND_egd(PyObject *self, PyObject *args)
>+ {
>+@@ -3753,7 +3753,7 @@ static PyMethodDef PySSL_methods[] = {
>+      PySSL_RAND_bytes_doc},
>+     {"RAND_pseudo_bytes",   PySSL_RAND_pseudo_bytes, METH_VARARGS,
>+      PySSL_RAND_pseudo_bytes_doc},
>+-#ifdef HAVE_RAND_EGD
>++#ifndef OPENSSL_NO_EGD
>+     {"RAND_egd",            PySSL_RAND_egd, METH_VARARGS,
>+      PySSL_RAND_egd_doc},
>+ #endif
>
>Property changes on: lang/python34/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
>Index: lang/python35/Makefile
>===================================================================
>--- lang/python35/Makefile	(revision 418118)
>+++ lang/python35/Makefile	(working copy)
>@@ -14,8 +14,7 @@
> 
> 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
> 
>Index: lang/python35/files/patch-issue24557
>===================================================================
>--- lang/python35/files/patch-issue24557	(revision 0)
>+++ lang/python35/files/patch-issue24557	(working copy)
>@@ -0,0 +1,51 @@
>+http://bugs.python.org/issue24557
>+https://hg.python.org/cpython/rev/fe168c2b5e95
>+
>+assume egd unless OPENSSL_NO_EGD is defined-remove configure check
>+
>+--- 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, PyObject *Py_UNUSED(ignored))
>+     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 @@ _ssl_RAND_egd(PyModuleDef *module, PyObject *arg)
>+     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"
>+@@ -1102,4 +1102,4 @@ _ssl_enum_crls(PyModuleDef *module, PyObject *args, PyObject *kwargs)
>+ #ifndef _SSL_ENUM_CRLS_METHODDEF
>+     #define _SSL_ENUM_CRLS_METHODDEF
>+ #endif /* !defined(_SSL_ENUM_CRLS_METHODDEF) */
>+-/*[clinic end generated code: output=a14999cb565a69a2 input=a9049054013a1b77]*/
>++/*[clinic end generated code: output=abe795f14cb63b6a input=a9049054013a1b77]*/
>
>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

Flags:

koobs: maintainer-approval+

Actions: View | Diff

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