From owner-svn-ports-all@FreeBSD.ORG Tue Mar 4 12:38:04 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 74C92E68; Tue, 4 Mar 2014 12:38:04 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5FDE2DAC; Tue, 4 Mar 2014 12:38:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s24Cc4Wi098836; Tue, 4 Mar 2014 12:38:04 GMT (envelope-from koobs@svn.freebsd.org) Received: (from koobs@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s24Cc3Vl098825; Tue, 4 Mar 2014 12:38:03 GMT (envelope-from koobs@svn.freebsd.org) Message-Id: <201403041238.s24Cc3Vl098825@svn.freebsd.org> From: Kubilay Kocak Date: Tue, 4 Mar 2014 12:38:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r347015 - in head: Mk lang/python-doc-html lang/python33 lang/python33/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Mar 2014 12:38:04 -0000 Author: koobs Date: Tue Mar 4 12:38:02 2014 New Revision: 347015 URL: http://svnweb.freebsd.org/changeset/ports/347015 QAT: https://qat.redports.org/buildarchive/r347015/ Log: lang/python33: Update to 3.3.4 - Update to 3.3.4 - Update pkg-plist - Remove patch-CVE-2014-1912 (upstream) - Remove patch-issue20374 (upstream) - Repatch and rename patch-Modules__fcntlmodule.c - Add patch-issue-20695-Lib__test__test_urllibnet.py (tests) [1] - Add regression-test target for QA Changes: 3.3.4 - 09/02/2014 http://docs.python.org/3.3/whatsnew/changelog.html#python-3-3-4 Extra: - Update python-doc-html distinfo for Python 3.3 docs - Update bsd.python.mk to support the new version [1] http://bugs.python.org/issue20695 Added: head/lang/python33/files/patch-Modules__fcntlmodule.c (contents, props changed) head/lang/python33/files/patch-issue-20695-Lib__test__test_urllibnet.py (contents, props changed) Deleted: head/lang/python33/files/patch-CVE-2014-1912 head/lang/python33/files/patch-Modules-fcntlmodule.c head/lang/python33/files/patch-issue20374 Modified: head/Mk/bsd.python.mk head/lang/python-doc-html/distinfo head/lang/python33/Makefile head/lang/python33/distinfo head/lang/python33/pkg-plist Modified: head/Mk/bsd.python.mk ============================================================================== --- head/Mk/bsd.python.mk Tue Mar 4 12:16:41 2014 (r347014) +++ head/Mk/bsd.python.mk Tue Mar 4 12:38:02 2014 (r347015) @@ -335,9 +335,9 @@ PYTHON_PORTVERSION= ${PYTHON_DEFAULT_POR # Python-3.3 .if ${PYTHON_VERSION} == "python3.3" -PYTHON_PORTVERSION?= 3.3.3 +PYTHON_PORTVERSION?= 3.3.4 PYTHON_PORTSDIR= ${PORTSDIR}/lang/python33 -PYTHON_REL= 333 +PYTHON_REL= 334 PYTHON_SUFFIX= 33 PYTHON_VER= 3.3 .if exists(${PYTHON_CMD}-config) Modified: head/lang/python-doc-html/distinfo ============================================================================== --- head/lang/python-doc-html/distinfo Tue Mar 4 12:16:41 2014 (r347014) +++ head/lang/python-doc-html/distinfo Tue Mar 4 12:38:02 2014 (r347015) @@ -22,11 +22,11 @@ SHA256 (python/python-3.2.5-docs-pdf-let 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.3.3-docs-html.tar.bz2) = 414dca9cac934c06c6d21ad0068ebbf907a08f8a58b40b1ffb920426840b618c -SIZE (python/python-3.3.3-docs-html.tar.bz2) = 4944388 -SHA256 (python/python-3.3.3-docs-pdf-a4.tar.bz2) = 025edfbd46bfb11a266e6011145396adffb6519a3b1bf752f46eedd2232af3d2 -SIZE (python/python-3.3.3-docs-pdf-a4.tar.bz2) = 11133707 -SHA256 (python/python-3.3.3-docs-pdf-letter.tar.bz2) = c03f9023587e7cffc9f4e58bc0016ecc140bff7b6bf70cb43ace0e3f3e4cc369 -SIZE (python/python-3.3.3-docs-pdf-letter.tar.bz2) = 11180442 -SHA256 (python/python-3.3.3-docs-text.tar.bz2) = d8af078e6fbddfaaba84405dec8fa377c017888dc3994616d8a02d3a383844b4 -SIZE (python/python-3.3.3-docs-text.tar.bz2) = 1794451 +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 +SIZE (python/python-3.3.4-docs-pdf-a4.tar.bz2) = 11284079 +SHA256 (python/python-3.3.4-docs-pdf-letter.tar.bz2) = 21aabe30ad03ef4c78e57b14fa257670ea8899ae053cc709805d7807efe58b7a +SIZE (python/python-3.3.4-docs-pdf-letter.tar.bz2) = 11337167 +SHA256 (python/python-3.3.4-docs-text.tar.bz2) = 82c98238d9df22650d27f3bff40b31888306aaf5f7636bbb145f94266365f273 +SIZE (python/python-3.3.4-docs-text.tar.bz2) = 1783407 Modified: head/lang/python33/Makefile ============================================================================== --- head/lang/python33/Makefile Tue Mar 4 12:16:41 2014 (r347014) +++ head/lang/python33/Makefile Tue Mar 4 12:38:02 2014 (r347015) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= python33 -PORTVERSION= 3.3.3 -PORTREVISION= 3 +PORTVERSION= 3.3.4 CATEGORIES= lang python ipv6 MASTER_SITES= PYTHON MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} @@ -213,4 +212,7 @@ post-install: @${CAT} ${PKGMESSAGE} +regression-test: build + @cd ${WRKSRC} && ${GMAKE} TESTOPTS=-j${MAKE_JOBS_NUMBER} test + .include Modified: head/lang/python33/distinfo ============================================================================== --- head/lang/python33/distinfo Tue Mar 4 12:16:41 2014 (r347014) +++ head/lang/python33/distinfo Tue Mar 4 12:38:02 2014 (r347015) @@ -1,2 +1,2 @@ -SHA256 (python/Python-3.3.3.tar.xz) = 339275b30a1a3fef1589016bf6302c14e870f7a6fd2522bf87a6c2c6d383c685 -SIZE (python/Python-3.3.3.tar.xz) = 12057744 +SHA256 (python/Python-3.3.4.tar.xz) = c6cc126d91c04e0348882cfbd36d7a844d4e50acc37a3f6a64d67764e3995689 +SIZE (python/Python-3.3.4.tar.xz) = 12087568 Added: head/lang/python33/files/patch-Modules__fcntlmodule.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/python33/files/patch-Modules__fcntlmodule.c Tue Mar 4 12:38:02 2014 (r347015) @@ -0,0 +1,53 @@ +--- ./Modules/fcntlmodule.c.orig 2014-03-04 20:15:17.641117835 +1100 ++++ ./Modules/fcntlmodule.c 2014-03-04 20:19:36.141145958 +1100 +@@ -98,20 +98,15 @@ + { + #define IOCTL_BUFSZ 1024 + int fd; +- /* In PyArg_ParseTuple below, we use the unsigned non-checked 'I' ++ /* In PyArg_ParseTuple below, we use the unsigned non-checked 'k' + format for the 'code' parameter because Python turns 0x8000000 + into either a large positive number (PyLong or PyInt on 64-bit + platforms) or a negative number on others (32-bit PyInt) + whereas the system expects it to be a 32bit bit field value + regardless of it being passed as an int or unsigned long on +- various platforms. See the termios.TIOCSWINSZ constant across +- platforms for an example of this. +- +- If any of the 64bit platforms ever decide to use more than 32bits +- in their unsigned long ioctl codes this will break and need +- special casing based on the platform being built on. ++ various platforms. + */ +- unsigned int code; ++ unsigned long code; + int arg; + int ret; + Py_buffer pstr; +@@ -120,7 +115,7 @@ + int mutate_arg = 1; + char buf[IOCTL_BUFSZ+1]; /* argument plus NUL byte */ + +- if (PyArg_ParseTuple(args, "O&Iw*|i:ioctl", ++ if (PyArg_ParseTuple(args, "O&kw*|i:ioctl", + conv_descriptor, &fd, &code, + &pstr, &mutate_arg)) { + char *arg; +@@ -175,7 +170,7 @@ + } + + PyErr_Clear(); +- if (PyArg_ParseTuple(args, "O&Is*:ioctl", ++ if (PyArg_ParseTuple(args, "O&ks*:ioctl", + conv_descriptor, &fd, &code, &pstr)) { + str = pstr.buf; + len = pstr.len; +@@ -202,7 +197,7 @@ + PyErr_Clear(); + arg = 0; + if (!PyArg_ParseTuple(args, +- "O&I|i;ioctl requires a file or file descriptor," ++ "O&k|i;ioctl requires a file or file descriptor," + " an integer and optionally an integer or buffer argument", + conv_descriptor, &fd, &code, &arg)) { + return NULL; Added: head/lang/python33/files/patch-issue-20695-Lib__test__test_urllibnet.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/python33/files/patch-issue-20695-Lib__test__test_urllibnet.py Tue Mar 4 12:38:02 2014 (r347015) @@ -0,0 +1,45 @@ +# HG changeset patch +# User Benjamin Peterson +# Date 1392869184 18000 +# Node ID c9261cf05db67ec57cf66bee7b2064adef04d550 +# Parent 8d1528dddc7df1002237921d3e2f22cea1cf18d5# Parent 29b1eebecb8ed946e1db8e4bb86310d681cf4a91 +merge 3.2 (#20695) + +--- ./Lib/test/test_urllibnet.py.orig 2014-03-04 20:56:25.532422505 +1100 ++++ ./Lib/test/test_urllibnet.py 2014-03-04 20:57:48.725949896 +1100 +@@ -103,7 +103,7 @@ + # Make sure fd returned by fileno is valid. + with self.urlopen("http://www.python.org/", timeout=None) as open_url: + fd = open_url.fileno() +- with os.fdopen(fd, encoding='utf-8') as f: ++ with os.fdopen(fd, 'rb') as f: + self.assertTrue(f.read(), "reading from file created using fd " + "returned by fileno failed") + +@@ -151,7 +151,7 @@ + with self.urlretrieve("http://www.python.org/") as (file_location, info): + self.assertTrue(os.path.exists(file_location), "file location returned by" + " urlretrieve is not a valid path") +- with open(file_location, encoding='utf-8') as f: ++ with open(file_location, 'rb') as f: + self.assertTrue(f.read(), "reading from the file location returned" + " by urlretrieve failed") + +@@ -161,7 +161,7 @@ + support.TESTFN) as (file_location, info): + self.assertEqual(file_location, support.TESTFN) + self.assertTrue(os.path.exists(file_location)) +- with open(file_location, encoding='utf-8') as f: ++ with open(file_location, 'rb') as f: + self.assertTrue(f.read(), "reading from temporary file failed") + + def test_header(self): +@@ -170,7 +170,7 @@ + self.assertIsInstance(info, email.message.Message, + "info is not an instance of email.message.Message") + +- logo = "http://www.python.org/community/logos/python-logo-master-v3-TM.png" ++ logo = "http://www.python.org/static/community_logos/python-logo-master-v3-TM.png" + + def test_data_header(self): + with self.urlretrieve(self.logo) as (file_location, fileheaders): Modified: head/lang/python33/pkg-plist ============================================================================== --- head/lang/python33/pkg-plist Tue Mar 4 12:16:41 2014 (r347014) +++ head/lang/python33/pkg-plist Tue Mar 4 12:38:02 2014 (r347015) @@ -1687,6 +1687,49 @@ man/man1/python3.3.1.gz %%PYTHON_LIBDIR%%/idlelib/dynOptionMenuWidget.py %%PYTHON_LIBDIR%%/idlelib/extend.txt %%PYTHON_LIBDIR%%/idlelib/help.txt +%%PYTHON_LIBDIR%%/idlelib/idle_test/README.txt +%%PYTHON_LIBDIR%%/idlelib/idle_test/__init__.py +%%PYTHON_LIBDIR%%/idlelib/idle_test/__pycache__/__init__.cpython-33.pyc +%%PYTHON_LIBDIR%%/idlelib/idle_test/__pycache__/__init__.cpython-33.pyo +%%PYTHON_LIBDIR%%/idlelib/idle_test/__pycache__/mock_idle.cpython-33.pyc +%%PYTHON_LIBDIR%%/idlelib/idle_test/__pycache__/mock_idle.cpython-33.pyo +%%PYTHON_LIBDIR%%/idlelib/idle_test/__pycache__/mock_tk.cpython-33.pyc +%%PYTHON_LIBDIR%%/idlelib/idle_test/__pycache__/mock_tk.cpython-33.pyo +%%PYTHON_LIBDIR%%/idlelib/idle_test/__pycache__/test_calltips.cpython-33.pyc +%%PYTHON_LIBDIR%%/idlelib/idle_test/__pycache__/test_calltips.cpython-33.pyo +%%PYTHON_LIBDIR%%/idlelib/idle_test/__pycache__/test_config_name.cpython-33.pyc +%%PYTHON_LIBDIR%%/idlelib/idle_test/__pycache__/test_config_name.cpython-33.pyo +%%PYTHON_LIBDIR%%/idlelib/idle_test/__pycache__/test_delegator.cpython-33.pyc +%%PYTHON_LIBDIR%%/idlelib/idle_test/__pycache__/test_delegator.cpython-33.pyo +%%PYTHON_LIBDIR%%/idlelib/idle_test/__pycache__/test_formatparagraph.cpython-33.pyc +%%PYTHON_LIBDIR%%/idlelib/idle_test/__pycache__/test_formatparagraph.cpython-33.pyo +%%PYTHON_LIBDIR%%/idlelib/idle_test/__pycache__/test_grep.cpython-33.pyc +%%PYTHON_LIBDIR%%/idlelib/idle_test/__pycache__/test_grep.cpython-33.pyo +%%PYTHON_LIBDIR%%/idlelib/idle_test/__pycache__/test_idlehistory.cpython-33.pyc +%%PYTHON_LIBDIR%%/idlelib/idle_test/__pycache__/test_idlehistory.cpython-33.pyo +%%PYTHON_LIBDIR%%/idlelib/idle_test/__pycache__/test_pathbrowser.cpython-33.pyc +%%PYTHON_LIBDIR%%/idlelib/idle_test/__pycache__/test_pathbrowser.cpython-33.pyo +%%PYTHON_LIBDIR%%/idlelib/idle_test/__pycache__/test_rstrip.cpython-33.pyc +%%PYTHON_LIBDIR%%/idlelib/idle_test/__pycache__/test_rstrip.cpython-33.pyo +%%PYTHON_LIBDIR%%/idlelib/idle_test/__pycache__/test_searchengine.cpython-33.pyc +%%PYTHON_LIBDIR%%/idlelib/idle_test/__pycache__/test_searchengine.cpython-33.pyo +%%PYTHON_LIBDIR%%/idlelib/idle_test/__pycache__/test_text.cpython-33.pyc +%%PYTHON_LIBDIR%%/idlelib/idle_test/__pycache__/test_text.cpython-33.pyo +%%PYTHON_LIBDIR%%/idlelib/idle_test/__pycache__/test_warning.cpython-33.pyc +%%PYTHON_LIBDIR%%/idlelib/idle_test/__pycache__/test_warning.cpython-33.pyo +%%PYTHON_LIBDIR%%/idlelib/idle_test/mock_idle.py +%%PYTHON_LIBDIR%%/idlelib/idle_test/mock_tk.py +%%PYTHON_LIBDIR%%/idlelib/idle_test/test_calltips.py +%%PYTHON_LIBDIR%%/idlelib/idle_test/test_config_name.py +%%PYTHON_LIBDIR%%/idlelib/idle_test/test_delegator.py +%%PYTHON_LIBDIR%%/idlelib/idle_test/test_formatparagraph.py +%%PYTHON_LIBDIR%%/idlelib/idle_test/test_grep.py +%%PYTHON_LIBDIR%%/idlelib/idle_test/test_idlehistory.py +%%PYTHON_LIBDIR%%/idlelib/idle_test/test_pathbrowser.py +%%PYTHON_LIBDIR%%/idlelib/idle_test/test_rstrip.py +%%PYTHON_LIBDIR%%/idlelib/idle_test/test_searchengine.py +%%PYTHON_LIBDIR%%/idlelib/idle_test/test_text.py +%%PYTHON_LIBDIR%%/idlelib/idle_test/test_warning.py %%PYTHON_LIBDIR%%/idlelib/idle.bat %%PYTHON_LIBDIR%%/idlelib/idle.py %%PYTHON_LIBDIR%%/idlelib/idle.pyw @@ -2612,6 +2655,8 @@ man/man1/python3.3.1.gz %%PYTHON_LIBDIR%%/test/__pycache__/test_getargs2.cpython-33.pyo %%PYTHON_LIBDIR%%/test/__pycache__/test_getopt.cpython-33.pyc %%PYTHON_LIBDIR%%/test/__pycache__/test_getopt.cpython-33.pyo +%%PYTHON_LIBDIR%%/test/__pycache__/test_getpass.cpython-33.pyc +%%PYTHON_LIBDIR%%/test/__pycache__/test_getpass.cpython-33.pyo %%PYTHON_LIBDIR%%/test/__pycache__/test_gettext.cpython-33.pyc %%PYTHON_LIBDIR%%/test/__pycache__/test_gettext.cpython-33.pyo %%PYTHON_LIBDIR%%/test/__pycache__/test_glob.cpython-33.pyc @@ -3684,6 +3729,7 @@ man/man1/python3.3.1.gz %%PYTHON_LIBDIR%%/test/test_genexps.py %%PYTHON_LIBDIR%%/test/test_getargs2.py %%PYTHON_LIBDIR%%/test/test_getopt.py +%%PYTHON_LIBDIR%%/test/test_getpass.py %%PYTHON_LIBDIR%%/test/test_gettext.py %%PYTHON_LIBDIR%%/test/test_glob.py %%PYTHON_LIBDIR%%/test/test_global.py @@ -4176,8 +4222,11 @@ man/man1/python3.3.1.gz %%PYTHON_LIBDIR%%/tkinter/test/__pycache__/runtktests.cpython-33.pyo %%PYTHON_LIBDIR%%/tkinter/test/__pycache__/support.cpython-33.pyc %%PYTHON_LIBDIR%%/tkinter/test/__pycache__/support.cpython-33.pyo +%%PYTHON_LIBDIR%%/tkinter/test/__pycache__/widget_tests.cpython-33.pyc +%%PYTHON_LIBDIR%%/tkinter/test/__pycache__/widget_tests.cpython-33.pyo %%PYTHON_LIBDIR%%/tkinter/test/runtktests.py %%PYTHON_LIBDIR%%/tkinter/test/support.py +%%PYTHON_LIBDIR%%/tkinter/test/widget_tests.py %%PYTHON_LIBDIR%%/tkinter/test/test_tkinter/__init__.py %%PYTHON_LIBDIR%%/tkinter/test/test_tkinter/__pycache__/__init__.cpython-33.pyc %%PYTHON_LIBDIR%%/tkinter/test/test_tkinter/__pycache__/__init__.cpython-33.pyo @@ -4191,11 +4240,14 @@ man/man1/python3.3.1.gz %%PYTHON_LIBDIR%%/tkinter/test/test_tkinter/__pycache__/test_text.cpython-33.pyo %%PYTHON_LIBDIR%%/tkinter/test/test_tkinter/__pycache__/test_variables.cpython-33.pyc %%PYTHON_LIBDIR%%/tkinter/test/test_tkinter/__pycache__/test_variables.cpython-33.pyo +%%PYTHON_LIBDIR%%/tkinter/test/test_tkinter/__pycache__/test_widgets.cpython-33.pyc +%%PYTHON_LIBDIR%%/tkinter/test/test_tkinter/__pycache__/test_widgets.cpython-33.pyo %%PYTHON_LIBDIR%%/tkinter/test/test_tkinter/test_font.py %%PYTHON_LIBDIR%%/tkinter/test/test_tkinter/test_loadtk.py %%PYTHON_LIBDIR%%/tkinter/test/test_tkinter/test_misc.py %%PYTHON_LIBDIR%%/tkinter/test/test_tkinter/test_text.py %%PYTHON_LIBDIR%%/tkinter/test/test_tkinter/test_variables.py +%%PYTHON_LIBDIR%%/tkinter/test/test_tkinter/test_widgets.py %%PYTHON_LIBDIR%%/tkinter/test/test_ttk/__init__.py %%PYTHON_LIBDIR%%/tkinter/test/test_ttk/__pycache__/__init__.cpython-33.pyc %%PYTHON_LIBDIR%%/tkinter/test/test_ttk/__pycache__/__init__.cpython-33.pyo @@ -4552,6 +4604,8 @@ man/man1/python3.3.1.gz @dirrm %%PYTHON_LIBDIR%%/html @dirrm %%PYTHON_LIBDIR%%/http/__pycache__ @dirrm %%PYTHON_LIBDIR%%/http +@dirrm %%PYTHON_LIBDIR%%/idlelib/idle_test/__pycache__ +@dirrm %%PYTHON_LIBDIR%%/idlelib/idle_test @dirrm %%PYTHON_LIBDIR%%/idlelib/Icons @dirrm %%PYTHON_LIBDIR%%/idlelib/__pycache__ @dirrm %%PYTHON_LIBDIR%%/idlelib @@ -4743,7 +4797,6 @@ man/man1/python3.3.1.gz %%PORTDATA%%%%DATADIR%%/Tools/freeze/winmakemakefile.py %%PORTDATA%%%%DATADIR%%/Tools/gdb/libpython.py %%PORTDATA%%%%DATADIR%%/Tools/hg/hgtouch.py -%%PORTDATA%%%%DATADIR%%/Tools/hg/hgtouch.pyc %%PORTDATA%%%%DATADIR%%/Tools/i18n/makelocalealias.py %%PORTDATA%%%%DATADIR%%/Tools/i18n/msgfmt.py %%PORTDATA%%%%DATADIR%%/Tools/i18n/pygettext.py