Alexander Pyhalov
2016-12-19 85aa47164cc3e7570db545d15deae4f41fa329a7
Merge pull request #2684 from pyhalov/python-27

1 files deleted
6 files modified
181 ■■■■ changed files
components/python/python27/Makefile 5 ●●●●● patch | view | raw | blame | history
components/python/python27/manifests/sample-manifest.p5m 29 ●●●● patch | view | raw | blame | history
components/python/python27/patches/14-py_db.patch 14 ●●●● patch | view | raw | blame | history
components/python/python27/patches/20-bsddb-harmful.patch 10 ●●●● patch | view | raw | blame | history
components/python/python27/patches/21-CVE-2016-1000110.patch 115 ●●●●● patch | view | raw | blame | history
components/python/python27/python-27-tests.p5m 3 ●●●● patch | view | raw | blame | history
components/python/python27/python-27.p5m 5 ●●●●● patch | view | raw | blame | history
components/python/python27/Makefile
@@ -26,13 +26,12 @@
PATH=/usr/bin:/usr/gnu/bin:/usr/sbin
COMPONENT_NAME=        Python
COMPONENT_VERSION=    2.7.12
COMPONENT_REVISION=    3
COMPONENT_VERSION=    2.7.13
COMPONENT_PROJECT_URL=    http://python.org/
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=    $(COMPONENT_SRC).tar.xz
COMPONENT_ARCHIVE_HASH=    \
    sha256:d7837121dd5652a05fef807c361909d255d173280c4e1a4ded94d73d80a1f978
    sha256:35d543986882f78261f97787fd3e06274bfa6df29fac9b4a94f73930ff98f731
