Attachment #172191 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=	${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

Return to bug 205960

Lines 13-26 Link Here

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

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