Attachment 171990 Details for Bug 210685 – New patch to fix py33-sqlite3 and others.

New patch to fix py33-sqlite3 and others.

python27.diff.txt (text/plain), 10.39 KB, created by Wen Heping on 2016-07-01 02:22:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Wen Heping

Created: 2016-07-01 02:22:58 UTC

Size: 10.39 KB

patch

obsolete

>Index: lang/python27/Makefile
>===================================================================
>--- lang/python27/Makefile	(revision 417797)
>+++ lang/python27/Makefile	(working copy)
>@@ -2,7 +2,6 @@
> 
> PORTNAME=	python27
> PORTVERSION=	${PYTHON_PORTVERSION}
>-PORTREVISION=	3
> CATEGORIES=	lang python ipv6
> MASTER_SITES=	PYTHON/ftp/python/${PORTVERSION}
> DISTNAME=	Python-${PORTVERSION}
>Index: lang/python27/Makefile.version
>===================================================================
>--- lang/python27/Makefile.version	(revision 417797)
>+++ lang/python27/Makefile.version	(working copy)
>@@ -1,4 +1,4 @@
> # Mk/Uses/python.mk includes this file, don't remove it!
> # $FreeBSD$
> 
>-PYTHON_PORTVERSION=	2.7.11
>+PYTHON_PORTVERSION=	2.7.12
>Index: lang/python27/distinfo
>===================================================================
>--- lang/python27/distinfo	(revision 417797)
>+++ lang/python27/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (python/Python-2.7.11.tar.xz) = 962b4c45af50124ea61f11a30deb4342fc0bc21126790fa1d7f6c79809413f46
>-SIZE (python/Python-2.7.11.tar.xz) = 12277476
>+TIMESTAMP = 1467158541
>+SHA256 (python/Python-2.7.12.tar.xz) = d7837121dd5652a05fef807c361909d255d173280c4e1a4ded94d73d80a1f978
>+SIZE (python/Python-2.7.12.tar.xz) = 12390820
>Index: lang/python27/files/patch-Modules_zipimport.c
>===================================================================
>--- lang/python27/files/patch-Modules_zipimport.c	(revision 417797)
>+++ lang/python27/files/patch-Modules_zipimport.c	(nonexistent)
>@@ -1,17 +0,0 @@
>-
>-Bug: http://bugs.python.org/issue26171
>-
>---- Modules/zipimport.c.orig	2015-12-05 19:47:16 UTC
>-+++ Modules/zipimport.c
>-@@ -895,6 +895,11 @@ get_data(char *archive, PyObject *toc_en
>-         PyMarshal_ReadShortFromFile(fp);        /* local header size */
>-     file_offset += l;           /* Start of file data */
>- 
>-+    if (data_size > LONG_MAX - 1) {
>-+        fclose(fp);
>-+        PyErr_NoMemory();
>-+        return NULL;
>-+    }
>-     raw_data = PyString_FromStringAndSize((char *)NULL, compress == 0 ?
>-                                           data_size : data_size + 1);
>-     if (raw_data == NULL) {
>
>Property changes on: lang/python27/files/patch-Modules_zipimport.c
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: lang/python27/pkg-plist
>===================================================================
>--- lang/python27/pkg-plist	(revision 417797)
>+++ lang/python27/pkg-plist	(working copy)
>@@ -1436,8 +1436,8 @@
> lib/python2.7/ensurepip/__main__.py
> lib/python2.7/ensurepip/__main__.pyc
> lib/python2.7/ensurepip/__main__.pyo
>-lib/python2.7/ensurepip/_bundled/pip-7.1.2-py2.py3-none-any.whl
>-lib/python2.7/ensurepip/_bundled/setuptools-18.2-py2.py3-none-any.whl
>+lib/python2.7/ensurepip/_bundled/pip-8.1.1-py2.py3-none-any.whl
>+lib/python2.7/ensurepip/_bundled/setuptools-20.10.1-py2.py3-none-any.whl
> lib/python2.7/ensurepip/_uninstall.py
> lib/python2.7/ensurepip/_uninstall.pyc
> lib/python2.7/ensurepip/_uninstall.pyo
>@@ -1729,6 +1729,9 @@
> lib/python2.7/idlelib/idle_test/test_delegator.py
> lib/python2.7/idlelib/idle_test/test_delegator.pyo
> lib/python2.7/idlelib/idle_test/test_delegator.pyc
>+lib/python2.7/idlelib/idle_test/test_editmenu.py
>+lib/python2.7/idlelib/idle_test/test_editmenu.pyo
>+lib/python2.7/idlelib/idle_test/test_editmenu.pyc
> lib/python2.7/idlelib/idle_test/test_formatparagraph.py
> lib/python2.7/idlelib/idle_test/test_formatparagraph.pyo
> lib/python2.7/idlelib/idle_test/test_formatparagraph.pyc
>@@ -1735,6 +1738,9 @@
> lib/python2.7/idlelib/idle_test/test_grep.py
> lib/python2.7/idlelib/idle_test/test_grep.pyo
> lib/python2.7/idlelib/idle_test/test_grep.pyc
>+lib/python2.7/idlelib/idle_test/test_helpabout.py
>+lib/python2.7/idlelib/idle_test/test_helpabout.pyo
>+lib/python2.7/idlelib/idle_test/test_helpabout.pyc
> lib/python2.7/idlelib/idle_test/test_hyperparser.py
> lib/python2.7/idlelib/idle_test/test_hyperparser.pyo
> lib/python2.7/idlelib/idle_test/test_hyperparser.pyc
>@@ -2723,13 +2729,12 @@
> lib/python2.7/test/badsyntax_future8.py
> lib/python2.7/test/badsyntax_future9.py
> lib/python2.7/test/badsyntax_nocaret.py
>-lib/python2.7/test/buffer_tests.py
>-lib/python2.7/test/buffer_tests.pyo
>-lib/python2.7/test/buffer_tests.pyc
>+lib/python2.7/test/capath/0e4015b9.0
> lib/python2.7/test/capath/4e1295a3.0
> lib/python2.7/test/capath/5ed36f99.0
> lib/python2.7/test/capath/6e88d7b8.0
> lib/python2.7/test/capath/99d0fa06.0
>+lib/python2.7/test/capath/ce7b8643.0
> lib/python2.7/test/cfgparser.1
> lib/python2.7/test/check_soundcard.vbs
> lib/python2.7/test/cmath_testcases.txt
>@@ -2929,7 +2934,6 @@
> lib/python2.7/test/gdb_sample.pyo
> lib/python2.7/test/gdb_sample.pyc
> lib/python2.7/test/greyrgb.uue
>-lib/python2.7/test/https_svn_python_org_root.pem
> lib/python2.7/test/ieee754.txt
> lib/python2.7/test/imghdrdata/python.bmp
> lib/python2.7/test/imghdrdata/python.gif
>@@ -3252,9 +3256,6 @@
> lib/python2.7/test/test_codeop.py
> lib/python2.7/test/test_codeop.pyo
> lib/python2.7/test/test_codeop.pyc
>-lib/python2.7/test/test_coding.py
>-lib/python2.7/test/test_coding.pyo
>-lib/python2.7/test/test_coding.pyc
> lib/python2.7/test/test_coercion.py
> lib/python2.7/test/test_coercion.pyo
> lib/python2.7/test/test_coercion.pyc
>@@ -3770,6 +3771,9 @@
> lib/python2.7/test/test_optparse.py
> lib/python2.7/test/test_optparse.pyo
> lib/python2.7/test/test_optparse.pyc
>+lib/python2.7/test/test_ordered_dict.py
>+lib/python2.7/test/test_ordered_dict.pyo
>+lib/python2.7/test/test_ordered_dict.pyc
> lib/python2.7/test/test_os.py
> lib/python2.7/test/test_os.pyo
> lib/python2.7/test/test_os.pyc
>@@ -3788,15 +3792,9 @@
> lib/python2.7/test/test_pep247.py
> lib/python2.7/test/test_pep247.pyo
> lib/python2.7/test/test_pep247.pyc
>-lib/python2.7/test/test_pep263.py
>-lib/python2.7/test/test_pep263.pyo
>-lib/python2.7/test/test_pep263.pyc
> lib/python2.7/test/test_pep277.py
> lib/python2.7/test/test_pep277.pyo
> lib/python2.7/test/test_pep277.pyc
>-lib/python2.7/test/test_pep292.py
>-lib/python2.7/test/test_pep292.pyo
>-lib/python2.7/test/test_pep292.pyc
> lib/python2.7/test/test_pep352.py
> lib/python2.7/test/test_pep352.pyo
> lib/python2.7/test/test_pep352.pyc
>@@ -3980,6 +3978,9 @@
> lib/python2.7/test/test_sort.py
> lib/python2.7/test/test_sort.pyo
> lib/python2.7/test/test_sort.pyc
>+lib/python2.7/test/test_source_encoding.py
>+lib/python2.7/test/test_source_encoding.pyo
>+lib/python2.7/test/test_source_encoding.pyc
> lib/python2.7/test/test_spwd.py
> lib/python2.7/test/test_spwd.pyo
> lib/python2.7/test/test_spwd.pyc
>@@ -4127,6 +4128,9 @@
> lib/python2.7/test/test_tuple.py
> lib/python2.7/test/test_tuple.pyo
> lib/python2.7/test/test_tuple.pyc
>+lib/python2.7/test/test_turtle.py
>+lib/python2.7/test/test_turtle.pyo
>+lib/python2.7/test/test_turtle.pyc
> lib/python2.7/test/test_typechecks.py
> lib/python2.7/test/test_typechecks.pyo
> lib/python2.7/test/test_typechecks.pyc
>Index: devel/py-setuptools/Makefile
>===================================================================
>--- devel/py-setuptools/Makefile	(revision 417797)
>+++ devel/py-setuptools/Makefile	(working copy)
>@@ -1,7 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	setuptools
>-PORTVERSION=	20.0
>+PORTVERSION=	23.1.0
> CATEGORIES=	devel python
> MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
>Index: devel/py-setuptools/distinfo
>===================================================================
>--- devel/py-setuptools/distinfo	(revision 417797)
>+++ devel/py-setuptools/distinfo	(working copy)
>@@ -1,2 +1,3 @@
>-SHA256 (python/setuptools-20.0.tar.gz) = a6f7b295f399fed3de918c4bea9e2053a5fbd9e3a55a6fef7aafe9d1f474866d
>-SIZE (python/setuptools-20.0.tar.gz) = 641692
>+TIMESTAMP = 1467171497
>+SHA256 (python/setuptools-23.1.0.tar.gz) = 4e269d36ba2313e6236f384b36eb97b3433cf99a16b94c74cca7eee2b311f2be
>+SIZE (python/setuptools-23.1.0.tar.gz) = 601865
>Index: databases/py-sqlite3/files/setup.py
>===================================================================
>--- databases/py-sqlite3/files/setup.py	(revision 417797)
>+++ databases/py-sqlite3/files/setup.py	(working copy)
>@@ -38,7 +38,7 @@
> except AttributeError:
>     macros.append(('SQLITE_OMIT_LOAD_EXTENSION', '1'))
> 
>-setup(name = "_sqlite3",
>+setup(name = "sqlite3",
>       description = "SQLite 3 extension to Python",
> 
>       ext_modules = [Extension('_sqlite3', sqlite_srcs,
>Index: databases/py-sqlite3/files/setup3.py
>===================================================================
>--- databases/py-sqlite3/files/setup3.py	(revision 417797)
>+++ databases/py-sqlite3/files/setup3.py	(working copy)
>@@ -37,7 +37,7 @@
> except AttributeError:
>     macros.append(('SQLITE_OMIT_LOAD_EXTENSION', '1'))
> 
>-setup(name = "_sqlite3",
>+setup(name = "sqlite3",
>       description = "SQLite 3 extension to Python",
> 
>       ext_modules = [Extension('_sqlite3', sqlite_srcs,
>Index: databases/py-bsddb/files/setup.py
>===================================================================
>--- databases/py-bsddb/files/setup.py	(revision 417797)
>+++ databases/py-bsddb/files/setup.py	(working copy)
>@@ -22,7 +22,7 @@
> lib_dirs = [prefix + "/lib"]
> libs = [os.environ['BSDDB_VERSION']]
> 
>-setup(name = "_bsddb",
>+setup(name = "bsddb",
>       description = "BSDDB Extension to Python",
> 
>       ext_modules = [Extension('_bsddb', ['_bsddb.c'],
>Index: lang/python-doc-html/distinfo
>===================================================================
>--- lang/python-doc-html/distinfo	(revision 417858)
>+++ lang/python-doc-html/distinfo	(working copy)
>@@ -22,3 +22,11 @@
> SIZE (python/python-3.4.3-docs-pdf-a4.tar.bz2) = 11803193
> SHA256 (python/python-3.4.3-docs-pdf-letter.tar.bz2) = 6441397672b65c95cb589e8a9b0ccde3b32063906ee980df2d1db021337bcc3a
> SIZE (python/python-3.4.3-docs-pdf-letter.tar.bz2) = 11894229
>+SHA256 (python/python-2.7.12-docs-html.tar.bz2) = 40891e010cdd9a752a17bd02e30aa853f9a2a7767ee82911cf4507dfa3b13de8
>+SIZE (python/python-2.7.12-docs-html.tar.bz2) = 4601696
>+SHA256 (python/python-2.7.12-docs-pdf-a4.tar.bz2) = d7d2d1941855520220ab37f474d5534b8ffe1e0f073e62b14e5d5780caae7ddc
>+SIZE (python/python-2.7.12-docs-pdf-a4.tar.bz2) = 10687064
>+SHA256 (python/python-2.7.12-docs-pdf-letter.tar.bz2) = c501cd12eb666b3dab32dd4ecf91d873e9a578401afcb94f7e0a3529a971eee0
>+SIZE (python/python-2.7.12-docs-pdf-letter.tar.bz2) = 10741538
>+SHA256 (python/python-2.7.12-docs-text.tar.bz2) = 83a39db742ccae75c2660ea816a5c71ceffb8ad67238a7cbbb31d992725e87ea
>+SIZE (python/python-2.7.12-docs-text.tar.bz2) = 1610618

Actions: View

Attachments on bug 210685: 171938 | 171940 | 171990