Attachment #165181 for bug #205960

Lines 28-33 Link Here

(-)lang/python35/Makefile (+2 lines)
28	PYTHON_VERSION= python${PYTHON_VER}	28	PYTHON_VERSION= python${PYTHON_VER}
29	PYTHON_SUFFIX= ${PYTHON_VER:S/.//g}	29	PYTHON_SUFFIX= ${PYTHON_VER:S/.//g}
30		30
		31	CFLAGS+= -I${OPENSSLINC}
		32
31	DISABLED_EXTENSIONS= _sqlite3 _tkinter _gdbm	33	DISABLED_EXTENSIONS= _sqlite3 _tkinter _gdbm
32	CONFIGURE_ARGS+= --enable-shared --without-ensurepip	34	CONFIGURE_ARGS+= --enable-shared --without-ensurepip
33	CONFIGURE_ENV+= OPT="" DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS}" # Null out OPT to respect user CFLAGS and remove optimizations	35	CONFIGURE_ENV+= OPT="" DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS}" # Null out OPT to respect user CFLAGS and remove optimizations




--- 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"

Return to bug 205960

Line 0 Link Here

(-)lang/python35/files/patch-Modules___ssl.c (+20 lines)
	1	--- Modules/_ssl.c.orig 2015-12-07 01:39:10 UTC
	2	+++ Modules/_ssl.c
	3	@@ -3916,7 +3916,7 @@ _ssl_RAND_status_impl(PyModuleDef *modul
	4	return PyLong_FromLong(RAND_status());
	5	}
	6
	7	-#ifdef HAVE_RAND_EGD
	8	+#ifndef OPENSSL_NO_EGD
	9	/*[clinic input]
	10	_ssl.RAND_egd
	11	path: object(converter="PyUnicode_FSConverter")
	12	@@ -3942,7 +3942,7 @@ _ssl_RAND_egd_impl(PyModuleDef *module,
	13	}
	14	return PyLong_FromLong(bytes);
	15	}
	16	-#endif /* HAVE_RAND_EGD */
	17	+#endif /* OPENSSL_NO_EGD */
	18
	19
	20

Line 0 Link Here

(-)lang/python35/files/patch-Modules_clinic___ssl.c.h (+20 lines)
	1	--- Modules/clinic/_ssl.c.h.orig 2015-12-07 01:39:10 UTC
	2	+++ Modules/clinic/_ssl.c.h
	3	@@ -893,7 +893,7 @@ _ssl_RAND_status(PyModuleDef *module, Py
	4	return _ssl_RAND_status_impl(module);
	5	}
	6
	7	-#if defined(HAVE_RAND_EGD)
	8	+#if !defined(OPENSSL_NO_EGD)
	9
	10	PyDoc_STRVAR(_ssl_RAND_egd__doc__,
	11	"RAND_egd($module, path, /)\n"
	12	@@ -924,7 +924,7 @@ exit:
	13	return return_value;
	14	}
	15
	16	-#endif /* defined(HAVE_RAND_EGD) */
	17	+#endif /* defined(OPENSSL_NO_EGD) */
	18
	19	PyDoc_STRVAR(_ssl_get_default_verify_paths__doc__,
	20	"get_default_verify_paths($module, /)\n"