Ticket #13319: python-2.7.3.p3.diff

File python-2.7.3.p3.diff, 4.5 KB (added by jpflori, 9 years ago)

spkg diff, for review only

  • SPKG.txt

    diff --git a/SPKG.txt b/SPKG.txt
    a b  
    6060 * sys_path_security.patch: ensure that the current working directory
    6161   or the script directory is prepended to sys.path only if there is no
    6262   security risk in doing so.
     63 * io-issue_14437.patch: Fixes Python issue #14437 (building _io on Cygwin)
     64 * ncurses-issue_9665.patch: Fixes Python issue #9665 (by patching configure
     65   and configure.in after running autotools)
     66 * ncurses-issue_14438.patch: Fixes Python issue #14438 (ncurses)
    6367
    6468== Changelog ==
    6569
     70=== python-2.7.3.p3 (Jean-Pierre Flori, Karl-Dieter Crisman, 4 December 2012) ===
     71 * Trac #13319: let Python build on Cygwin.
     72 * Includes fixes from Python issues #9665, #14437, #14438.
     73 * Jeroen's autotools was run in order to update the configure script.
     74
    6675=== python-2.7.3.p2 (Jeroen Demeyer, 29 October 2012) ===
    6776 * Trac #13631: Keep in mind umask when checking security of "python -c"
    6877
  • patches/Lib.distutils.command.sdist.patch

    diff --git a/patches/Lib.distutils.command.sdist.patch b/patches/Lib.distutils.command.sdist.patch
    a b  
    11--- src/Lib/distutils/command/sdist.py.orig     2011-05-20 15:24:44.936515549 +1200
    22+++ src/Lib/distutils/command/sdist.py  2011-05-20 15:25:54.920519189 +1200
    3 @@ -324,7 +324,7 @@
     3@@ -336,7 +336,7 @@
    44           * the build tree (typically "build")
    55           * the release tree itself (only an issue if we ran "sdist"
    66             previously with --keep-temp, or it aborted)
     
    99         """
    1010         build = self.get_finalized_command('build')
    1111         base_dir = self.distribution.get_fullname()
    12 @@ -339,7 +339,7 @@
     12@@ -351,7 +351,7 @@
    1313         else:
    1414             seps = '/'
    1515 
  • new file patches/io-issue_14437.patch

    diff --git a/patches/io-issue_14437.patch b/patches/io-issue_14437.patch
    new file mode 100644
    - +  
     1diff -ur src.orig/Misc/NEWS src/Misc/NEWS
     2--- src.orig/Misc/NEWS  2012-08-01 10:51:33.927830611 +0200
     3+++ src/Misc/NEWS       2012-08-01 10:58:44.139814595 +0200
     4@@ -12,6 +12,11 @@
     5 - Issue #6884: Fix long-standing bugs with MANIFEST.in parsing in distutils
     6   on Windows.
     7 
     8+Build
     9+-----
     10+
     11+- Issue #14437: Fix building the _io module under Cygwin.
     12+
     13 
     14 What's New in Python 2.7.3 release candidate 2?
     15 ===============================================
     16Seulement dans src/Misc: NEWS.orig
     17diff -ur src.orig/Modules/_io/_iomodule.h src/Modules/_io/_iomodule.h
     18--- src.orig/Modules/_io/_iomodule.h    2012-08-01 10:51:36.487830516 +0200
     19+++ src/Modules/_io/_iomodule.h 2012-08-01 10:58:44.151814610 +0200
     20@@ -72,7 +72,7 @@
     21     PyObject *filename; /* Not used, but part of the IOError object */
     22     Py_ssize_t written;
     23 } PyBlockingIOErrorObject;
     24-PyAPI_DATA(PyObject *) PyExc_BlockingIOError;
     25+extern PyObject *PyExc_BlockingIOError;
     26 
     27 /*
     28  * Offset type for positioning.
  • new file patches/ncurses-issue_14438.patch

    diff --git a/patches/ncurses-issue_14438.patch b/patches/ncurses-issue_14438.patch
    new file mode 100644
    - +  
     1diff -ur src.orig/Include/py_curses.h src/Include/py_curses.h
     2--- src.orig/Include/py_curses.h        2012-08-01 10:51:27.075830866 +0200
     3+++ src/Include/py_curses.h     2012-08-01 11:01:05.311809409 +0200
     4@@ -17,6 +17,13 @@
     5 #define NCURSES_OPAQUE 0
     6 #endif /* __APPLE__ */
     7 
     8+#ifdef __CYGWIN__
     9+/* the following define is necessary for Cygwin; without it, the
     10+   Cygwin-supplied ncurses.h sets NCURSES_OPAQUE to 1, and then Python
     11+   can't get at the WINDOW flags field. */
     12+#define NCURSES_INTERNALS
     13+#endif /* __CYGWIN__ */
     14+
     15 #ifdef __FreeBSD__
     16 /*
     17 ** On FreeBSD, [n]curses.h and stdlib.h/wchar.h use different guards
     18Seulement dans src/Include: py_curses.h.orig
  • new file patches/ncurses-issue_9665.patch

    diff --git a/patches/ncurses-issue_9665.patch b/patches/ncurses-issue_9665.patch
    new file mode 100644
    - +  
     1diff -ur src.orig/configure.in src/configure.in
     2--- src.orig/configure.in       2012-09-30 19:16:16.208133911 +0200
     3+++ src/configure.in    2012-09-30 19:15:12.800599068 +0200
     4@@ -1113,6 +1113,9 @@
     5        OSF*)
     6            BASECFLAGS="$BASECFLAGS -mieee"
     7            ;;
     8+       CYGWIN*)
     9+           BASECFLAGS="-I/usr/include/ncurses $BASECFLAGS"
     10+           ;;
     11     esac
     12     ;;
     13
     14diff -ur src.orig/configure src/configure
     15--- src.orig/configure  2012-09-30 19:16:16.216133852 +0200
     16+++ src/configure       2012-09-30 19:15:44.876363826 +0200
     17@@ -5613,6 +5613,9 @@
     18        OSF*)
     19            BASECFLAGS="$BASECFLAGS -mieee"
     20            ;;
     21+       CYGWIN*)
     22+           BASECFLAGS="-I/usr/include/ncurses $BASECFLAGS"
     23+           ;;
     24     esac
     25     ;;
     26