- Update to 5.7.

7 files changed, 12 insertions, 20 deletions

diff --git a/math/sage/files/spkg-patch-fflas_ffpack_-_src_fflas-ffpack-config.in b/math/sage/files/spkg-patch-fflas_ffpack_-_src_fflas-ffpack-config.in
deleted file mode 100644
index 8e4311b1cf85..000000000000
--- a/math/sage/files/spkg-patch-fflas_ffpack_-_src_fflas-ffpack-config.in
+++ /dev/null
@@ -1,8 +0,0 @@
---- fflas_ffpack-1.6.0/src/fflas-ffpack-config.in-orig	2012-09-14 02:43:35.000000000 +0000
-+++ fflas_ffpack-1.6.0//src/fflas-ffpack-config.in	2012-09-14 02:43:58.000000000 +0000
-@@ -1,4 +1,4 @@
--#! /bin/bash
-+#!/usr/bin/env bash
- # Coypright (c) 2011 FFLAS-FFPACK
- # written by BB <bboyer@imag.fr>
- # adapted from LinBox configuration
diff --git a/math/sage/files/spkg-patch-python_-_src_Doc_library_fcntl.rst b/math/sage/files/spkg-patch-python_-_src_Doc_library_fcntl.rst
index 2b8f757e927c..5c7f4bd46a5f 100644
--- a/math/sage/files/spkg-patch-python_-_src_Doc_library_fcntl.rst
+++ b/math/sage/files/spkg-patch-python_-_src_Doc_library_fcntl.rst
@@ -1,5 +1,5 @@
 --- python-2.7.3.p0/src/Doc/library/fcntl.rst.orig	2011-06-11 15:46:23.000000000 +0000
-+++ python-2.7.3.p3/src/Doc/library/fcntl.rst	2012-04-22 00:31:48.000000000 +0000
++++ python-2.7.3.p5/src/Doc/library/fcntl.rst	2012-04-22 00:31:48.000000000 +0000
 @@ -50,8 +50,6 @@
     operations are typically defined in the library module :mod:`termios` and the
     argument handling is even more complicated.
diff --git a/math/sage/files/spkg-patch-python_-_src_Modules__ctypes_libffi_configure b/math/sage/files/spkg-patch-python_-_src_Modules__ctypes_libffi_configure
index 7fe3fec516e6..cca0cfeeae09 100644
--- a/math/sage/files/spkg-patch-python_-_src_Modules__ctypes_libffi_configure
+++ b/math/sage/files/spkg-patch-python_-_src_Modules__ctypes_libffi_configure
@@ -1,5 +1,5 @@
 --- python-2.7.3.p0/src/Modules/_ctypes/libffi/configure.orig	2011-06-11 15:46:26.000000000 +0000
-+++ python-2.7.3.p3/src/Modules/_ctypes/libffi/configure	2012-04-22 00:23:14.000000000 +0000
++++ python-2.7.3.p5/src/Modules/_ctypes/libffi/configure	2012-04-22 00:23:14.000000000 +0000
 @@ -6289,7 +6289,7 @@
    rm -rf conftest*
    ;;
diff --git a/math/sage/files/spkg-patch-python_-_src_Modules_fcntlmodule.c b/math/sage/files/spkg-patch-python_-_src_Modules_fcntlmodule.c
index 490055b1a15d..5b1646f3b981 100644
--- a/math/sage/files/spkg-patch-python_-_src_Modules_fcntlmodule.c
+++ b/math/sage/files/spkg-patch-python_-_src_Modules_fcntlmodule.c
@@ -1,5 +1,5 @@
 --- python-2.7.3.p0/src/Modules/fcntlmodule.c.orig	2011-06-11 15:46:27.000000000 +0000