COMPONENT_ARCHIVE_URL=    $(COMPONENT_PROJECT_URL)ftp/python/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)
COMPONENT_SIG_URL=    $(COMPONENT_ARCHIVE_URL).asc
COMPONENT_BUGDB=    utility/python
components/python/python27/manifests/sample-manifest.p5m
@@ -23,7 +23,6 @@
license $(COMPONENT_LICENSE_FILE) license='$(COMPONENT_LICENSE)'
file path=usr/bin/$(MACH64)/2to3
file path=usr/bin/$(MACH64)/check_offset
file path=usr/bin/$(MACH64)/idle
file path=usr/bin/$(MACH64)/pydoc
link path=usr/bin/$(MACH64)/python target=python2
@@ -34,7 +33,6 @@
file path=usr/bin/$(MACH64)/python2.7-config
file path=usr/bin/$(MACH64)/smtpd.py
file path=usr/bin/2to3
file path=usr/bin/check_offset
file path=usr/bin/idle
file path=usr/bin/pydoc
link path=usr/bin/python target=python2
@@ -621,12 +619,8 @@
file path=usr/lib/python2.7/encodings/zlib_codec.py
file path=usr/lib/python2.7/ensurepip/__init__.py
file path=usr/lib/python2.7/ensurepip/__main__.py
file path=usr/lib/python2.7/ensurepip/_bundled/pip-6.1.1-py2.py3-none-any.whl
file path=usr/lib/python2.7/ensurepip/_bundled/pip-7.1.2-py2.py3-none-any.whl
file path=usr/lib/python2.7/ensurepip/_bundled/pip-8.1.1-py2.py3-none-any.whl
file path=usr/lib/python2.7/ensurepip/_bundled/setuptools-15.2-py2.py3-none-any.whl
file path=usr/lib/python2.7/ensurepip/_bundled/setuptools-18.2-py2.py3-none-any.whl
file path=usr/lib/python2.7/ensurepip/_bundled/setuptools-20.10.1-py2.py3-none-any.whl
file path=usr/lib/python2.7/ensurepip/_bundled/pip-9.0.1-py2.py3-none-any.whl
file path=usr/lib/python2.7/ensurepip/_bundled/setuptools-28.8.0-py2.py3-none-any.whl
file path=usr/lib/python2.7/ensurepip/_uninstall.py
file path=usr/lib/python2.7/filecmp.py
file path=usr/lib/python2.7/fileinput.py
@@ -766,7 +760,6 @@
file path=usr/lib/python2.7/idlelib/rpc.py
file path=usr/lib/python2.7/idlelib/run.py
file path=usr/lib/python2.7/idlelib/tabbedpages.py
file path=usr/lib/python2.7/idlelib/testcode.py
file path=usr/lib/python2.7/idlelib/textView.py
file path=usr/lib/python2.7/ihooks.py
file path=usr/lib/python2.7/imaplib.py
@@ -868,9 +861,6 @@
file path=usr/lib/python2.7/lib-dynload/64/unicodedata.so
file path=usr/lib/python2.7/lib-dynload/64/zlib.so
file path=usr/lib/python2.7/lib-dynload/Python-$(COMPONENT_VERSION)-py2.7.egg-info
file path=usr/lib/python2.7/lib-dynload/Python-2.7.10-py2.7.egg-info
file path=usr/lib/python2.7/lib-dynload/Python-2.7.11-py2.7.egg-info
file path=usr/lib/python2.7/lib-dynload/Python-2.7.8-py2.7.egg-info
file path=usr/lib/python2.7/lib-dynload/_bisect.so
file path=usr/lib/python2.7/lib-dynload/_codecs_cn.so
file path=usr/lib/python2.7/lib-dynload/_codecs_hk.so
@@ -978,14 +968,8 @@
file path=usr/lib/python2.7/lib-tk/turtle.py
file path=usr/lib/python2.7/lib2to3/Grammar$(COMPONENT_VERSION).final.0.pickle
file path=usr/lib/python2.7/lib2to3/Grammar.txt
file path=usr/lib/python2.7/lib2to3/Grammar2.7.10.final.0.pickle
file path=usr/lib/python2.7/lib2to3/Grammar2.7.11.final.0.pickle
file path=usr/lib/python2.7/lib2to3/Grammar2.7.8.final.0.pickle
file path=usr/lib/python2.7/lib2to3/PatternGrammar$(COMPONENT_VERSION).final.0.pickle
file path=usr/lib/python2.7/lib2to3/PatternGrammar.txt
file path=usr/lib/python2.7/lib2to3/PatternGrammar2.7.10.final.0.pickle
file path=usr/lib/python2.7/lib2to3/PatternGrammar2.7.11.final.0.pickle
file path=usr/lib/python2.7/lib2to3/PatternGrammar2.7.8.final.0.pickle
file path=usr/lib/python2.7/lib2to3/__init__.py
file path=usr/lib/python2.7/lib2to3/__main__.py
file path=usr/lib/python2.7/lib2to3/btm_matcher.py
@@ -997,7 +981,6 @@
file path=usr/lib/python2.7/lib2to3/fixes/fix_asserts.py
file path=usr/lib/python2.7/lib2to3/fixes/fix_basestring.py
file path=usr/lib/python2.7/lib2to3/fixes/fix_buffer.py
file path=usr/lib/python2.7/lib2to3/fixes/fix_callable.py
file path=usr/lib/python2.7/lib2to3/fixes/fix_dict.py
file path=usr/lib/python2.7/lib2to3/fixes/fix_except.py
file path=usr/lib/python2.7/lib2to3/fixes/fix_exec.py
@@ -1217,6 +1200,7 @@
file path=usr/lib/python2.7/test/Sine-1000Hz-300ms.aif
file path=usr/lib/python2.7/test/__init__.py
file path=usr/lib/python2.7/test/_mock_backport.py
file path=usr/lib/python2.7/test/allsans.pem
file path=usr/lib/python2.7/test/audiodata/pluck-pcm16.aiff
file path=usr/lib/python2.7/test/audiodata/pluck-pcm16.au
file path=usr/lib/python2.7/test/audiodata/pluck-pcm16.wav
@@ -1246,7 +1230,6 @@
file path=usr/lib/python2.7/test/badsyntax_future8.py
file path=usr/lib/python2.7/test/badsyntax_future9.py
file path=usr/lib/python2.7/test/badsyntax_nocaret.py
file path=usr/lib/python2.7/test/buffer_tests.py
file path=usr/lib/python2.7/test/capath/0e4015b9.0
file path=usr/lib/python2.7/test/capath/4e1295a3.0
file path=usr/lib/python2.7/test/capath/5ed36f99.0
@@ -1254,7 +1237,6 @@
file path=usr/lib/python2.7/test/capath/99d0fa06.0
file path=usr/lib/python2.7/test/capath/ce7b8643.0
file path=usr/lib/python2.7/test/cfgparser.1
file path=usr/lib/python2.7/test/check_soundcard.vbs
file path=usr/lib/python2.7/test/cjkencodings/big5-utf8.txt
file path=usr/lib/python2.7/test/cjkencodings/big5.txt
file path=usr/lib/python2.7/test/cjkencodings/big5hkscs-utf8.txt
@@ -1442,7 +1424,6 @@
file path=usr/lib/python2.7/test/formatfloat_testcases.txt
file path=usr/lib/python2.7/test/gdb_sample.py
file path=usr/lib/python2.7/test/greyrgb.uue
file path=usr/lib/python2.7/test/https_svn_python_org_root.pem
file path=usr/lib/python2.7/test/ieee754.txt
file path=usr/lib/python2.7/test/imghdrdata/python.bmp
file path=usr/lib/python2.7/test/imghdrdata/python.gif
@@ -1502,6 +1483,7 @@
file path=usr/lib/python2.7/test/ssl_key.passwd.pem
file path=usr/lib/python2.7/test/ssl_key.pem
file path=usr/lib/python2.7/test/ssl_servers.py
file path=usr/lib/python2.7/test/ssltests.py
file path=usr/lib/python2.7/test/string_tests.py
file path=usr/lib/python2.7/test/subprocessdata/sigchild_ignore.py
file path=usr/lib/python2.7/test/symlink_support.py
@@ -1573,7 +1555,6 @@
file path=usr/lib/python2.7/test/test_codecmaps_tw.py
file path=usr/lib/python2.7/test/test_codecs.py
file path=usr/lib/python2.7/test/test_codeop.py
file path=usr/lib/python2.7/test/test_coding.py
file path=usr/lib/python2.7/test/test_coercion.py
file path=usr/lib/python2.7/test/test_collections.py
file path=usr/lib/python2.7/test/test_colorsys.py
@@ -1756,9 +1737,7 @@
file path=usr/lib/python2.7/test/test_pdb.py
file path=usr/lib/python2.7/test/test_peepholer.py
file path=usr/lib/python2.7/test/test_pep247.py
file path=usr/lib/python2.7/test/test_pep263.py
file path=usr/lib/python2.7/test/test_pep277.py
file path=usr/lib/python2.7/test/test_pep292.py
file path=usr/lib/python2.7/test/test_pep352.py
file path=usr/lib/python2.7/test/test_pickle.py
file path=usr/lib/python2.7/test/test_pickletools.py
components/python/python27/patches/14-py_db.patch
@@ -1,18 +1,18 @@
This patch adds Python debugger support.  It may be contributed upstream at
some point, but the suitability (or lack thereof) has not yet been determined.
--- Python-2.7.9/Makefile.pre.in.~3~    2014-12-11 09:28:46.856724815 -0800
+++ Python-2.7.9/Makefile.pre.in    2014-12-11 09:30:15.502371832 -0800
@@ -410,7 +410,7 @@
--- Python-2.7.13/Makefile.pre.in.~2~    2016-12-19 19:45:55.359307641 +0300
+++ Python-2.7.13/Makefile.pre.in    2016-12-19 19:46:55.550550819 +0300
@@ -431,7 +431,7 @@
 
 # Default target
 all:        build_all
 all:        @DEF_MAKE_ALL_RULE@
