[packages/python] - up to 2.7.7 - python-buffer-overflow.patch already applied - deleted chunk Mac/README from pythonp

[witekfl]

commit e563f0a0ae2bbc3206eabfe3f544d488f8c66b11
Author: Witold Filipczyk <witekfl at poczta.onet.pl>
Date:   Fri Jun 6 14:04:16 2014 +0200

    - up to 2.7.7
    - python-buffer-overflow.patch already applied
    - deleted chunk Mac/README from pythonpath.patch
    - python-ENOPROTOOPT-test.patch did not apply

 python-buffer-overflow.patch | 43 -------------------------------------------
 python-pythonpath.patch      | 12 ------------
 python.spec                  | 14 ++++++--------
 3 files changed, 6 insertions(+), 63 deletions(-)
---
diff --git a/python.spec b/python.spec
index 0b08117..a063eba 100644
--- a/python.spec
+++ b/python.spec
@@ -42,15 +42,15 @@ Summary(ru.UTF-8):	Язык программирования очень высо
 Summary(tr.UTF-8):	X arayüzlü, yüksek düzeyli, kabuk yorumlayıcı dili
 Summary(uk.UTF-8):	Мова програмування дуже високого рівня з X-інтерфейсом
 Name:		python
-Version:	%{py_ver}.6
-Release:	4
+Version:	%{py_ver}.7
+Release:	1
 Epoch:		1
 License:	PSF
 Group:		Development/Languages/Python
 Source0:	http://www.python.org/ftp/python/%{version}/Python-%{version}%{beta}.tar.xz
-# Source0-md5:	bcf93efa8eaf383c98ed3ce40b763497
+# Source0-md5:	41f7348b348e3f72fcfb4f4d76701352
 Source1:	http://www.python.org/ftp/python/doc/%{dver}/%{name}-%{dver}-docs-html.tar.bz2
-# Source1-md5:	7613314d1aaa7dcc522ca9d3fd43dace
+# Source1-md5:	f8e87d44548d9b7c1f7ab8af779b31c0
 Patch0:		%{name}-db.patch
 Patch1:		%{name}-pythonpath.patch
 Patch2:		%{name}-ac_fixes.patch
@@ -59,8 +59,7 @@ Patch4:		%{name}-noarch_to_datadir.patch
 Patch5:		%{name}-verbose.patch
 Patch6:		%{name}-distro.patch
 Patch7:		%{name}-DNStests.patch
-Patch8:		%{name}-ENOPROTOOPT-test.patch
-Patch9:		%{name}-buffer-overflow.patch
+#Patch8:		%{name}-ENOPROTOOPT-test.patch
 URL:		http://www.python.org/
 BuildRequires:	autoconf >= 2.65
 BuildRequires:	automake
@@ -580,8 +579,7 @@ napisanego w Pythonie.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
-%patch9 -p1
+#%%patch8 -p1
 
 tar xjf %{SOURCE1}
 
diff --git a/python-buffer-overflow.patch b/python-buffer-overflow.patch
deleted file mode 100644
index 164b462..0000000
--- a/python-buffer-overflow.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-
-# HG changeset patch
-# User Benjamin Peterson <benjamin at python.org>
-# Date 1389671978 18000
-# Node ID 87673659d8f7ba1623cd4914f09ad3d2ade034e9
-# Parent  2631d33ee7fbd5f0288931ef37872218d511d2e8
-complain when nbytes > buflen to fix possible buffer overflow (closes #20246)
-
-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");
-+        goto error;
-     }
- 
-     readlen = sock_recvfrom_guts(s, buf.buf, recvlen, flags, &addr);
-
diff --git a/python-pythonpath.patch b/python-pythonpath.patch
index 2d12adc..c6ac3ee 100644
--- a/python-pythonpath.patch
+++ b/python-pythonpath.patch
@@ -181,18 +181,6 @@ diff -urN Python-2.7.org/Mac/PythonLauncher/factorySettings.plist Python-2.7/Mac
                      <string>/usr/bin/pythonw</string>
                      <string>/usr/bin/python</string>
                      <string>/sw/bin/pythonw</string>
-diff -urN Python-2.7.org/Mac/README Python-2.7/Mac/README
---- Python-2.7.org/Mac/README	2010-04-30 17:11:22.000000000 +0200
-+++ Python-2.7/Mac/README	2010-07-05 20:00:03.529530323 +0200
-@@ -213,7 +213,7 @@
- to be supplied later. Some useful (but outdated) info can be found in
- Mac/Demo.
- 
--The commandline scripts /usr/local/bin/python and pythonw can be used to run
-+The commandline scripts /usr/bin/python and pythonw can be used to run
- non-GUI and GUI python scripts from the command line, respectively.
- 
- How do I create a binary distribution?
 diff -urN Python-2.7.org/Misc/HISTORY Python-2.7/Misc/HISTORY
 --- Python-2.7.org/Misc/HISTORY	2010-03-07 16:23:59.000000000 +0100
 +++ Python-2.7/Misc/HISTORY	2010-07-05 20:00:03.576196805 +0200
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python.git/commitdiff/e563f0a0ae2bbc3206eabfe3f544d488f8c66b11