Initial import of CentoOS 6 package

Author: hroncok

CVE-2013-1752.patch

@@ -0,0 +1,35 @@
+diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
+--- a/Lib/test/test_socket.py
++++ b/Lib/test/test_socket.py
+@@ -1620,6 +1620,16 @@ class BufferIOTest(SocketConnectedTest):
+ 
+     _testRecvFromIntoMemoryview = _testRecvFromIntoArray
+ 
++    def testRecvFromIntoSmallBuffer(self):
++        # See issue #20246.
++        buf = bytearray(8)
++        self.assertRaises(ValueError, self.cli_conn.recvfrom_into, buf, 1024)
++
++    def _testRecvFromIntoSmallBuffer(self):
++        with test_support.check_py3k_warnings():
++            buf = buffer(MSG*2048)
++        self.serv_conn.send(buf)
++
+ 
+ TIPC_STYPE = 2000
+ TIPC_LOWER = 200
+diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
+--- a/Modules/socketmodule.c
++++ b/Modules/socketmodule.c
+@@ -2742,6 +2742,10 @@ sock_recvfrom_into(PySocketSockObject *s
+     if (recvlen == 0) {
+         /* If nbytes was not specified, use the buffer's length */
+         recvlen = buflen;
++    } else if (recvlen > buflen) {
++        PyErr_SetString(PyExc_ValueError,
++                        "nbytes is greater than the length of the buffer");
++        return NULL;
+     }
+ 
+     readlen = sock_recvfrom_guts(s, buf.buf, recvlen, flags, &addr);
+

CVE-2014-1912.patch

@@ -0,0 +1,35 @@
+
+# HG changeset patch
+# User Benjamin Peterson <benjamin@python.org>
+# Date 1402796189 25200
+# Node ID b4bab078876811c7d95231d08aa6fa7142fdda66
+# Parent  bb8b0c7fefd0c5ed99b3f336178a4f9554a1d0ef
+url unquote the path before checking if it refers to a CGI script (closes #21766)
+
+diff --git a/Lib/CGIHTTPServer.py b/Lib/CGIHTTPServer.py
+--- a/Lib/CGIHTTPServer.py
++++ b/Lib/CGIHTTPServer.py
+@@ -84,7 +84,7 @@ class CGIHTTPRequestHandler(SimpleHTTPSe
+         path begins with one of the strings in self.cgi_directories
+         (and the next character is a '/' or the end of the string).
+         """
+-        splitpath = _url_collapse_path_split(self.path)
++        splitpath = _url_collapse_path_split(urllib.unquote(self.path))
+         if splitpath[0] in self.cgi_directories:
+             self.cgi_info = splitpath
+             return True
+diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py
+--- a/Lib/test/test_httpservers.py
++++ b/Lib/test/test_httpservers.py
+@@ -510,6 +510,11 @@ class CGIHTTPServerTestCase(BaseTestCase
+                 (res.read(), res.getheader('Content-type'), res.status))
+         self.assertEqual(os.environ['SERVER_SOFTWARE'], signature)
+ 
++    def test_urlquote_decoding_in_cgi_check(self):
++        res = self.request('/cgi-bin%2ffile1.py')
++        self.assertEqual((b'Hello World\n', 'text/html', 200),
++                (res.read(), res.getheader('Content-type'), res.status))
++
+ 
+ class SimpleHTTPRequestHandlerTestCase(unittest.TestCase):
+     """ Test url parsing """

CVE-2014-4650.patch

@@ -0,0 +1,35 @@
+diff --git a/Lib/test/test_buffer.py b/Lib/test/test_buffer.py
+--- a/Lib/test/test_buffer.py
++++ b/Lib/test/test_buffer.py
+@@ -4,6 +4,7 @@ For now, tests just new or changed funct
+ 
+ """
+ 
++import sys
+ import unittest
+ from test import test_support
+ 
+@@ -29,6 +30,11 @@ class BufferTests(unittest.TestCase):
+         m = memoryview(b) # Should not raise an exception
+         self.assertEqual(m.tobytes(), s)
+ 
++    def test_large_buffer_size_and_offset(self):
++        data = bytearray('hola mundo')
++        buf = buffer(data, sys.maxsize, sys.maxsize)
++        self.assertEqual(buf[:4096], "")
++
+ 
+ def test_main():
+     with test_support.check_py3k_warnings(("buffer.. not supported",
+diff --git a/Objects/bufferobject.c b/Objects/bufferobject.c
+--- a/Objects/bufferobject.c
++++ b/Objects/bufferobject.c
+@@ -88,7 +88,7 @@ get_buf(PyBufferObject *self, void **ptr
+             *size = count;
+         else
+             *size = self->b_size;
+-        if (offset + *size > count)
++        if (*size > count - offset)
+             *size = count - offset;
+     }
+     return 1;

CVE-2014-7185.patch

@@ -0,0 +1,37 @@
+--- Python-2.2.1/Lib/pydoc.py.nogui	2002-07-08 18:32:47.000000000 -0400
++++ Python-2.2.1/Lib/pydoc.py	2002-07-08 18:33:37.000000000 -0400
+@@ -18,9 +18,6 @@
+ Run "pydoc -p <port>" to start an HTTP server on a given port on the
+ local machine to generate documentation web pages.
+ 
+-For platforms without a command line, "pydoc -g" starts the HTTP server
+-and also pops up a little window for controlling it.
+-
+ Run "pydoc -w <name>" to write out the HTML documentation for a module
+ to a file named "<name>.html".
+ """
+@@ -2043,9 +2040,6 @@
+         writing = 0
+ 
+         for opt, val in opts:
+-            if opt == '-g':
+-                gui()
+-                return
+             if opt == '-k':
+                 apropos(val)
+                 return
+@@ -2099,13 +2093,10 @@
+ %s -p <port>
+     Start an HTTP server on the given port on the local machine.
+ 
+-%s -g
+-    Pop up a graphical interface for finding and serving documentation.
+-
+ %s -w <name> ...
+     Write out the HTML documentation for a module to a file in the current
+     directory.  If <name> contains a '%s', it is treated as a filename; if
+     it names a directory, documentation is written for all the contents.
+-""" % (cmd, os.sep, cmd, cmd, cmd, cmd, os.sep)
++""" % (cmd, os.sep, cmd, cmd, cmd, os.sep)
+ 
+  if __name__ == '__main__': cli()

Python-2.2.1-pydocnogui.patch

@@ -0,0 +1,131 @@
+diff -up Python-2.6.6/configure.in.disable-pymalloc-on-valgrind Python-2.6.6/configure.in
+--- Python-2.6.6/configure.in.disable-pymalloc-on-valgrind	2010-11-29 15:45:07.199350502 -0500
++++ Python-2.6.6/configure.in	2010-11-29 15:45:07.208351260 -0500
+@@ -2538,6 +2538,19 @@ then
+ fi
+ AC_MSG_RESULT($with_pymalloc)
+ 
++# Check for Valgrind support
++AC_MSG_CHECKING([for --with-valgrind])
++AC_ARG_WITH([valgrind],
++  AC_HELP_STRING([--with-valgrind], [Enable Valgrind support]),,
++  with_valgrind=no)
++AC_MSG_RESULT([$with_valgrind])
++if test "$with_valgrind" != no; then
++    AC_CHECK_HEADER([valgrind/valgrind.h],
++      [AC_DEFINE([WITH_VALGRIND], 1, [Define if you want pymalloc to be disabled when running under valgrind])],
++      [AC_MSG_ERROR([Valgrind support requested but headers not available])]
++    )
++fi
++
+ # Check for --with-wctype-functions
+ AC_MSG_CHECKING(for --with-wctype-functions)
+ AC_ARG_WITH(wctype-functions, 
+diff -up Python-2.6.6/Misc/NEWS.disable-pymalloc-on-valgrind Python-2.6.6/Misc/NEWS
+--- Python-2.6.6/Misc/NEWS.disable-pymalloc-on-valgrind	2010-08-23 19:37:56.000000000 -0400
++++ Python-2.6.6/Misc/NEWS	2010-11-29 15:45:07.209350567 -0500
+@@ -21,6 +21,11 @@ What's New in Python 2.6.6 rc 2?
+ 
+ *Release date: 2010-08-16*
+ 
++- Issue #2422: When compiled with the ``--with-valgrind`` option, the
++  pymalloc allocator will be automatically disabled when running under
++  Valgrind.  This gives improved memory leak detection when running
++  under Valgrind, while taking advantage of pymalloc at other times.
++
+ Library
+ -------
+ 
+diff -up Python-2.6.6/Objects/obmalloc.c.disable-pymalloc-on-valgrind Python-2.6.6/Objects/obmalloc.c
+--- Python-2.6.6/Objects/obmalloc.c.disable-pymalloc-on-valgrind	2010-05-09 11:15:40.000000000 -0400
++++ Python-2.6.6/Objects/obmalloc.c	2010-11-29 15:45:07.209350567 -0500
+@@ -2,6 +2,21 @@
+ 
+ #ifdef WITH_PYMALLOC
+ 
++#ifdef WITH_VALGRIND
++#include <valgrind/valgrind.h>
++
++/* If we're using GCC, use __builtin_expect() to reduce overhead of
++   the valgrind checks */
++#if defined(__GNUC__) && (__GNUC__ > 2) && defined(__OPTIMIZE__)
++#  define UNLIKELY(value) __builtin_expect((value), 0)
++#else
++#  define UNLIKELY(value) (value)
++#endif
++
++/* -1 indicates that we haven't checked that we're running on valgrind yet. */
++static int running_on_valgrind = -1;
++#endif
++
+ /* An object allocator for Python.
+ 
+    Here is an introduction to the layers of the Python memory architecture,
+@@ -737,6 +752,13 @@ PyObject_Malloc(size_t nbytes)
+     if (nbytes > PY_SSIZE_T_MAX)
+         return NULL;
+ 
++#ifdef WITH_VALGRIND
++    if (UNLIKELY(running_on_valgrind == -1))
++        running_on_valgrind = RUNNING_ON_VALGRIND;
++    if (UNLIKELY(running_on_valgrind))
++        goto redirect;
++#endif
++
+     /*
+      * This implicitly redirects malloc(0).
+      */
+@@ -927,6 +949,11 @@ PyObject_Free(void *p)
+     if (p == NULL)      /* free(NULL) has no effect */
+         return;
+ 
++#ifdef WITH_VALGRIND
++    if (UNLIKELY(running_on_valgrind > 0))
++        goto redirect;
++#endif
++
+     pool = POOL_ADDR(p);
+     if (Py_ADDRESS_IN_RANGE(p, pool)) {
+         /* We allocated this address. */
+@@ -1121,6 +1148,7 @@ PyObject_Free(void *p)
+         return;
+     }
+ 
++redirect:
+     /* We didn't allocate this address. */
+     free(p);
+ }
+@@ -1150,6 +1178,12 @@ PyObject_Realloc(void *p, size_t nbytes)
+     if (nbytes > PY_SSIZE_T_MAX)
+         return NULL;
+ 
++#ifdef WITH_VALGRIND
++    /* Treat running_on_valgrind == -1 the same as 0 */
++    if (UNLIKELY(running_on_valgrind > 0))
++        goto redirect;
++#endif
++
+     pool = POOL_ADDR(p);
+     if (Py_ADDRESS_IN_RANGE(p, pool)) {
+         /* We're in charge of this block */
+@@ -1177,6 +1211,7 @@ PyObject_Realloc(void *p, size_t nbytes)
+         }
+         return bp;
+     }
++redirect:
+     /* We're not managing this block.  If nbytes <=
+      * SMALL_REQUEST_THRESHOLD, it's tempting to try to take over this
+      * block.  However, if we do, we need to copy the valid data from
+diff -up Python-2.6.6/pyconfig.h.in.disable-pymalloc-on-valgrind Python-2.6.6/pyconfig.h.in
+--- Python-2.6.6/pyconfig.h.in.disable-pymalloc-on-valgrind	2009-10-27 08:30:12.000000000 -0400
++++ Python-2.6.6/pyconfig.h.in	2010-11-29 15:45:07.209350567 -0500
+@@ -1085,6 +1085,9 @@
+ /* Define to empty if the keyword does not work. */
+ #undef volatile
+ 
++/* Define if you want pymalloc to be disabled when running under valgrind */
++#undef WITH_VALGRIND
++
+ 
+ /* Define the macros needed if on a UnixWare 7.x system. */
+ #if defined(__USLC__) && defined(__SCO_VERSION__)

dead.package

@@ -0,0 +1,40 @@
+# HG changeset patch
+# User Antoine Pitrou <solipsis@pitrou.net>
+# Date 1259423758 0
+# Node ID 83c702c17e0218df96592eb27a97a8ba63c747e0
+# Parent  14ee75b86a5f041d531bcb41e62947bdeecfc7d1
+Issue #1515: Enable use of deepcopy() with instance methods.  Patch by Robert Collins.
+
+diff --git a/Lib/copy.py b/Lib/copy.py
+--- a/Lib/copy.py
++++ b/Lib/copy.py
+@@ -260,6 +260,10 @@ d[dict] = _deepcopy_dict
+ if PyStringMap is not None:
+     d[PyStringMap] = _deepcopy_dict
+ 
++def _deepcopy_method(x, memo): # Copy instance methods
++    return type(x)(x.im_func, deepcopy(x.im_self, memo), x.im_class)
++_deepcopy_dispatch[types.MethodType] = _deepcopy_method
++
+ def _keep_alive(x, memo):
+     """Keeps a reference to the object x in the memo.
+ 
+diff --git a/Lib/test/test_copy.py b/Lib/test/test_copy.py
+--- a/Lib/test/test_copy.py
++++ b/Lib/test/test_copy.py
+@@ -672,6 +672,17 @@ class TestCopy(unittest.TestCase):
+         bar = lambda: None
+         self.assertEqual(copy.deepcopy(bar), bar)
+ 
++    def test_deepcopy_bound_method(self):
++        class Foo(object):
++            def m(self):
++                pass
++        f = Foo()
++        f.b = f.m
++        g = copy.deepcopy(f)
++        self.assertEqual(g.m, g.b)
++        self.assertTrue(g.b.im_self is g)
++        g.b()
++
+ def global_foo(x, y): return x+y

disable-pymalloc-on-valgrind-py26.patch

@@ -0,0 +1,25 @@
+Index: Modules/dbmmodule.c
+===================================================================
+--- Modules/dbmmodule.c	(revision 84317)
++++ Modules/dbmmodule.c	(working copy)
+@@ -168,12 +168,18 @@
+ dbm_contains(register dbmobject *dp, PyObject *v)
+ {
+     datum key, val;
++    Py_ssize_t dsize;
+ 
+-    if (PyString_AsStringAndSize(v, (char **)&key.dptr,
+-                                 (Py_ssize_t *)&key.dsize)) {
++    if (PyString_AsStringAndSize(v, (char **)&key.dptr, &dsize)) {
+         return -1;
+     }
+ 
++    /* Coerce from Py_ssize_t down to int: */
++    if (dsize > INT_MAX) {
++        return -1;
++    }
++    key.dsize = dsize;
++
+     /* Expand check_dbmobject_open to return -1 */
+     if (dp->di_dbm == NULL) {
+         PyErr_SetString(DbmError, "DBM object has already been closed");

enable-deepcopy-with-instance-methods.patch

@@ -0,0 +1,12 @@
+diff -up Python-2.7/Lib/test/test_commands.py.gnu-ls-output Python-2.7/Lib/test/test_commands.py
+--- Python-2.7/Lib/test/test_commands.py.gnu-ls-output	2010-08-17 11:31:35.714913918 -0400
++++ Python-2.7/Lib/test/test_commands.py	2010-08-17 11:37:08.913911808 -0400
+@@ -50,7 +50,7 @@ class CommandTests(unittest.TestCase):
+         # Note that the first case above has a space in the group name
+         # while the second one has a space in both names.
+         pat = r'''d.........   # It is a directory.
+-                  \+?          # It may have ACLs.
++                  [.+@]?       # It may have alt access (SELinux, ACLs or metadata ('@' OS X).
+                   \s+\d+       # It has some number of links.
+                   [^/]*        # Skip user, group, size, and date.
+                   /\.          # and end with the name of the file.

fix-dbm_contains-on-64bit-bigendian.patch

@@ -0,0 +1,17 @@
+/* Systemtap tapset to make it easier to trace Python */
+
+/*
+   Define python.function.entry/return:
+*/
+probe python.function.entry = process("python").library("LIBRARY_PATH").mark("function__entry")
+{
+    filename = user_string($arg1);
+    funcname = user_string($arg2);
+    lineno = $arg3;
+}
+probe python.function.return = process("python").library("LIBRARY_PATH").mark("function__return")
+{
+    filename = user_string($arg1);
+    funcname = user_string($arg2);
+    lineno = $arg3;
+}

fix-test_commands-expected-ls-output-issue7108.patch

@@ -0,0 +1,20 @@
+Index: Lib/pydoc.py
+===================================================================
+--- Lib/pydoc.py	(revision 76636)
++++ Lib/pydoc.py	(working copy)
+@@ -1961,10 +1961,14 @@
+         if modname[-9:] == '.__init__':
+             modname = modname[:-9] + ' (package)'
+         print modname, desc and '- ' + desc
++    def onerror(modname):
++        # Ignore non-ImportError exceptions raised whilst trying to
++        # import modules
++        pass
+     try: import warnings
+     except ImportError: pass
+     else: warnings.filterwarnings('ignore') # ignore problems during import
+-    ModuleScanner().run(callback, key)
++    ModuleScanner().run(callback, key, onerror=onerror)
+ 
+ # --------------------------------------------------- web browser interface
+