python3: add patch from upstream preventing crashes in the ctypes module error formatting.

This commit is contained in:
Sam Hocevar
2015-05-15 18:47:35 +02:00
parent 8ba639b60a
commit 77459aa131
2 changed files with 36 additions and 0 deletions

View File

@@ -0,0 +1,33 @@
changeset: 95430:36eca0b259e2
branch: 3.4
parent: 95427:657ebef5b291
user: Serhiy Storchaka <storchaka@gmail.com>
date: Sat Apr 04 10:05:48 2015 +0300
files: Misc/ACKS Misc/NEWS Modules/_ctypes/_ctypes.c
description:
Issue #23338: Fixed formatting ctypes error messages on Cygwin.
Patch by Makoto Kato.
diff -r 657ebef5b291 -r 36eca0b259e2 Modules/_ctypes/_ctypes.c
--- a/Modules/_ctypes/_ctypes.c Sat Apr 04 09:47:31 2015 +0300
+++ b/Modules/_ctypes/_ctypes.c Sat Apr 04 10:05:48 2015 +0300
@@ -593,7 +593,7 @@
#ifdef __CYGWIN__
/* dlerror() isn't very helpful on cygwin */
PyErr_Format(PyExc_ValueError,
- "symbol '%s' not found (%s) ",
+ "symbol '%s' not found",
name);
#else
PyErr_SetString(PyExc_ValueError, ctypes_dlerror());
@@ -3279,7 +3279,7 @@
#ifdef __CYGWIN__
/* dlerror() isn't very helpful on cygwin */
PyErr_Format(PyExc_AttributeError,
- "function '%s' not found (%s) ",
+ "function '%s' not found",
name);
#else
PyErr_SetString(PyExc_AttributeError, ctypes_dlerror());

View File

@@ -31,6 +31,7 @@ source=(http://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz
013-3.4-select-cygwin.patch
014-3.4-signal-cygwin.patch
015-3.4-struct-cygwin.patch
016-3.4-ctypes-error-formatting.patch
025-MINGW-compiler-customize-mingw-cygwin-compilers.patch
900-msysize.patch
910-libffi-msys2.patch
@@ -51,6 +52,7 @@ sha1sums=('7ca5cd664598bea96eec105aa6453223bb6b4456'
'346183ac40b42b9baceb27d5f176989fa2ad2b4e'
'415a2d49249f298f9f399587ae2420f8234bb395'
'1166da89b56c68829884d65dd0d9a6be9bce40e7'
'099cf537471664801849ea5e36f91cbcb2f20e6a'
'd3e68ba2091f6b61f2440e2ef491373c68bf1d0d'
'02a0ff9456b62dda9de5b6bd2378367aba17b199'
'4a20a20b7dec2b9e9e87529d2e0347de9fcd6eb8'
@@ -76,6 +78,7 @@ prepare() {
patch -p1 -i ${srcdir}/013-3.4-select-cygwin.patch
patch -p1 -i ${srcdir}/014-3.4-signal-cygwin.patch
patch -p1 -i ${srcdir}/015-3.4-struct-cygwin.patch
patch -p1 -i ${srcdir}/016-3.4-ctypes-error-formatting.patch
patch -p1 -i ${srcdir}/025-MINGW-compiler-customize-mingw-cygwin-compilers.patch
patch -p1 -i ${srcdir}/900-msysize.patch
patch -p1 -i ${srcdir}/910-libffi-msys2.patch