From: Fredrik Fornwall Date: Mon, 4 Jul 2016 21:22:12 +0000 (-0400) Subject: python: Update from 3.5.1 to 3.5.2 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/termux-packages/commitdiff_plain/e229609ba1ca7a996e19795d917555be0790d402?ds=inline python: Update from 3.5.1 to 3.5.2 The local fileutils.c patch can now be removed as it has been merged upstream: https://github.com/python/cpython/commit/35003947f3c3589ea8555ae68a8c28a5653de06c --- diff --git a/packages/python/build.sh b/packages/python/build.sh index 6407dd55..7714afbe 100644 --- a/packages/python/build.sh +++ b/packages/python/build.sh @@ -8,8 +8,7 @@ TERMUX_PKG_DEPENDS="libandroid-support, ncurses, readline, libffi, openssl, libu TERMUX_PKG_HOSTBUILD=true _MAJOR_VERSION=3.5 -TERMUX_PKG_VERSION=${_MAJOR_VERSION}.1 -TERMUX_PKG_BUILD_REVISION=8 +TERMUX_PKG_VERSION=${_MAJOR_VERSION}.2 TERMUX_PKG_SRCURL=http://www.python.org/ftp/python/${TERMUX_PKG_VERSION}/Python-${TERMUX_PKG_VERSION}.tar.xz # The flag --with(out)-pymalloc (disable/enable specialized mallocs) is enabled by default and causes m suffix versions of python. diff --git a/packages/python/fileutils.c.patch b/packages/python/fileutils.c.patch deleted file mode 100644 index 262a0081..00000000 --- a/packages/python/fileutils.c.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -u -r ../Python-3.5.1/Python/fileutils.c ./Python/fileutils.c ---- ../Python-3.5.1/Python/fileutils.c 2015-12-06 20:39:11.000000000 -0500 -+++ ./Python/fileutils.c 2016-05-18 19:46:49.466741203 -0400 -@@ -856,7 +856,7 @@ - return 0; - } - -- if (errno != ENOTTY) { -+ if (errno != ENOTTY && errno != EACCES) { - if (raise) - PyErr_SetFromErrno(PyExc_OSError); - return -1; -@@ -865,7 +865,9 @@ - /* Issue #22258: Here, ENOTTY means "Inappropriate ioctl for - device". The ioctl is declared but not supported by the kernel. - Remember that ioctl() doesn't work. It is the case on -- Illumos-based OS for example. */ -+ Illumos-based OS for example. -+ EACCES may be the result of an SELinux policy disabling -+ ioctl on sockets. This is the case on Android. */ - ioctl_works = 0; - } - /* fallback to fcntl() if ioctl() does not work */