-+++ python-2.7.3.p3/src/Modules/fcntlmodule.c	2012-04-22 00:23:34.000000000 +0000
++++ python-2.7.3.p5/src/Modules/fcntlmodule.c	2012-04-22 00:23:34.000000000 +0000
 @@ -97,20 +97,15 @@
  {
  #define IOCTL_BUFSZ 1024
diff --git a/math/sage/files/spkg-patch-python_-_src_Python_thread_pthread.h b/math/sage/files/spkg-patch-python_-_src_Python_thread_pthread.h
index 876bfceba859..2b30d7a97085 100644
--- a/math/sage/files/spkg-patch-python_-_src_Python_thread_pthread.h
+++ b/math/sage/files/spkg-patch-python_-_src_Python_thread_pthread.h
@@ -1,5 +1,5 @@
 --- python-2.7.3.p0/src/Python/thread_pthread.h.orig	2011-06-11 15:46:28.000000000 +0000
-+++ python-2.7.3.p3/src/Python/thread_pthread.h	2012-04-22 00:23:46.000000000 +0000
++++ python-2.7.3.p5/src/Python/thread_pthread.h	2012-04-22 00:23:46.000000000 +0000
 @@ -38,13 +38,18 @@
  #endif
  #endif
diff --git a/math/sage/files/spkg-patch-python_-_src_setup.py b/math/sage/files/spkg-patch-python_-_src_setup.py
index b3c410720b44..7f1f682d4c4f 100644
--- a/math/sage/files/spkg-patch-python_-_src_setup.py
+++ b/math/sage/files/spkg-patch-python_-_src_setup.py
@@ -1,5 +1,5 @@
 --- python-2.7.3.p0/src/setup.py-orig	2012-04-22 00:04:08.000000000 +0000
-+++ python-2.7.3.p3/src/setup.py	2012-04-22 00:10:25.000000000 +0000
++++ python-2.7.3.p5/src/setup.py	2012-04-22 00:10:25.000000000 +0000
 @@ -1432,10 +1432,24 @@
              macros = dict()
              libraries = []
diff --git a/math/sage/files/spkg-patch-sage_-_sage_misc_getusage.py b/math/sage/files/spkg-patch-sage_-_sage_misc_getusage.py
index bfe855eba413..4d5dd2f9a8bf 100644
--- a/math/sage/files/spkg-patch-sage_-_sage_misc_getusage.py
+++ b/math/sage/files/spkg-patch-sage_-_sage_misc_getusage.py
@@ -1,5 +1,5 @@
---- sage-5.0.beta13/sage/misc/getusage.py-orig	2012-04-11 00:14:47.000000000 +0000
-+++ sage-5.6/sage/misc/getusage.py	2012-04-11 00:47:03.000000000 +0000
+--- sage-5.7.beta4/sage/misc/getusage.py-old	2013-02-09 23:05:24.000000000 +0000
++++ sage-5.7/sage/misc/getusage.py	2013-02-09 23:09:50.000000000 +0000
 @@ -20,6 +20,8 @@
      """
      Return the 'top' or 'prstat' line that contains this running Sage
@@ -9,16 +9,16 @@
  
      OUTPUT:
  
-@@ -53,6 +55,8 @@
-         cmd = 'top -l 1 |grep "^ *%s "' % pid
-     elif U == 'sunos':
+@@ -55,6 +57,8 @@
          cmd = '/usr/bin/prstat -n 100000 1 1  | grep "^ *%s "' % pid
+     elif U[:6] == 'cygwin':
+         cmd = 'top -b -n 1 -p %s' % pid
 +    elif U == 'freebsd':
 +        cmd = 'ps -axwww -o pid,user,vsz,rss,state,pri,nice,time,cpu,comm | grep "^ *%s "' % pid
      else:
          raise NotImplementedError("top not implemented on platform %s" % U)
      
-@@ -83,6 +87,9 @@
+@@ -85,6 +89,9 @@
        usage, ``prstat`` will output the data in KB, MB or GB. In each
        case, the value returned by this function will always be in MB.
  
@@ -28,7 +28,7 @@
      - ``other`` - not implemented for any other operating systems
  
      EXAMPLES::
-@@ -129,6 +136,9 @@
+@@ -131,6 +138,9 @@
              m = float(memory_in_KB_MB_or_GB.strip("M"))
          elif memory_in_KB_MB_or_GB.endswith("G"):
              m = float(memory_in_KB_MB_or_GB.strip("G")) * 1024