-build_all:    $(BUILDPYTHON) oldsharedmods sharedmods gdbhooks
+build_all:    $(BUILDPYTHON) oldsharedmods sharedmods gdbhooks build-py_db
 
 # Compile a binary with gcc profile guided optimization.
 # Compile a binary with profile guided optimization.
 profile-opt:
@@ -791,6 +791,15 @@
@@ -856,6 +856,15 @@
 
 $(LIBRARY_OBJS) $(MODOBJS) Modules/python.o: $(PYTHON_HEADERS)
 
@@ -28,7 +28,7 @@
 
 ######################################################################
 
@@ -855,7 +864,7 @@
@@ -920,7 +929,7 @@
         $(TESTPYTHON) $(TESTPROG) $(MEMTESTOPTS)
 
 # Install everything
components/python/python27/patches/20-bsddb-harmful.patch
@@ -3,17 +3,17 @@
dump core.  So skip it.  The module is removed in Python 3, so this patch
is not being submitted upstream.
--- Python-2.7.6/Makefile.pre.in.~4~    2014-05-14 16:20:56.889089787 -0700
+++ Python-2.7.6/Makefile.pre.in    2014-05-14 16:21:12.651500578 -0700
@@ -972,7 +972,7 @@
         email email/mime email/test email/test/data \
