diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2018-11-17 10:18:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-17 10:18:17 +0200 |
| commit | 8c963ff811cab22ba6ff311afa2ee77d4c48c6c7 (patch) | |
| tree | 3b0314836e7e9f369e564ae091154ff51b826faa | |
| parent | a99515d272987bcfb8f363fcb8a3a0f306b75c71 (diff) | |
| parent | 5bc39702fb8c4ac986d39c51b75d5c5cc3da4ac9 (diff) | |
Merge pull request #7446 from commodo/python-fix-ssl-build
python: fix build with OpenSSL 1.1.0
| -rw-r--r-- | lang/python/python/Makefile | 2 | ||||
| -rw-r--r-- | lang/python/python/patches/011-fix-ssl-build-use-have-npn.patch | 22 |
2 files changed, 23 insertions, 1 deletions
diff --git a/lang/python/python/Makefile b/lang/python/python/Makefile index 766a57b97..4a00bfa0f 100644 --- a/lang/python/python/Makefile +++ b/lang/python/python/Makefile @@ -12,7 +12,7 @@ include ../python-version.mk PKG_NAME:=python PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO) -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://www.python.org/ftp/python/$(PKG_VERSION) diff --git a/lang/python/python/patches/011-fix-ssl-build-use-have-npn.patch b/lang/python/python/patches/011-fix-ssl-build-use-have-npn.patch new file mode 100644 index 000000000..b49818360 --- /dev/null +++ b/lang/python/python/patches/011-fix-ssl-build-use-have-npn.patch @@ -0,0 +1,22 @@ +diff --git a/Modules/_ssl.c b/Modules/_ssl.c +index a96c419260..c80437eef7 100644 +--- a/Modules/_ssl.c ++++ b/Modules/_ssl.c +@@ -1586,7 +1586,7 @@ static PyObject *PySSL_version(PySSLSocket *self) + return PyUnicode_FromString(version); + } + +-#if defined(OPENSSL_NPN_NEGOTIATED) && !defined(OPENSSL_NO_NEXTPROTONEG) ++#if HAVE_NPN + static PyObject *PySSL_selected_npn_protocol(PySSLSocket *self) { + const unsigned char *out; + unsigned int outlen; +@@ -2114,7 +2114,7 @@ static PyMethodDef PySSLMethods[] = { + PySSL_peercert_doc}, + {"cipher", (PyCFunction)PySSL_cipher, METH_NOARGS}, + {"version", (PyCFunction)PySSL_version, METH_NOARGS}, +-#ifdef OPENSSL_NPN_NEGOTIATED ++#if HAVE_NPN + {"selected_npn_protocol", (PyCFunction)PySSL_selected_npn_protocol, METH_NOARGS}, + #endif + #if HAVE_ALPN |