1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-04 01:48:54 +00:00

- Update lang/python32 to 3.2.6 [1]

- Update lang/python35 to 3.5.1 [2]
- Update lang/python-doc-html for [1]
- Switch to do-test

Changelog:
[1] https://hg.python.org/cpython/file/v3.2.6/Misc/NEWS
[2] https://docs.python.org/3.5/whatsnew/changelog.html#python-3-5-1-final

Reviewed by:	koobs (python)
Approved by:	mat (mentor)
Differential Revision:	D4663
This commit is contained in:
Martin Wilke 2015-12-21 18:13:33 +00:00
parent 978b5a598d
commit df08d0c785
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=404141
8 changed files with 45 additions and 90 deletions

View File

@ -6,14 +6,14 @@ SHA256 (python/python-2.7.11-docs-pdf-letter.tar.bz2) = b774f15ee0b174041351a8c5
SIZE (python/python-2.7.11-docs-pdf-letter.tar.bz2) = 10661547
SHA256 (python/python-2.7.11-docs-text.tar.bz2) = fc49ac7083123dd6dd53a91a48602f48289c5d04b073da7634322e595d1e280e
SIZE (python/python-2.7.11-docs-text.tar.bz2) = 1607237
SHA256 (python/python-3.2.5-docs-html.tar.bz2) = 5a7f7f79d58cf87511aae66784ae71e3e108ca8185bd40706c4bb43e5e0348bc
SIZE (python/python-3.2.5-docs-html.tar.bz2) = 4435429
SHA256 (python/python-3.2.5-docs-pdf-a4.tar.bz2) = bfa07657b5d3810fa3cc16cd210459457cfaedff0887e2617b2deabd21e432e3
SIZE (python/python-3.2.5-docs-pdf-a4.tar.bz2) = 10380500
SHA256 (python/python-3.2.5-docs-pdf-letter.tar.bz2) = 55327e6e05c5c1f6669512e40835ce39649145eec56f7dee38ec4528ebe06060
SIZE (python/python-3.2.5-docs-pdf-letter.tar.bz2) = 10429112
SHA256 (python/python-3.2.5-docs-text.tar.bz2) = 8940c6bb7c93ffdb5be2573ff236ac06b6082132dd97a404be8400033d805523
SIZE (python/python-3.2.5-docs-text.tar.bz2) = 1569706
SHA256 (python/python-3.2.6-docs-html.tar.bz2) = b746ef40a29abe7949e5f183e236a0734c58b841c0600043160a518390704c13
SIZE (python/python-3.2.6-docs-html.tar.bz2) = 4451267
SHA256 (python/python-3.2.6-docs-pdf-a4.tar.bz2) = 2bf14c32c56e92adb442fdea6bcd4a2386a76ab32ae3ecab347d103fd1a6633f
SIZE (python/python-3.2.6-docs-pdf-a4.tar.bz2) = 10369657
SHA256 (python/python-3.2.6-docs-pdf-letter.tar.bz2) = 55bf8e03442a09ccd1fd6d17ec2329345a47ebfb6e2ae28cee97b14ef6c8b92b
SIZE (python/python-3.2.6-docs-pdf-letter.tar.bz2) = 10418952
SHA256 (python/python-3.2.6-docs-text.tar.bz2) = 889a9f5358d0ded2f2c4b1027967c4b8ec0e99cf57eddefa038f2a0abba7fe88
SIZE (python/python-3.2.6-docs-text.tar.bz2) = 1573432
SHA256 (python/python-3.3.4-docs-html.tar.bz2) = 43ab01c98d5bacb301519a99ed25192cebe0b69ac4a85b95302958b225868efc
SIZE (python/python-3.3.4-docs-html.tar.bz2) = 4951380
SHA256 (python/python-3.3.4-docs-pdf-a4.tar.bz2) = 692eb7dd255b12252c701ca32f530932d3761e4f0582b7461c8277cd70282251

View File

