- Update:

  * python26 -> 2.6.8
  * python27 -> 2.7.3
  * python31 -> 3.1.5
  * python32 -> 3.2.1

Security:	http://www.vuxml.org/freebsd/b4f8be9e-56b2-11e1-9fb7-003067b2972c.html
		CVE-2012-0845 CVE-2012-0876 CVE-2012-1150 CVE-2012-0845 CVE-2011-3389

4 files changed, 0 insertions, 91 deletions

diff --git a/lang/python32/files/patch-CVE-2012-0845 b/lang/python32/files/patch-CVE-2012-0845
deleted file mode 100644
index e30dbe1e4532..000000000000
--- a/lang/python32/files/patch-CVE-2012-0845
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/Lib/test/test_xmlrpc.py b/Lib/test/test_xmlrpc.py
---- Lib/test/test_xmlrpc.py
-+++ Lib/test/test_xmlrpc.py
-@@ -519,12 +519,7 @@
- 
-     def tearDown(self):
-         # wait on the server thread to terminate
--        self.evt.wait(4.0)
--        # XXX this code does not work, and in fact stop_serving doesn't exist.
--        if not self.evt.is_set():
--            self.evt.set()
--            stop_serving()
--            raise RuntimeError("timeout reached, test has failed")
-+        self.evt.wait()
- 
-         # disable traceback reporting
-         xmlrpc.server.SimpleXMLRPCServer._send_traceback_header = False
-@@ -671,6 +666,13 @@
-         server = xmlrpclib.ServerProxy("http://%s:%d/RPC2" % (ADDR, PORT))
-         self.assertEqual(server.add("a", "\xe9"), "a\xe9")
- 
-+    def test_partial_post(self):
-+        # Check that a partial POST doesn't make the server loop: issue #14001.
-+        conn = http.client.HTTPConnection(ADDR, PORT)
-+        conn.request('POST', '/RPC2 HTTP/1.0\r\nContent-Length: 100\r\n\r\nbye')
-+        conn.close()
-+
-+
- class MultiPathServerTestCase(BaseServerTestCase):
-     threadFunc = staticmethod(http_multi_server)
-     request_count = 2
-diff --git a/Lib/xmlrpc/server.py b/Lib/xmlrpc/server.py
---- Lib/xmlrpc/server.py
-+++ Lib/xmlrpc/server.py
-@@ -476,7 +476,10 @@
-             L = []
-             while size_remaining:
-                 chunk_size = min(size_remaining, max_chunk_size)
--                L.append(self.rfile.read(chunk_size))
-+                chunk = self.rfile.read(chunk_size)
-+                if not chunk:
-+                    break
-+                L.append(chunk)
-                 size_remaining -= len(L[-1])
-             data = b''.join(L)
- 
diff --git a/lang/python32/files/patch-Doc-library-fcntl.rst b/lang/python32/files/patch-Doc-library-fcntl.rst
deleted file mode 100644
index 46c072e1c062..000000000000
--- a/lang/python32/files/patch-Doc-library-fcntl.rst
+++ /dev/null
@@ -1,11 +0,0 @@
---- Doc/library/fcntl.rst.orig	2009-06-08 09:41:29.000000000 -0400
-+++ Doc/library/fcntl.rst	2010-06-24 22:31:02.000000000 -0400
-@@ -48,8 +48,6 @@
-    This function is identical to the :func:`fcntl` function, except that the
-    argument handling is even more complicated.
- 
--   The op parameter is limited to values that can fit in 32-bits.
--
-    The parameter *arg* can be one of an integer, absent (treated identically to the
-    integer ``0``), an object supporting the read-only buffer interface (most likely
-    a plain Python string) or an object supporting the read-write buffer interface.
diff --git a/lang/python32/files/patch-Lib-test-test_fcntl.py b/lang/python32/files/patch-Lib-test-test_fcntl.py
deleted file mode 100644
index bc3987953d67..000000000000
--- a/lang/python32/files/patch-Lib-test-test_fcntl.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- Lib/test/test_fcntl.py.orig	2009-05-24 11:46:13.000000000 -0400
-+++ Lib/test/test_fcntl.py	2010-06-24 13:56:52.000000000 -0400
-@@ -29,7 +29,7 @@
-     if sys.platform in ('netbsd1', 'netbsd2', 'netbsd3',
-                         'Darwin1.2', 'darwin',
-                         'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5',
--                        'freebsd6', 'freebsd7', 'freebsd8',
-+                        'freebsd6', 'freebsd7', 'freebsd8', 'freebsd9', 'freebsd10'
-                         'bsdos2', 'bsdos3', 'bsdos4',
-                         'openbsd', 'openbsd2', 'openbsd3', 'openbsd4'):
-         if struct.calcsize('l') == 8:
diff --git a/lang/python32/files/patch-Lib-test-test_ioctl.py b/lang/python32/files/patch-Lib-test-test_ioctl.py
deleted file mode 100644
index 2488bc755583..000000000000
--- a/lang/python32/files/patch-Lib-test-test_ioctl.py
+++ /dev/null
@@ -1,23 +0,0 @@
---- Lib/test/test_ioctl.py.orig	2009-08-13 04:51:18.000000000 -0400
-+++ Lib/test/test_ioctl.py	2010-06-24 13:35:29.000000000 -0400
-@@ -41,18 +41,9 @@ class IoctlTests(unittest.TestCase):
-             raise unittest.SkipTest('pty module required')
-         mfd, sfd = pty.openpty()
-         try:
--            if termios.TIOCSWINSZ < 0:
--                set_winsz_opcode_maybe_neg = termios.TIOCSWINSZ
--                set_winsz_opcode_pos = termios.TIOCSWINSZ & 0xffffffff
--            else:
--                set_winsz_opcode_pos = termios.TIOCSWINSZ
--                set_winsz_opcode_maybe_neg, = struct.unpack("i",
--                        struct.pack("I", termios.TIOCSWINSZ))
--
-+            set_winsz_opcode = termios.TIOCSWINSZ
-             our_winsz = struct.pack("HHHH",80,25,0,0)
--            # test both with a positive and potentially negative ioctl code
--            new_winsz = fcntl.ioctl(mfd, set_winsz_opcode_pos, our_winsz)
--            new_winsz = fcntl.ioctl(mfd, set_winsz_opcode_maybe_neg, our_winsz)
-+            new_winsz = fcntl.ioctl(mfd, set_winsz_opcode, our_winsz)
-         finally:
-             os.close(mfd)
-             os.close(sfd)