Attachment #172247 for bug #205960




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 ssl tar:xz
USE_OPENSSL=	yes
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





LICENSE=	PSFL

USES=		cpe ncurses pkgconfig readline ssl tar:xz
USE_OPENSSL=	yes
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




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

Lines 14-21 Link Here

(-)lang/python35/Makefile (-2 / +1 lines)
14		14
15	LICENSE= PSFL	15	LICENSE= PSFL
16		16
17	USES= cpe ncurses pkgconfig readline tar:xz	17	USES= cpe ncurses pkgconfig readline ssl tar:xz
18	USE_OPENSSL= yes
19	USE_LDCONFIG= yes	18	USE_LDCONFIG= yes
20	GNU_CONFIGURE= yes	19	GNU_CONFIGURE= yes
21		20




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]*/

Return to bug 205960

Lines 16-29 Link Here

(-)lang/python33/Makefile (-3 / +1 lines)
16	DEPRECATED= No longer receives bug fixes, only security updates. Please update to Python 3.5	16	DEPRECATED= No longer receives bug fixes, only security updates. Please update to Python 3.5
17	EXPIRATION_DATE= 2017-09-01	17	EXPIRATION_DATE= 2017-09-01
18		18
19	USES= cpe ncurses pkgconfig readline tar:xz	19	USES= cpe ncurses pkgconfig readline ssl tar:xz
20	USE_OPENSSL= yes
21	USE_LDCONFIG= yes	20	USE_LDCONFIG= yes
22	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
23		22
24	CPE_VENDOR= python	23	CPE_VENDOR= python
25	CPE_PRODUCT= ${CPE_VENDOR}	24	CPE_PRODUCT= ${CPE_VENDOR}
26	CPE_VERSION= ${PORTVERSION}
27		25
28	CONFIGURE_ARGS+= --enable-shared	26	CONFIGURE_ARGS+= --enable-shared
29	CONFIGURE_ENV+= OPT="" # Null out OPT to respect user CFLAGS and remove optimizations	27	CONFIGURE_ENV+= OPT="" # Null out OPT to respect user CFLAGS and remove optimizations

Lines 13-26 Link Here

(-)lang/python34/Makefile (-3 / +1 lines)
13		13
14	LICENSE= PSFL	14	LICENSE= PSFL
15		15
16	USES= cpe ncurses pkgconfig readline tar:xz	16	USES= cpe ncurses pkgconfig readline ssl tar:xz
17	USE_OPENSSL= yes
18	USE_LDCONFIG= yes	17	USE_LDCONFIG= yes
19	GNU_CONFIGURE= yes	18	GNU_CONFIGURE= yes
20		19
21	CPE_VENDOR= python	20	CPE_VENDOR= python
22	CPE_PRODUCT= ${CPE_VENDOR}	21	CPE_PRODUCT= ${CPE_VENDOR}
23	CPE_VERSION= ${PORTVERSION}
24		22
25	DISABLED_EXTENSIONS= _sqlite3 _tkinter _gdbm	23	DISABLED_EXTENSIONS= _sqlite3 _tkinter _gdbm
26	CONFIGURE_ARGS+= --enable-shared --without-ensurepip	24	CONFIGURE_ARGS+= --enable-shared --without-ensurepip

Line 0 Link Here

(-)lang/python34/files/patch-issue24557 (+23 lines)
	1	http://bugs.python.org/issue24557
	2	assume egd unless OPENSSL_NO_EGD is defined-remove configure check
	3
	4	--- Modules/_ssl.c.orig 2016-06-25 21:52:32 UTC
	5	+++ Modules/_ssl.c
	6	@@ -3325,7 +3325,7 @@ Returns 1 if the OpenSSL PRNG has been s
	7	It is necessary to seed the PRNG with RAND_add() on some platforms before\n\
	8	using the ssl() function.");
	9
	10	-#ifdef HAVE_RAND_EGD
	11	+#ifndef OPENSSL_NO_EGD
	12	static PyObject *
	13	PySSL_RAND_egd(PyObject self, PyObject args)
	14	{
	15	@@ -3753,7 +3753,7 @@ static PyMethodDef PySSL_methods[] = {
	16	PySSL_RAND_bytes_doc},
	17	{"RAND_pseudo_bytes", PySSL_RAND_pseudo_bytes, METH_VARARGS,
	18	PySSL_RAND_pseudo_bytes_doc},
	19	-#ifdef HAVE_RAND_EGD
	20	+#ifndef OPENSSL_NO_EGD
	21	{"RAND_egd", PySSL_RAND_egd, METH_VARARGS,
	22	PySSL_RAND_egd_doc},
	23	#endif

Line 0 Link Here

(-)lang/python35/files/patch-issue24557 (+51 lines)
	1	http://bugs.python.org/issue24557
	2	https://hg.python.org/cpython/rev/fe168c2b5e95
	3
	4	assume egd unless OPENSSL_NO_EGD is defined-remove configure check
	5
	6	--- Modules/_ssl.c.orig 2015-12-07 01:39:10 UTC
	7	+++ Modules/_ssl.c
	8	@@ -3916,7 +3916,7 @@ _ssl_RAND_status_impl(PyModuleDef *modul
	9	return PyLong_FromLong(RAND_status());
	10	}
	11
	12	-#ifdef HAVE_RAND_EGD
	13	+#ifndef OPENSSL_NO_EGD
	14	/*[clinic input]
	15	_ssl.RAND_egd
	16	path: object(converter="PyUnicode_FSConverter")
	17	@@ -3942,7 +3942,7 @@ _ssl_RAND_egd_impl(PyModuleDef *module,
	18	}
	19	return PyLong_FromLong(bytes);
	20	}
	21	-#endif /* HAVE_RAND_EGD */
	22	+#endif /* OPENSSL_NO_EGD */
	23
	24
	25
	26	--- Modules/clinic/_ssl.c.h.orig 2015-12-07 01:39:10 UTC
	27	+++ Modules/clinic/_ssl.c.h
	28	@@ -893,7 +893,7 @@ _ssl_RAND_status(PyModuleDef module, PyObject Py_UNUSED(ignored))
	29	return _ssl_RAND_status_impl(module);
	30	}
	31
	32	-#if defined(HAVE_RAND_EGD)
	33	+#if !defined(OPENSSL_NO_EGD)
	34
	35	PyDoc_STRVAR(_ssl_RAND_egd__doc__,
	36	"RAND_egd($module, path, /)\n"
	37	@@ -924,7 +924,7 @@ _ssl_RAND_egd(PyModuleDef module, PyObject arg)
	38	return return_value;
	39	}
	40
	41	-#endif /* defined(HAVE_RAND_EGD) */
	42	+#endif /* !defined(OPENSSL_NO_EGD) */
	43
	44	PyDoc_STRVAR(_ssl_get_default_verify_paths__doc__,
	45	"get_default_verify_paths($module, /)\n"
	46	@@ -1102,4 +1102,4 @@ _ssl_enum_crls(PyModuleDef module, PyObject args, PyObject *kwargs)
	47	#ifndef _SSL_ENUM_CRLS_METHODDEF
	48	#define _SSL_ENUM_CRLS_METHODDEF
	49	#endif /* !defined(_SSL_ENUM_CRLS_METHODDEF) */
	50	-/[clinic end generated code: output=a14999cb565a69a2 input=a9049054013a1b77]/
	51	+/[clinic end generated code: output=abe795f14cb63b6a input=a9049054013a1b77]/