@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= python32
PORTVERSION= 3.2.5
PORTREVISION= 15
PORTVERSION= 3.2.6
CATEGORIES= lang python ipv6
MASTER_SITES= PYTHON/ftp/python/${PORTVERSION}
DISTNAME= Python-${PORTVERSION}
@ -125,7 +124,7 @@ post-install:
for i in ${STAGEDIR}${PREFIX}/lib/python3.2/lib-dynload/*.so; do \
${STRIP_CMD} $$i; done
regression-test: build
do-test:
@cd ${WRKSRC} && ${MAKE} TESTOPTS=-j${MAKE_JOBS_NUMBER} buildbottest
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (python/Python-3.2.5.tar.xz) = 8ccb9645b9779fc4550055b2ebb21a724ab7a63dee45643286eb4f79b2f84116
SIZE (python/Python-3.2.5.tar.xz) = 9221624
SHA256 (python/Python-3.2.6.tar.xz) = 1d12b501819fd26afafbf8459be1aa279b56f032b4c15412de0a713ce0de7bdc
SIZE (python/Python-3.2.6.tar.xz) = 9243292

View File

@ -1,49 +0,0 @@
# HG changeset patch
# User Benjamin Peterson <benjamin@python.org>
# Date 1389671978 18000
# Node ID 9c56217e5c793685eeaf0ee224848c402bdf1e4c
# Parent 2b5cd6d4d149dea6c6941b7e07ada248b29fc9f6
complain when nbytes > buflen to fix possible buffer overflow (closes #20246)
# HG changeset patch
# User Stefan Krah <skrah@bytereef.org>
# Date 1390341520 -3600
# Node ID e82dcd700e8cfb174d6bf6031fd6666627b20f5f
# Parent 29b1eebecb8ed946e1db8e4bb86310d681cf4a91
Issue #20246: Fix test failures on FreeBSD. Patch by Ryan Smith-Roberts.
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py
--- Lib/test/test_socket.py
+++ Lib/test/test_socket.py
@@ -1968,6 +1968,14 @@ 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):
+ self.serv_conn.send(MSG)
+
TIPC_STYPE = 2000
TIPC_LOWER = 200
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
--- Modules/socketmodule.c
+++ Modules/socketmodule.c
@@ -2598,6 +2598,11 @@ sock_recvfrom_into(PySocketSockObject *s
if (recvlen == 0) {
/* If nbytes was not specified, use the buffer's length */
recvlen = buflen;
+ } else if (recvlen > buflen) {
+ PyBuffer_Release(&pbuf);
+ PyErr_SetString(PyExc_ValueError,
+ "nbytes is greater than the length of the buffer");
+ return NULL;
}
readlen = sock_recvfrom_guts(s, buf, recvlen, flags, &addr);

View File

