Attachment 145517 Details for Bug 192511 – fix lang/python27 build with libressl

[patch] fix lang/python27 build with libressl

patch.txt (text/plain), 1.67 KB, created by meyer.arne83 on 2014-08-08 12:15:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: meyer.arne83

Created: 2014-08-08 12:15:03 UTC

Size: 1.67 KB

patch

obsolete

>diff -uNr /usr/ports/lang/python27.orig/Makefile /usr/ports/lang/python27/Makefile
>--- /usr/ports/lang/python27.orig/Makefile	2014-08-08 13:54:00.000000000 +0200
>+++ /usr/ports/lang/python27/Makefile	2014-08-08 13:54:48.000000000 +0200
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	python27
> PORTVERSION=	2.7.8
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	lang python ipv6
> MASTER_SITES=	PYTHON
> MASTER_SITE_SUBDIR=	ftp/python/${PORTVERSION}
>diff -uNr /usr/ports/lang/python27.orig/files/patch-Modules___ssl.c /usr/ports/lang/python27/files/patch-Modules___ssl.c
>--- /usr/ports/lang/python27.orig/files/patch-Modules___ssl.c	1970-01-01 01:00:00.000000000 +0100
>+++ /usr/ports/lang/python27/files/patch-Modules___ssl.c	2014-08-07 12:00:57.000000000 +0200
>@@ -0,0 +1,28 @@
>+--- ./Modules/_ssl.c.orig	2014-06-30 04:05:42.000000000 +0200
>++++ ./Modules/_ssl.c		2014-08-07 11:58:48.000000000 +0200
>+@@ -1604,20 +1604,11 @@
>+ static PyObject *
>+ PySSL_RAND_egd(PyObject *self, PyObject *arg)
>+ {
>+-    int bytes;
>+-
>+-    if (!PyString_Check(arg))
>+-        return PyErr_Format(PyExc_TypeError,
>+-                            "RAND_egd() expected string, found %s",
>+-                            Py_TYPE(arg)->tp_name);
>+-    bytes = RAND_egd(PyString_AS_STRING(arg));
>+-    if (bytes == -1) {
>+-        PyErr_SetString(PySSLErrorObject,
>+-                        "EGD connection failed or EGD did not return "
>+-                        "enough data to seed the PRNG");
>+-        return NULL;
>+-    }
>+-    return PyInt_FromLong(bytes);
>++ 
>++  PyErr_SetString(PySSLErrorObject,
>++		  "EGD connection failed or EGD did not return "
>++		  "enough data to seed the PRNG");
>++  return NULL;
>+ }
>+ 
>+ PyDoc_STRVAR(PySSL_RAND_egd_doc,

Actions: View | Diff

Attachments on bug 192511: 145517 | 149952 | 149974 | 149975 | 149976 | 149998 | 149999 | 150000 | 150909 | 150910 | 150944 | 151207 | 151208 | 153781 | 153782 | 153783 | 153820 | 153828 | 154266 | 154280 | 154281 | 154282 | 154283 | 154342 | 154344 | 154345 | 155432 | 157097 | 157316