Attachment #172190 for bug #205960

View | Details | Raw Unified | Return to bug 205960 | Differences between
Collapse All | Expand All





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=	${DISTVERSION}

# Duplicate python.mk variables. TODO: Let lang/python?? ports use python.mk bits.
PYTHON_VER=		${PYTHON_PORTVERSION:R}




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 14-27 Link Here

(-)Makefile (-3 / +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
22	CPE_VENDOR= python	21	CPE_VENDOR= python
23	CPE_PRODUCT= ${CPE_VENDOR}	22	CPE_PRODUCT= ${CPE_VENDOR}
24	CPE_VERSION= ${DISTVERSION}
25		23
26	# Duplicate python.mk variables. TODO: Let lang/python?? ports use python.mk bits.	24	# Duplicate python.mk variables. TODO: Let lang/python?? ports use python.mk bits.
27	PYTHON_VER= ${PYTHON_PORTVERSION:R}	25	PYTHON_VER= ${PYTHON_PORTVERSION:R}

Line 0 Link Here

(-)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]/