@ -3,14 +3,10 @@ bin/idle3.2
bin/pydoc3.2
bin/python3.2
bin/python3.2-config
lib/libpython3.2%%ABI%%.so
lib/libpython3.2%%ABI%%.so.1
libdata/pkgconfig/python-3.2.pc
man/man1/python3.2.1.gz
include/python3.2%%ABI%%/accu.h
include/python3.2%%ABI%%/Python-ast.h
include/python3.2%%ABI%%/Python.h
include/python3.2%%ABI%%/abstract.h
include/python3.2%%ABI%%/accu.h
include/python3.2%%ABI%%/asdl.h
include/python3.2%%ABI%%/ast.h
include/python3.2%%ABI%%/bitset.h
@ -100,6 +96,8 @@ include/python3.2%%ABI%%/ucnhash.h
include/python3.2%%ABI%%/unicodeobject.h
include/python3.2%%ABI%%/warnings.h
include/python3.2%%ABI%%/weakrefobject.h
lib/libpython3.2%%ABI%%.so
lib/libpython3.2%%ABI%%.so.1
lib/python3.2/LICENSE.txt
lib/python3.2/__future__.py
lib/python3.2/__phello__.foo.py
@ -1865,6 +1863,7 @@ lib/python3.2/json/encoder.py
lib/python3.2/json/scanner.py
lib/python3.2/json/tool.py
lib/python3.2/keyword.py
lib/python3.2/lib-dynload/Python-3.2.6-py3.2.egg-info
lib/python3.2/lib-dynload/_bisect.so
lib/python3.2/lib-dynload/_codecs_cn.so
lib/python3.2/lib-dynload/_codecs_hk.so
@ -1897,7 +1896,6 @@ lib/python3.2/lib-dynload/_socket.so
lib/python3.2/lib-dynload/_ssl.so
lib/python3.2/lib-dynload/_struct.so
lib/python3.2/lib-dynload/_testcapi.so
lib/python3.2/lib-dynload/Python-3.2.5-py3.2.egg-info
lib/python3.2/lib-dynload/array.so
lib/python3.2/lib-dynload/atexit.so
lib/python3.2/lib-dynload/audioop.so
@ -1923,9 +1921,9 @@ lib/python3.2/lib-dynload/unicodedata.so
%%NO_DEBUG%%lib/python3.2/lib-dynload/xxlimited.so
lib/python3.2/lib-dynload/zlib.so
lib/python3.2/lib2to3/Grammar.txt
lib/python3.2/lib2to3/Grammar3.2.5.final.0.pickle
lib/python3.2/lib2to3/Grammar3.2.6.final.0.pickle
lib/python3.2/lib2to3/PatternGrammar.txt
lib/python3.2/lib2to3/PatternGrammar3.2.5.final.0.pickle
lib/python3.2/lib2to3/PatternGrammar3.2.6.final.0.pickle
lib/python3.2/lib2to3/__init__.py
lib/python3.2/lib2to3/__pycache__/__init__.cpython-32.pyc
lib/python3.2/lib2to3/__pycache__/__init__.cpython-32.pyo
@ -2258,9 +2256,9 @@ lib/python3.2/pickle.py
lib/python3.2/pickletools.py
lib/python3.2/pipes.py
lib/python3.2/pkgutil.py
lib/python3.2/plat-freebsd%%OSMAJOR%%/IN.py
lib/python3.2/plat-freebsd%%OSMAJOR%%/__pycache__/IN.cpython-32.pyc
lib/python3.2/plat-freebsd%%OSMAJOR%%/__pycache__/IN.cpython-32.pyo
lib/python3.2/plat-freebsd%%OSMAJOR%%/IN.py
lib/python3.2/plat-freebsd%%OSMAJOR%%/regen
lib/python3.2/platform.py
lib/python3.2/plistlib.py
@ -2639,14 +2637,14 @@ lib/python3.2/test/__pycache__/test_fcntl.cpython-32.pyc
lib/python3.2/test/__pycache__/test_fcntl.cpython-32.pyo
lib/python3.2/test/__pycache__/test_file.cpython-32.pyc
lib/python3.2/test/__pycache__/test_file.cpython-32.pyo
lib/python3.2/test/__pycache__/test_file_eintr.cpython-32.pyc
lib/python3.2/test/__pycache__/test_file_eintr.cpython-32.pyo
lib/python3.2/test/__pycache__/test_filecmp.cpython-32.pyc
lib/python3.2/test/__pycache__/test_filecmp.cpython-32.pyo
lib/python3.2/test/__pycache__/test_fileinput.cpython-32.pyc
lib/python3.2/test/__pycache__/test_fileinput.cpython-32.pyo
lib/python3.2/test/__pycache__/test_fileio.cpython-32.pyc
lib/python3.2/test/__pycache__/test_fileio.cpython-32.pyo
lib/python3.2/test/__pycache__/test_file_eintr.cpython-32.pyc
lib/python3.2/test/__pycache__/test_file_eintr.cpython-32.pyo
lib/python3.2/test/__pycache__/test_float.cpython-32.pyc
lib/python3.2/test/__pycache__/test_float.cpython-32.pyo
lib/python3.2/test/__pycache__/test_flufl.cpython-32.pyc
@ -2897,12 +2895,12 @@ lib/python3.2/test/__pycache__/test_property.cpython-32.pyc
lib/python3.2/test/__pycache__/test_property.cpython-32.pyo
lib/python3.2/test/__pycache__/test_pstats.cpython-32.pyc
lib/python3.2/test/__pycache__/test_pstats.cpython-32.pyo
lib/python3.2/test/__pycache__/test_py_compile.cpython-32.pyo
lib/python3.2/test/__pycache__/test_py_compile.cpython-32.pyc
lib/python3.2/test/__pycache__/test_pty.cpython-32.pyc
lib/python3.2/test/__pycache__/test_pty.cpython-32.pyo
lib/python3.2/test/__pycache__/test_pwd.cpython-32.pyc
lib/python3.2/test/__pycache__/test_pwd.cpython-32.pyo
lib/python3.2/test/__pycache__/test_py_compile.cpython-32.pyc
lib/python3.2/test/__pycache__/test_py_compile.cpython-32.pyo
lib/python3.2/test/__pycache__/test_pyclbr.cpython-32.pyc
lib/python3.2/test/__pycache__/test_pyclbr.cpython-32.pyo
lib/python3.2/test/__pycache__/test_pydoc.cpython-32.pyc
@ -3192,10 +3190,6 @@ lib/python3.2/test/cjkencodings/big5.txt
lib/python3.2/test/cjkencodings/big5hkscs-utf8.txt
lib/python3.2/test/cjkencodings/big5hkscs.txt
lib/python3.2/test/cjkencodings/cp949-utf8.txt
lib/python3.2/test/cjkencodings/iso2022_jp-utf8.txt
lib/python3.2/test/cjkencodings/iso2022_jp.txt
lib/python3.2/test/cjkencodings/iso2022_kr-utf8.txt
lib/python3.2/test/cjkencodings/iso2022_kr.txt
lib/python3.2/test/cjkencodings/cp949.txt
lib/python3.2/test/cjkencodings/euc_jisx0213-utf8.txt
lib/python3.2/test/cjkencodings/euc_jisx0213.txt
@ -3211,6 +3205,10 @@ lib/python3.2/test/cjkencodings/gbk-utf8.txt
lib/python3.2/test/cjkencodings/gbk.txt
lib/python3.2/test/cjkencodings/hz-utf8.txt
lib/python3.2/test/cjkencodings/hz.txt
lib/python3.2/test/cjkencodings/iso2022_jp-utf8.txt
lib/python3.2/test/cjkencodings/iso2022_jp.txt
lib/python3.2/test/cjkencodings/iso2022_kr-utf8.txt
lib/python3.2/test/cjkencodings/iso2022_kr.txt
lib/python3.2/test/cjkencodings/johab-utf8.txt
lib/python3.2/test/cjkencodings/johab.txt
lib/python3.2/test/cjkencodings/shift_jis-utf8.txt
@ -3444,8 +3442,11 @@ lib/python3.2/test/lock_tests.py
lib/python3.2/test/make_ssl_certs.py
lib/python3.2/test/mapping_tests.py
lib/python3.2/test/math_testcases.txt
lib/python3.2/test/mime.types
lib/python3.2/test/mock_socket.py
lib/python3.2/test/mp_fork_bomb.py
lib/python3.2/test/nokia.pem
lib/python3.2/test/nullbytecert.pem
lib/python3.2/test/nullcert.pem
lib/python3.2/test/outstanding_bugs.py
lib/python3.2/test/pickletester.py
@ -3499,9 +3500,6 @@ lib/python3.2/test/subprocessdata/qcat.py
lib/python3.2/test/subprocessdata/qgrep.py
lib/python3.2/test/subprocessdata/sigchild_ignore.py
lib/python3.2/test/support.py
lib/python3.2/test/mime.types
lib/python3.2/test/test_py_compile.py
lib/python3.2/test/nokia.pem
lib/python3.2/test/test___all__.py
lib/python3.2/test/test___future__.py
lib/python3.2/test/test__locale.py
@ -3610,10 +3608,10 @@ lib/python3.2/test/test_exceptions.py
lib/python3.2/test/test_extcall.py
lib/python3.2/test/test_fcntl.py
lib/python3.2/test/test_file.py
lib/python3.2/test/test_file_eintr.py
lib/python3.2/test/test_filecmp.py
lib/python3.2/test/test_fileinput.py
lib/python3.2/test/test_fileio.py
lib/python3.2/test/test_file_eintr.py
lib/python3.2/test/test_float.py
lib/python3.2/test/test_flufl.py
lib/python3.2/test/test_fnmatch.py
@ -3741,6 +3739,7 @@ lib/python3.2/test/test_property.py
lib/python3.2/test/test_pstats.py
lib/python3.2/test/test_pty.py
lib/python3.2/test/test_pwd.py
lib/python3.2/test/test_py_compile.py
lib/python3.2/test/test_pyclbr.py
lib/python3.2/test/test_pydoc.py
lib/python3.2/test/test_pyexpat.py
@ -4151,6 +4150,7 @@ lib/python3.2/warnings.py
lib/python3.2/wave.py
lib/python3.2/weakref.py
lib/python3.2/webbrowser.py
lib/python3.2/wsgiref.egg-info
lib/python3.2/wsgiref/__init__.py
lib/python3.2/wsgiref/__pycache__/__init__.cpython-32.pyc
lib/python3.2/wsgiref/__pycache__/__init__.cpython-32.pyo
@ -4169,7 +4169,6 @@ lib/python3.2/wsgiref/headers.py
lib/python3.2/wsgiref/simple_server.py
lib/python3.2/wsgiref/util.py
lib/python3.2/wsgiref/validate.py
lib/python3.2/wsgiref.egg-info
lib/python3.2/xdrlib.py
lib/python3.2/xml/__init__.py
lib/python3.2/xml/__pycache__/__init__.cpython-32.pyc
@ -4247,3 +4246,5 @@ lib/python3.2/xmlrpc/__pycache__/server.cpython-32.pyo
lib/python3.2/xmlrpc/client.py
lib/python3.2/xmlrpc/server.py
lib/python3.2/zipfile.py
libdata/pkgconfig/python-3.2.pc
man/man1/python3.2.1.gz

