chiark / gitweb /
python: Bump build revision after ioctl fix
authorFredrik Fornwall <fredrik@fornwall.net>
Thu, 19 May 2016 00:03:21 +0000 (20:03 -0400)
committerFredrik Fornwall <fredrik@fornwall.net>
Thu, 19 May 2016 00:03:21 +0000 (20:03 -0400)
packages/python/build.sh
packages/python/fileutils.c.patch

index f0377867268ce4ade8cb139810a75503d158d9c2..390c8a798e7a166ba1c7363c5020307e5a91a5a6 100644 (file)
@@ -9,7 +9,7 @@ TERMUX_PKG_HOSTBUILD=true
 
 _MAJOR_VERSION=3.5
 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.1
-TERMUX_PKG_BUILD_REVISION=5
+TERMUX_PKG_BUILD_REVISION=6
 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.
index 0464f2a7be382ec3479fd12c7cf91e7b14c35bb2..262a008193f055b21261a4c1995219a0e6518f8d 100644 (file)
@@ -1,5 +1,6 @@
---- Python-3.5.1/Python/fileutils.c    2015-12-07 02:39:11.000000000 +0100
-+++ src/Python/fileutils.c     2016-05-17 21:46:09.006285776 +0200
+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;
          }
@@ -9,3 +10,14 @@
              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 */