FreeBSD Bugzilla – Attachment 144157 Details for
Bug 191405
lang/python27: Update to 2.7.8 and devel/py-setuptools to 5.4.1
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
update python27 to 2.7.7 and py-setuptools to 5.2
py277_setuotools52.diff.txt (text/plain), 17.32 KB, created by
Wen Heping
on 2014-06-26 12:53:10 UTC
(
hide
)
Description:
update python27 to 2.7.7 and py-setuptools to 5.2
Filename:
MIME Type:
Creator:
Wen Heping
Created:
2014-06-26 12:53:10 UTC
Size:
17.32 KB
patch
obsolete
>Index: Mk/bsd.python.mk >=================================================================== >--- Mk/bsd.python.mk (revision 359317) >+++ Mk/bsd.python.mk (working copy) >@@ -391,9 +391,9 @@ > > # Python-2.7 > .elif ${PYTHON_VERSION} == "python2.7" >-PYTHON_PORTVERSION?= 2.7.6 >+PYTHON_PORTVERSION?= 2.7.7 > PYTHON_PORTSDIR= ${PORTSDIR}/lang/python27 >-PYTHON_REL= 276 >+PYTHON_REL= 277 > PYTHON_SUFFIX= 27 > PYTHON_VER= 2.7 > >Index: devel/py-setuptools/Makefile >=================================================================== >--- devel/py-setuptools/Makefile (revision 359317) >+++ devel/py-setuptools/Makefile (working copy) >@@ -1,7 +1,7 @@ > # $FreeBSD$ > > PORTNAME= setuptools >-PORTVERSION= 5.1 >+PORTVERSION= 5.2 > CATEGORIES= devel python > MASTER_SITES= CHEESESHOP > PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} >Index: devel/py-setuptools/distinfo >=================================================================== >--- devel/py-setuptools/distinfo (revision 359317) >+++ devel/py-setuptools/distinfo (working copy) >@@ -1,2 +1,2 @@ >-SHA256 (python/setuptools-5.1.tar.gz) = 5855a13607cae9123df0981d814d32b5b413b7a20422f642bf3f4c355383485b >-SIZE (python/setuptools-5.1.tar.gz) = 804805 >+SHA256 (python/setuptools-5.2.tar.gz) = 603f5dc2207d9930370483ce04cd57a847e7816d541f93c87d60089457306205 >+SIZE (python/setuptools-5.2.tar.gz) = 807345 >Index: lang/python27/Makefile >=================================================================== >--- lang/python27/Makefile (revision 359317) >+++ lang/python27/Makefile (working copy) >@@ -2,8 +2,7 @@ > # $FreeBSD$ > > PORTNAME= python27 >-PORTVERSION= 2.7.6 >-PORTREVISION= 4 >+PORTVERSION= 2.7.7 > CATEGORIES= lang python ipv6 > MASTER_SITES= PYTHON > MASTER_SITE_SUBDIR= ${PYTHON_MASTER_SITE_SUBDIR} >Index: lang/python27/distinfo >=================================================================== >--- lang/python27/distinfo (revision 359317) >+++ lang/python27/distinfo (working copy) >@@ -1,2 +1,2 @@ >-SHA256 (python/Python-2.7.6.tar.xz) = 1fd68e81f8bf7386ff239b7faee9ba387129d2cf34eab13350bd8503a0bff6a1 >-SIZE (python/Python-2.7.6.tar.xz) = 10431288 >+SHA256 (python/Python-2.7.7.tar.xz) = 2983e3cd089b30c50e2b2234f07c2ac4fb8a5df230ab8f2e1133a1d8b208da78 >+SIZE (python/Python-2.7.7.tar.xz) = 10496500 >Index: lang/python27/files/patch-CVE-2014-1912 >=================================================================== >--- lang/python27/files/patch-CVE-2014-1912 (revision 359317) >+++ lang/python27/files/patch-CVE-2014-1912 (working copy) >@@ -1,50 +0,0 @@ >-# HG changeset patch >-# User Benjamin Peterson <benjamin@python.org> >-# Date 1389671978 18000 >-# Node ID 87673659d8f7ba1623cd4914f09ad3d2ade034e9 >-# Parent 2631d33ee7fbd5f0288931ef37872218d511d2e8 >-complain when nbytes > buflen to fix possible buffer overflow (closes #20246) >- >-# HG changeset patch >-# User Stefan Krah <skrah@bytereef.org> >-# Date 1390341952 -3600 >-# Node ID b6c5a37b221f5c617125faa363d1b460b0b61b42 >-# Parent d55d1cbf5f9a9efa7908fc9412bae676a6b675ef >-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 >-@@ -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) >-+ self.serv_conn.send(buf) >-+ >- >- TIPC_STYPE = 2000 >- TIPC_LOWER = 200 >- >-diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c >---- Modules/socketmodule.c >-+++ 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); >- >Index: lang/python27/files/patch-Doc-library-fcntl.rst >=================================================================== >--- lang/python27/files/patch-Doc-library-fcntl.rst (revision 359317) >+++ lang/python27/files/patch-Doc-library-fcntl.rst (working copy) >@@ -1,11 +0,0 @@ >---- Doc/library/fcntl.rst.orig 2010-08-14 16:19:09.194215129 +0800 >-+++ Doc/library/fcntl.rst 2010-08-14 16:19:36.999453016 +0800 >-@@ -50,8 +50,6 @@ >- operations are typically defined in the library module :mod:`termios` and 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. >Index: lang/python27/files/patch-Modules-fcntlmodule.c >=================================================================== >--- lang/python27/files/patch-Modules-fcntlmodule.c (revision 359317) >+++ lang/python27/files/patch-Modules-fcntlmodule.c (working copy) >@@ -1,6 +1,6 @@ >---- Modules/fcntlmodule.c.orig 2010-08-14 16:36:54.991363730 +0800 >-+++ Modules/fcntlmodule.c 2010-08-14 16:41:05.555822031 +0800 >-@@ -97,20 +97,15 @@ >+--- Modules/fcntlmodule.c.orig 2006-01-01 09:42:46.000000000 +0800 >++++ Modules/fcntlmodule.c 2006-01-01 09:45:34.000000000 +0800 >+@@ -98,20 +98,15 @@ > { > #define IOCTL_BUFSZ 1024 > int fd; >@@ -12,7 +12,7 @@ > 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 thise. >+- 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 >@@ -24,7 +24,7 @@ > int arg; > int ret; > char *str; >-@@ -118,7 +113,7 @@ >+@@ -119,7 +114,7 @@ > int mutate_arg = 1; > char buf[IOCTL_BUFSZ+1]; /* argument plus NUL byte */ > >@@ -33,7 +33,7 @@ > conv_descriptor, &fd, &code, > &str, &len, &mutate_arg)) { > char *arg; >-@@ -169,7 +164,7 @@ >+@@ -170,7 +165,7 @@ > } > > PyErr_Clear(); >@@ -42,7 +42,7 @@ > conv_descriptor, &fd, &code, &str, &len)) { > if (len > IOCTL_BUFSZ) { > PyErr_SetString(PyExc_ValueError, >-@@ -191,7 +186,7 @@ >+@@ -192,7 +187,7 @@ > PyErr_Clear(); > arg = 0; > if (!PyArg_ParseTuple(args, >Index: lang/python27/files/patch-issue20374 >=================================================================== >--- lang/python27/files/patch-issue20374 (revision 359317) >+++ lang/python27/files/patch-issue20374 (working copy) >@@ -1,55 +0,0 @@ >-# Description: fix readline.so build with readline 6.3 >-# Patch obtained from upstream, issue #20374 >-# http://bugs.python.org/issue20374 >-# PR: ports/187174 >- >---- ./Modules/readline.c.orig 2013-11-10 07:36:41.000000000 +0000 >-+++ ./Modules/readline.c 2014-03-01 12:40:44.000000000 +0000 >-@@ -750,14 +750,22 @@ >- } >- >- static int >-+#if defined(_RL_FUNCTION_TYPEDEF) >- on_startup_hook(void) >-+#else >-+on_startup_hook() >-+#endif >- { >- return on_hook(startup_hook); >- } >- >- #ifdef HAVE_RL_PRE_INPUT_HOOK >- static int >-+#if defined(_RL_FUNCTION_TYPEDEF) >- on_pre_input_hook(void) >-+#else >-+on_pre_input_hook() >-+#endif >- { >- return on_hook(pre_input_hook); >- } >-@@ -852,7 +860,7 @@ >- * before calling the normal completer */ >- >- static char ** >--flex_complete(char *text, int start, int end) >-+flex_complete(const char *text, int start, int end) >- { >- #ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER >- rl_completion_append_character ='\0'; >-@@ -911,12 +919,12 @@ >- rl_bind_key_in_map ('\t', rl_complete, emacs_meta_keymap); >- rl_bind_key_in_map ('\033', rl_complete, emacs_meta_keymap); >- /* Set our hook functions */ >-- rl_startup_hook = (Function *)on_startup_hook; >-+ rl_startup_hook = on_startup_hook; >- #ifdef HAVE_RL_PRE_INPUT_HOOK >-- rl_pre_input_hook = (Function *)on_pre_input_hook; >-+ rl_pre_input_hook = on_pre_input_hook; >- #endif >- /* Set our completion function */ >-- rl_attempted_completion_function = (CPPFunction *)flex_complete; >-+ rl_attempted_completion_function = flex_complete; >- /* Set Python word break characters */ >- completer_word_break_characters = >- rl_completer_word_break_characters = >Index: lang/python27/files/patch-setup.py >=================================================================== >--- lang/python27/files/patch-setup.py (revision 359317) >+++ lang/python27/files/patch-setup.py (working copy) >@@ -1,5 +1,5 @@ >---- setup.py.orig 2013-04-06 18:02:41.000000000 +0400 >-+++ setup.py 2013-04-07 10:52:47.000000000 +0400 >+--- setup.py.orig 2014-06-01 02:58:40.000000000 +0800 >++++ setup.py 2006-01-01 10:01:40.000000000 +0800 > @@ -33,7 +33,7 @@ > COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS")) > >@@ -9,7 +9,7 @@ > > def add_dir_to_list(dirlist, dir): > """Add the directory 'dir' to the list 'dirlist' (at the front) if >-@@ -720,7 +720,7 @@ >+@@ -723,7 +723,7 @@ > # use the same library for the readline and curses modules. > if 'curses' in readline_termcap_library: > curses_library = readline_termcap_library >@@ -18,7 +18,7 @@ > curses_library = 'ncursesw' > elif self.compiler.find_library_file(lib_dirs, 'ncurses'): > curses_library = 'ncurses' >-@@ -755,7 +755,7 @@ >+@@ -758,7 +758,7 @@ > elif curses_library: > readline_libs.append(curses_library) > elif self.compiler.find_library_file(lib_dirs + >@@ -27,7 +27,7 @@ > 'termcap'): > readline_libs.append('termcap') > exts.append( Extension('readline', ['readline.c'], >-@@ -862,6 +862,8 @@ >+@@ -865,6 +865,8 @@ > # OpenSSL doesn't do these until 0.9.8 so we'll bring our own hash > exts.append( Extension('_sha256', ['sha256module.c']) ) > exts.append( Extension('_sha512', ['sha512module.c']) ) >@@ -36,7 +36,7 @@ > > # Modules that provide persistent dictionary-like semantics. You will > # probably want to arrange for at least one of them to be available on >-@@ -1208,7 +1210,7 @@ >+@@ -1210,7 +1212,7 @@ > sysroot = macosx_sdk_root() > f = os.path.join(sysroot, f[1:]) > >@@ -45,9 +45,9 @@ > data = open(f).read() > m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data) > if m is not None: >-@@ -1338,12 +1340,13 @@ >- # provided by the ncurses library. >+@@ -1341,7 +1343,7 @@ > panel_library = 'panel' >+ curses_incs = None > if curses_library.startswith('ncurses'): > - if curses_library == 'ncursesw': > + if curses_library == 'xxxncursesw': >@@ -54,13 +54,15 @@ > # Bug 1464056: If _curses.so links with ncursesw, > # _curses_panel.so must link with panelw. > panel_library = 'panelw' >- curses_libs = [curses_library] >+@@ -1350,6 +1352,7 @@ >+ [os.path.join(d, 'ncursesw') for d in inc_dirs]) > exts.append( Extension('_curses', ['_cursesmodule.c'], >-+ library_dirs = ['/usr/lib'], >+ include_dirs = curses_incs, >++ library_dirs = ['/usr/lib'], > libraries = curses_libs) ) > elif curses_library == 'curses' and host_platform != 'darwin': > # OSX has an old Berkeley curses, not good enough for >-@@ -1356,6 +1359,7 @@ >+@@ -1362,6 +1365,7 @@ > curses_libs = ['curses'] > > exts.append( Extension('_curses', ['_cursesmodule.c'], >@@ -68,7 +70,7 @@ > libraries = curses_libs) ) > else: > missing.append('_curses') >-@@ -1540,7 +1544,7 @@ >+@@ -1549,7 +1553,7 @@ > macros = dict() > libraries = [] > >@@ -77,7 +79,7 @@ > # FreeBSD's P1003.1b semaphore support is very experimental > # and has many known problems. (as of June 2008) > macros = dict() >-@@ -1592,7 +1596,7 @@ >+@@ -1601,7 +1605,7 @@ > missing.append('linuxaudiodev') > > if (host_platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6', >@@ -86,7 +88,7 @@ > or host_platform.startswith("gnukfreebsd")): > exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) ) > else: >-@@ -2176,9 +2180,7 @@ >+@@ -2226,9 +2230,7 @@ > ext_modules=[Extension('_struct', ['_struct.c'])], > > # Scripts to install >Index: lang/python27/pkg-plist >=================================================================== >--- lang/python27/pkg-plist (revision 359317) >+++ lang/python27/pkg-plist (working copy) >@@ -640,6 +640,13 @@ > %%PYTHON_LIBDIR%%/idlelib/HISTORY.txt > %%PYTHON_LIBDIR%%/idlelib/HyperParser.py > %%PYTHON_LIBDIR%%/idlelib/IOBinding.py >+%%PYTHON_LIBDIR%%/idlelib/Icons/idle.ico >+%%PYTHON_LIBDIR%%/idlelib/Icons/idle_16.gif >+%%PYTHON_LIBDIR%%/idlelib/Icons/idle_16.png >+%%PYTHON_LIBDIR%%/idlelib/Icons/idle_32.gif >+%%PYTHON_LIBDIR%%/idlelib/Icons/idle_32.png >+%%PYTHON_LIBDIR%%/idlelib/Icons/idle_48.gif >+%%PYTHON_LIBDIR%%/idlelib/Icons/idle_48.png > %%PYTHON_LIBDIR%%/idlelib/Icons/folder.gif > %%PYTHON_LIBDIR%%/idlelib/Icons/idle.icns > %%PYTHON_LIBDIR%%/idlelib/Icons/minusnode.gif >@@ -692,6 +699,22 @@ > %%PYTHON_LIBDIR%%/idlelib/idle.bat > %%PYTHON_LIBDIR%%/idlelib/idle.py > %%PYTHON_LIBDIR%%/idlelib/idle.pyw >+%%PYTHON_LIBDIR%%/idlelib/idle_test/README.txt >+%%PYTHON_LIBDIR%%/idlelib/idle_test/__init__.py >+%%PYTHON_LIBDIR%%/idlelib/idle_test/htest.py >+%%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/idlever.py > %%PYTHON_LIBDIR%%/idlelib/keybindingDialog.py > %%PYTHON_LIBDIR%%/idlelib/macosxSupport.py >@@ -911,9 +934,12 @@ > %%PYTHON_LIBDIR%%/lib-tk/Tkinter.py > %%PYTHON_LIBDIR%%/lib-tk/test/README > %%PYTHON_LIBDIR%%/lib-tk/test/runtktests.py >+%%PYTHON_LIBDIR%%/lib-tk/test/widget_tests.py > %%PYTHON_LIBDIR%%/lib-tk/test/test_tkinter/__init__.py > %%PYTHON_LIBDIR%%/lib-tk/test/test_tkinter/test_loadtk.py > %%PYTHON_LIBDIR%%/lib-tk/test/test_tkinter/test_text.py >+%%PYTHON_LIBDIR%%/lib-tk/test/test_tkinter/test_variables.py >+%%PYTHON_LIBDIR%%/lib-tk/test/test_tkinter/test_widgets.py > %%PYTHON_LIBDIR%%/lib-tk/test/test_ttk/__init__.py > %%PYTHON_LIBDIR%%/lib-tk/test/test_ttk/support.py > %%PYTHON_LIBDIR%%/lib-tk/test/test_ttk/test_extensions.py >@@ -1080,6 +1106,7 @@ > %%PYTHON_LIBDIR%%/test/autotest.py > %%PYTHON_LIBDIR%%/test/bad_coding.py > %%PYTHON_LIBDIR%%/test/bad_coding2.py >+%%PYTHON_LIBDIR%%/test/bad_coding3.py > %%PYTHON_LIBDIR%%/test/badcert.pem > %%PYTHON_LIBDIR%%/test/badkey.pem > %%PYTHON_LIBDIR%%/test/badsyntax_future3.py >@@ -1281,6 +1308,17 @@ > %%PYTHON_LIBDIR%%/test/greyrgb.uue > %%PYTHON_LIBDIR%%/test/https_svn_python_org_root.pem > %%PYTHON_LIBDIR%%/test/ieee754.txt >+%%PYTHON_LIBDIR%%/test/imghdrdata/python.bmp >+%%PYTHON_LIBDIR%%/test/imghdrdata/python.gif >+%%PYTHON_LIBDIR%%/test/imghdrdata/python.jpg >+%%PYTHON_LIBDIR%%/test/imghdrdata/python.pbm >+%%PYTHON_LIBDIR%%/test/imghdrdata/python.pgm >+%%PYTHON_LIBDIR%%/test/imghdrdata/python.png >+%%PYTHON_LIBDIR%%/test/imghdrdata/python.ppm >+%%PYTHON_LIBDIR%%/test/imghdrdata/python.ras >+%%PYTHON_LIBDIR%%/test/imghdrdata/python.sgi >+%%PYTHON_LIBDIR%%/test/imghdrdata/python.tiff >+%%PYTHON_LIBDIR%%/test/imghdrdata/python.xbm > %%PYTHON_LIBDIR%%/test/infinite_reload.py > %%PYTHON_LIBDIR%%/test/inspect_fodder.py > %%PYTHON_LIBDIR%%/test/inspect_fodder2.py >@@ -1498,6 +1536,7 @@ > %%PYTHON_LIBDIR%%/test/test_imageop.py > %%PYTHON_LIBDIR%%/test/test_imaplib.py > %%PYTHON_LIBDIR%%/test/test_imgfile.py >+%%PYTHON_LIBDIR%%/test/test_imghdr.py > %%PYTHON_LIBDIR%%/test/test_imp.py > %%PYTHON_LIBDIR%%/test/test_import.py > %%PYTHON_LIBDIR%%/test/test_importhooks.py >@@ -2393,6 +2432,7 @@ > @dirrm %%PYTHON_LIBDIR%%/test/cjkencodings > @dirrm %%PYTHON_LIBDIR%%/test/data > @dirrm %%PYTHON_LIBDIR%%/test/decimaltestdata >+@dirrm %%PYTHON_LIBDIR%%/test/imghdrdata > @dirrm %%PYTHON_LIBDIR%%/test/subprocessdata > @dirrm %%PYTHON_LIBDIR%%/test/tracedmodules > @dirrm %%PYTHON_LIBDIR%%/test/xmltestdata >@@ -2425,6 +2465,7 @@ > @dirrm %%PYTHON_LIBDIR%%/importlib > @dirrm %%PYTHON_LIBDIR%%/json/tests > @dirrm %%PYTHON_LIBDIR%%/json >+@dirrm %%PYTHON_LIBDIR%%/idlelib/idle_test > @dirrm %%PYTHON_LIBDIR%%/idlelib/Icons > @dirrm %%PYTHON_LIBDIR%%/idlelib > @dirrm %%PYTHON_LIBDIR%%/hotshot
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=144157">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 191405
:
144157
|
144240
|
144540