View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= python
DISTVERSION= 3.5.0
PORTREVISION= 1
DISTVERSION= 3.5.1
CATEGORIES= lang python ipv6
MASTER_SITES= PYTHON/ftp/python/${DISTVERSION:C/^([0-9]+\.[0-9]+\.[0-9]+).*/\1/}
PKGNAMESUFFIX= ${PYTHON_SUFFIX}

View File

@ -1,2 +1,2 @@
SHA256 (python/Python-3.5.0.tar.xz) = d6d7aa1634a5eeeca6ed4fca266982a04f84bd8f3945a9179e20b24ad2e2be91
SIZE (python/Python-3.5.0.tar.xz) = 14808460
SHA256 (python/Python-3.5.1.tar.xz) = c6d57c0c366d9060ab6c0cdf889ebf3d92711d466cc0119c441dbf2746f725c9
SIZE (python/Python-3.5.1.tar.xz) = 14830408

View File

@ -2368,6 +2368,9 @@ lib/python%%XYDOT%%/idlelib/__pycache__/configSectionNameDialog.cpython-%%XY%%.p
lib/python%%XYDOT%%/idlelib/__pycache__/dynOptionMenuWidget.cpython-%%XY%%.opt-1.pyc
lib/python%%XYDOT%%/idlelib/__pycache__/dynOptionMenuWidget.cpython-%%XY%%.opt-2.pyc
lib/python%%XYDOT%%/idlelib/__pycache__/dynOptionMenuWidget.cpython-%%XY%%.pyc
lib/python%%XYDOT%%/idlelib/__pycache__/help.cpython-%%XY%%.opt-1.pyc
lib/python%%XYDOT%%/idlelib/__pycache__/help.cpython-%%XY%%.opt-2.pyc
lib/python%%XYDOT%%/idlelib/__pycache__/help.cpython-%%XY%%.pyc
lib/python%%XYDOT%%/idlelib/__pycache__/idle.cpython-%%XY%%.opt-1.pyc
lib/python%%XYDOT%%/idlelib/__pycache__/idle.cpython-%%XY%%.opt-2.pyc
lib/python%%XYDOT%%/idlelib/__pycache__/idle.cpython-%%XY%%.pyc
@ -2403,6 +2406,8 @@ lib/python%%XYDOT%%/idlelib/configHelpSourceEdit.py
lib/python%%XYDOT%%/idlelib/configSectionNameDialog.py
lib/python%%XYDOT%%/idlelib/dynOptionMenuWidget.py
lib/python%%XYDOT%%/idlelib/extend.txt
lib/python%%XYDOT%%/idlelib/help.html
lib/python%%XYDOT%%/idlelib/help.py
lib/python%%XYDOT%%/idlelib/help.txt
lib/python%%XYDOT%%/idlelib/idle.bat
lib/python%%XYDOT%%/idlelib/idle.py
@ -2626,10 +2631,10 @@ lib/python%%XYDOT%%/lib-dynload/termios.so
lib/python%%XYDOT%%/lib-dynload/unicodedata.so
%%NO_DEBUG%%lib/python%%XYDOT%%/lib-dynload/xxlimited.so
lib/python%%XYDOT%%/lib-dynload/zlib.so
lib/python%%XYDOT%%/lib2to3/Grammar%%XYZDOT%%.final.0.pickle
lib/python%%XYDOT%%/lib2to3/Grammar.txt
lib/python%%XYDOT%%/lib2to3/PatternGrammar%%XYZDOT%%.final.0.pickle
lib/python%%XYDOT%%/lib2to3/Grammar%%XYZDOT%%.final.0.pickle
lib/python%%XYDOT%%/lib2to3/PatternGrammar.txt
lib/python%%XYDOT%%/lib2to3/PatternGrammar%%XYZDOT%%.final.0.pickle
lib/python%%XYDOT%%/lib2to3/__init__.py
lib/python%%XYDOT%%/lib2to3/__main__.py
lib/python%%XYDOT%%/lib2to3/__pycache__/__init__.cpython-%%XY%%.opt-1.pyc