--- Python-2.7.13/Makefile.pre.in.~3~    2016-12-19 19:49:29.882892296 +0300
+++ Python-2.7.13/Makefile.pre.in    2016-12-19 19:49:29.987869375 +0300
@@ -1073,7 +1073,7 @@
         ensurepip ensurepip/_bundled \
         json json/tests \
         sqlite3 sqlite3/test \
-        logging bsddb bsddb/test csv importlib wsgiref \
+        logging csv importlib wsgiref \
         lib2to3 lib2to3/fixes lib2to3/pgen2 lib2to3/tests \
         lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \
         ctypes ctypes/test ctypes/macholib idlelib idlelib/Icons \
         ctypes ctypes/test ctypes/macholib \
--- Python-2.7.6/setup.py.~6~    2014-05-14 17:15:45.315760008 -0700
+++ Python-2.7.6/setup.py    2014-05-14 17:16:27.440642039 -0700
@@ -1065,7 +1065,8 @@
components/python/python27/patches/21-CVE-2016-1000110.patch
File was deleted
components/python/python27/python-27-tests.p5m
@@ -304,6 +304,7 @@
file path=usr/lib/python2.7/test/Sine-1000Hz-300ms.aif
file path=usr/lib/python2.7/test/__init__.py
file path=usr/lib/python2.7/test/_mock_backport.py
file path=usr/lib/python2.7/test/allsans.pem
file path=usr/lib/python2.7/test/audiodata/pluck-pcm16.aiff
file path=usr/lib/python2.7/test/audiodata/pluck-pcm16.au
file path=usr/lib/python2.7/test/audiodata/pluck-pcm16.wav
@@ -340,7 +341,6 @@
file path=usr/lib/python2.7/test/capath/99d0fa06.0
file path=usr/lib/python2.7/test/capath/ce7b8643.0
file path=usr/lib/python2.7/test/cfgparser.1
file path=usr/lib/python2.7/test/check_soundcard.vbs
file path=usr/lib/python2.7/test/cjkencodings/big5-utf8.txt
file path=usr/lib/python2.7/test/cjkencodings/big5.txt
file path=usr/lib/python2.7/test/cjkencodings/big5hkscs-utf8.txt
@@ -586,6 +586,7 @@
file path=usr/lib/python2.7/test/ssl_key.passwd.pem
file path=usr/lib/python2.7/test/ssl_key.pem
file path=usr/lib/python2.7/test/ssl_servers.py
file path=usr/lib/python2.7/test/ssltests.py
file path=usr/lib/python2.7/test/string_tests.py
file path=usr/lib/python2.7/test/subprocessdata/sigchild_ignore.py
file path=usr/lib/python2.7/test/symlink_support.py
components/python/python27/python-27.p5m
@@ -473,8 +473,8 @@
file path=usr/lib/python2.7/encodings/zlib_codec.py
file path=usr/lib/python2.7/ensurepip/__init__.py
file path=usr/lib/python2.7/ensurepip/__main__.py
file path=usr/lib/python2.7/ensurepip/_bundled/pip-8.1.1-py2.py3-none-any.whl
file path=usr/lib/python2.7/ensurepip/_bundled/setuptools-20.10.1-py2.py3-none-any.whl
file path=usr/lib/python2.7/ensurepip/_bundled/pip-9.0.1-py2.py3-none-any.whl
file path=usr/lib/python2.7/ensurepip/_bundled/setuptools-28.8.0-py2.py3-none-any.whl
file path=usr/lib/python2.7/ensurepip/_uninstall.py
file path=usr/lib/python2.7/filecmp.py
file path=usr/lib/python2.7/fileinput.py
@@ -749,7 +749,6 @@
file path=usr/lib/python2.7/lib2to3/fixes/fix_asserts.py
file path=usr/lib/python2.7/lib2to3/fixes/fix_basestring.py
file path=usr/lib/python2.7/lib2to3/fixes/fix_buffer.py
file path=usr/lib/python2.7/lib2to3/fixes/fix_callable.py
file path=usr/lib/python2.7/lib2to3/fixes/fix_dict.py
file path=usr/lib/python2.7/lib2to3/fixes/fix_except.py
file path=usr/lib/python2.7/lib2to3/fixes/fix_exec.py