Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=21fc285a2024d261d00b9a5714fa7b7ed5338274
commit 21fc285a2024d261d00b9a5714fa7b7ed5338274 Author: Miklos Vajna <[email protected]> Date: Sun Sep 28 12:48:51 2014 +0200 python-2.7.8-1-x86_64 - 2.7.6 -> 2.7.8 diff --git a/source/devel/python/CVE-2014-1912.diff b/source/devel/python/CVE-2014-1912.diff deleted file mode 100644 index 164b462..0000000 --- a/source/devel/python/CVE-2014-1912.diff +++ /dev/null @@ -1,43 +0,0 @@ - -# HG changeset patch -# User Benjamin Peterson <[email protected]> -# 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/source/devel/python/FrugalBuild b/source/devel/python/FrugalBuild index f71d680..f2be944 100644 --- a/source/devel/python/FrugalBuild +++ b/source/devel/python/FrugalBuild @@ -4,9 +4,9 @@ USE_GUI=${USE_GUI:-"y"} pkgname=python -pkgver=2.7.6 +pkgver=2.7.8 shortpkgver=2.7 # 2.3 if $pkgver=2.3.4 -pkgrel=3 +pkgrel=1 pkgdesc="A high-level scripting language" url="https://www.python.org"; depends=('glibc>=2.12.1' 'db>=4.7.25-2' 'bzip2>=1.0.5-2' 'gdbm>=1.10' 'openssl>=1.0.0' 'glib2>=2.16.4-2') @@ -19,7 +19,7 @@ _F_archive_name="Python" _F_archive_ext=".tgz" up2date="elinks -dump $url/download/|grep [^.]2.[0-9]|Flasttar" source=(http://www.python.org/ftp/python/$pkgver/Python-$pkgver.tar.xz) -sha1sums=('8321636af2acbeaa68fc635d7dda7369ed446a80') +sha1sums=('9c6281eeace0c3646fa556c8087bb1b7e033c9c4') subpkgs=("$pkgname-tools" "$pkgname-sqlite3") subdescs=("Optional development tools to extending Python" "Python support for sqlite3") @@ -30,11 +30,6 @@ subarchs=('i686 x86_64 arm' 'i686 x86_64 arm') [ "$CARCH" == "x86_64" ] && export CFLAGS="$CFLAGS -fPIC" -# FSA fix *** -source=(${source[@]} CVE-2014-1912.diff) -sha1sums=(${sha1sums[@]} '63d4cfb2f46abc17dd8d85b5a31cfe88398bc697') -# *********** - build() { Fcd Python-$pkgver _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
