diff --git a/srcpkgs/python3.4/patches/patch-Lib_ssl_py b/srcpkgs/python3.4/patches/patch-Lib_ssl_py deleted file mode 100644 index caf1b103ac..0000000000 --- a/srcpkgs/python3.4/patches/patch-Lib_ssl_py +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-Lib_ssl_py,v 1.1 2014/04/20 09:48:03 sthen Exp $ ---- Lib/ssl.py.orig Mon Mar 17 02:31:30 2014 -+++ Lib/ssl.py Sat Apr 19 19:30:04 2014 -@@ -106,7 +106,7 @@ from _ssl import CERT_NONE, CERT_OPTIONAL, CERT_REQUIR - from _ssl import (VERIFY_DEFAULT, VERIFY_CRL_CHECK_LEAF, VERIFY_CRL_CHECK_CHAIN, - VERIFY_X509_STRICT) - from _ssl import txt2obj as _txt2obj, nid2obj as _nid2obj --from _ssl import RAND_status, RAND_egd, RAND_add, RAND_bytes, RAND_pseudo_bytes -+from _ssl import RAND_status, RAND_add, RAND_bytes, RAND_pseudo_bytes - - def _import_symbols(prefix): - for n in dir(_ssl): diff --git a/srcpkgs/python3.4/patches/patch-Modules__ssl_c b/srcpkgs/python3.4/patches/patch-Modules__ssl_c deleted file mode 100644 index 241a9d66c5..0000000000 --- a/srcpkgs/python3.4/patches/patch-Modules__ssl_c +++ /dev/null @@ -1,47 +0,0 @@ -$OpenBSD: patch-Modules__ssl_c,v 1.1 2014/04/20 09:48:03 sthen Exp $ ---- Modules/_ssl.c.orig Mon Mar 17 02:31:31 2014 -+++ Modules/_ssl.c Sat Apr 19 19:29:29 2014 -@@ -3317,34 +3317,6 @@ Returns 1 if the OpenSSL PRNG has been seeded with eno - It is necessary to seed the PRNG with RAND_add() on some platforms before\n\ - using the ssl() function."); - --static PyObject * --PySSL_RAND_egd(PyObject *self, PyObject *args) --{ -- PyObject *path; -- int bytes; -- -- if (!PyArg_ParseTuple(args, "O&:RAND_egd", -- PyUnicode_FSConverter, &path)) -- return NULL; -- -- bytes = RAND_egd(PyBytes_AsString(path)); -- Py_DECREF(path); -- if (bytes == -1) { -- PyErr_SetString(PySSLErrorObject, -- "EGD connection failed or EGD did not return " -- "enough data to seed the PRNG"); -- return NULL; -- } -- return PyLong_FromLong(bytes); --} -- --PyDoc_STRVAR(PySSL_RAND_egd_doc, --"RAND_egd(path) -> bytes\n\ --\n\ --Queries the entropy gather daemon (EGD) on the socket named by 'path'.\n\ --Returns number of bytes read. Raises SSLError if connection to EGD\n\ --fails or if it does not provide enough data to seed PRNG."); -- - #endif /* HAVE_OPENSSL_RAND */ - - -@@ -3739,8 +3711,6 @@ static PyMethodDef PySSL_methods[] = { - PySSL_RAND_bytes_doc}, - {"RAND_pseudo_bytes", PySSL_RAND_pseudo_bytes, METH_VARARGS, - PySSL_RAND_pseudo_bytes_doc}, -- {"RAND_egd", PySSL_RAND_egd, METH_VARARGS, -- PySSL_RAND_egd_doc}, - {"RAND_status", (PyCFunction)PySSL_RAND_status, METH_NOARGS, - PySSL_RAND_status_doc}, - #endif diff --git a/srcpkgs/python3.4/template b/srcpkgs/python3.4/template index 3a4a163aed..228a830891 100644 --- a/srcpkgs/python3.4/template +++ b/srcpkgs/python3.4/template @@ -1,14 +1,14 @@ # Template file for 'python3.4' pkgname=python3.4 -version=3.4.2 -revision=3 +version=3.4.3 +revision=1 wrksrc="Python-${version}" short_desc="Interpreted, interactive, object-oriented programming language (${version%.*} series)" maintainer="Juan RP " homepage="http://www.python.org" license="PSF" distfiles="http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz" -checksum=1c6d9682d145c056537e477bbfa060ce727f9edd38df1827e0f970dcf04b2def +checksum=b5b3963533768d5fc325a4d7a6bd6f666726002d696f1d399ec06b043ea996b8 pycompile_version="3.4" pycompile_dirs="usr/lib/python3.4" @@ -24,7 +24,6 @@ pre_configure() { rm -r Modules/expat rm -r Modules/_ctypes/{darwin,libffi}* } - do_configure() { local _args unset GCC CC CXX CPP LD AR AS RANLIB @@ -42,18 +41,14 @@ do_configure() { ./configure ${configure_args} ${_args} \ --with-threads --enable-ipv6 --with-signal-module \ --with-system-ffi --with-system-expat \ - --enable-shared --without-ensurepip \ - ac_cv_file__dev_ptc=no ac_cv_file__dev_ptmx=yes \ - ac_cv_have_long_long_format=yes + --enable-shared --without-ensurepip } - do_build() { # Avoid invoking pgen for cross-compiles. touch Include/graminit.h Python/graminit.c export PATH="$PATH:$wrksrc/hostpython" make ${makejobs} } - do_install() { export PATH="$PATH:$wrksrc/hostpython" make DESTDIR=${DESTDIR} install maninstall @@ -89,7 +84,6 @@ python3.4-devel_package() { ${DESTDIR}/usr/include/python${version%.*}m } } - python3.4-tkinter_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - GUI toolkit for Python${version%.*}" @@ -100,7 +94,6 @@ python3.4-tkinter_package() { vmove usr/lib/python${version%.*}/lib-dynload/_tkinter.cpython-34m.so } } - idle-python3.4_package() { depends="${sourcepkg}>=${version}_${revision} python3.4-tkinter" short_desc+=" - IDE for Python${version%.*} using Tkinter"