From 30a216cb019db3d866e556cec566629a7fa0bf72 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Fri, 6 Oct 2017 07:59:57 +0200 Subject: [PATCH] python: Update from 3.6.2 to 3.6.3 --- packages/python/build.sh | 5 ++-- packages/python/posixmodule.c.patch | 51 ------------------------------------- 2 files changed, 2 insertions(+), 54 deletions(-) delete mode 100644 packages/python/posixmodule.c.patch diff --git a/packages/python/build.sh b/packages/python/build.sh index 9f7cbbc4..c7fec443 100644 --- a/packages/python/build.sh +++ b/packages/python/build.sh @@ -2,9 +2,8 @@ TERMUX_PKG_HOMEPAGE=https://python.org/ TERMUX_PKG_DESCRIPTION="Python 3 programming language intended to enable clear programs" TERMUX_PKG_DEPENDS="libandroid-support, ncurses, readline, libffi, openssl, libutil, libbz2, libsqlite, gdbm, ncurses-ui-libs, libcrypt, liblzma" _MAJOR_VERSION=3.6 -TERMUX_PKG_VERSION=${_MAJOR_VERSION}.2 -TERMUX_PKG_REVISION=2 -TERMUX_PKG_SHA256=9229773be41ed144370f47f0f626a1579931f5a390f1e8e3853174d52edd64a9 +TERMUX_PKG_VERSION=${_MAJOR_VERSION}.3 +TERMUX_PKG_SHA256=cda7d967c9a4bfa52337cdf551bcc5cff026b6ac50a8834e568ce4a794ca81da TERMUX_PKG_SRCURL=https://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/posixmodule.c.patch b/packages/python/posixmodule.c.patch deleted file mode 100644 index afbce08c..00000000 --- a/packages/python/posixmodule.c.patch +++ /dev/null @@ -1,51 +0,0 @@ -https://github.com/python/cpython/commit/50e86033de85294d87b7e942701d456342abde8e - -diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c -index e8c15a9473c..5c739180ea6 100644 ---- a/Modules/posixmodule.c -+++ b/Modules/posixmodule.c -@@ -1927,14 +1927,8 @@ _pystat_fromstructstat(STRUCT_STAT *st) - return NULL; - - PyStructSequence_SET_ITEM(v, 0, PyLong_FromLong((long)st->st_mode)); --#if defined(HAVE_LARGEFILE_SUPPORT) || defined(MS_WINDOWS) - Py_BUILD_ASSERT(sizeof(unsigned long long) >= sizeof(st->st_ino)); -- PyStructSequence_SET_ITEM(v, 1, -- PyLong_FromUnsignedLongLong(st->st_ino)); --#else -- Py_BUILD_ASSERT(sizeof(unsigned long) >= sizeof(st->st_ino)); -- PyStructSequence_SET_ITEM(v, 1, PyLong_FromUnsignedLong(st->st_ino)); --#endif -+ PyStructSequence_SET_ITEM(v, 1, PyLong_FromUnsignedLongLong(st->st_ino)); - #ifdef MS_WINDOWS - PyStructSequence_SET_ITEM(v, 2, PyLong_FromUnsignedLong(st->st_dev)); - #else -@@ -1948,12 +1942,8 @@ _pystat_fromstructstat(STRUCT_STAT *st) - PyStructSequence_SET_ITEM(v, 4, _PyLong_FromUid(st->st_uid)); - PyStructSequence_SET_ITEM(v, 5, _PyLong_FromGid(st->st_gid)); - #endif --#ifdef HAVE_LARGEFILE_SUPPORT -- PyStructSequence_SET_ITEM(v, 6, -- PyLong_FromLongLong((long long)st->st_size)); --#else -- PyStructSequence_SET_ITEM(v, 6, PyLong_FromLong(st->st_size)); --#endif -+ Py_BUILD_ASSERT(sizeof(long long) >= sizeof(st->st_size)); -+ PyStructSequence_SET_ITEM(v, 6, PyLong_FromLongLong(st->st_size)); - - #if defined(HAVE_STAT_TV_NSEC) - ansec = st->st_atim.tv_nsec; -@@ -11451,11 +11441,8 @@ os_DirEntry_inode_impl(DirEntry *self) - Py_BUILD_ASSERT(sizeof(unsigned long long) >= sizeof(self->win32_file_index)); - return PyLong_FromUnsignedLongLong(self->win32_file_index); - #else /* POSIX */ --#ifdef HAVE_LARGEFILE_SUPPORT -- return PyLong_FromLongLong((long long)self->d_ino); --#else -- return PyLong_FromLong((long)self->d_ino); --#endif -+ Py_BUILD_ASSERT(sizeof(unsigned long long) >= sizeof(self->d_ino)); -+ return PyLong_FromUnsignedLongLong(self->d_ino); - #endif - } - -- 2.11.0