# HG changeset patch # User John Beck # Date 1424925871 28800 # Node ID eb4c6284602f0b1c1723ab3bbe3fea483a009483 # Parent e12ff6f7add3981fe52f7072b9cfe78ce0af5275 20605341 update Python to 3.4.3 20605333 problem in UTILITY/PYTHON diff -r e12ff6f7add3 -r eb4c6284602f components/python/python34/Makefile --- a/components/python/python34/Makefile Thu Jan 01 10:27:03 2015 -0800 +++ b/components/python/python34/Makefile Wed Feb 25 20:44:31 2015 -0800 @@ -26,16 +26,17 @@ include ../../../make-rules/shared-macros.mk COMPONENT_NAME= Python -COMPONENT_VERSION= 3.4.2 +COMPONENT_VERSION= 3.4.3 COMPONENT_PROJECT_URL= http://python.org/ COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.xz COMPONENT_ARCHIVE_HASH= \ - sha256:1c6d9682d145c056537e477bbfa060ce727f9edd38df1827e0f970dcf04b2def + sha256:b5b3963533768d5fc325a4d7a6bd6f666726002d696f1d399ec06b043ea996b8 COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)ftp/python/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE) +COMPONENT_SIG_URL= $(COMPONENT_ARCHIVE_URL).asc COMPONENT_BUGDB= utility/python -TPNO= 19421 +TPNO= 21686 include $(WS_MAKE_RULES)/prep.mk include $(WS_MAKE_RULES)/configure.mk diff -r e12ff6f7add3 -r eb4c6284602f components/python/python34/patches/00-dtrace.patch --- a/components/python/python34/patches/00-dtrace.patch Thu Jan 01 10:27:03 2015 -0800 +++ b/components/python/python34/patches/00-dtrace.patch Wed Feb 25 20:44:31 2015 -0800 @@ -1011,9 +1011,9 @@ +if __name__ == '__main__': + test_main() + ---- Python-3.4.2/Lib/test/test_sys.py.~1~ 2014-09-22 05:57:02.000000000 -0700 -+++ Python-3.4.2/Lib/test/test_sys.py 2014-09-22 11:46:06.131047596 -0700 -@@ -729,6 +729,7 @@ +--- Python-3.4.3/Lib/test/test_sys.py.~1~ 2015-02-25 03:27:45.000000000 -0800 ++++ Python-3.4.3/Lib/test/test_sys.py 2015-02-25 07:32:22.294936251 -0800 +@@ -761,6 +761,7 @@ self.assertEqual(sys.getsizeof(True, -1), size('') + self.longdigit) def test_objecttypes(self): @@ -1021,7 +1021,7 @@ # check all types defined in Objects/ size = test.support.calcobjsize vsize = test.support.calcvobjsize -@@ -754,13 +755,17 @@ +@@ -786,13 +787,17 @@ return inner check(get_cell().__closure__[0], size('P')) # code @@ -1042,8 +1042,8 @@ # complex check(complex(0,1), size('2d')) # method_descriptor (descriptor object) ---- Python-3.4.2/Makefile.pre.in.~1~ 2014-09-22 05:57:02.000000000 -0700 -+++ Python-3.4.2/Makefile.pre.in 2014-09-22 11:47:52.199531636 -0700 +--- Python-3.4.3/Makefile.pre.in.~1~ 2015-02-25 03:27:45.000000000 -0800 ++++ Python-3.4.3/Makefile.pre.in 2015-02-25 07:37:27.789785457 -0800 @@ -52,6 +52,13 @@ # Use this to make a link between python$(VERSION) and python in $(BINDIR) LN= @LN@ @@ -1058,7 +1058,7 @@ # Portable install script (configure doesn't always guess right) INSTALL= @INSTALL@ INSTALL_PROGRAM=@INSTALL_PROGRAM@ -@@ -584,7 +591,7 @@ +@@ -585,7 +592,7 @@ $(AR) $(ARFLAGS) $@ $(MODOBJS) $(RANLIB) $@ @@ -1067,7 +1067,7 @@ if test $(INSTSONAME) != $(LDLIBRARY); then \ $(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \ $(LN) -f $(INSTSONAME) $@; \ -@@ -595,9 +602,8 @@ +@@ -596,9 +603,8 @@ libpython3.so: libpython$(LDVERSION).so $(BLDSHARED) $(NO_AS_NEEDED) -o $@ -Wl,-h$@ $^ @@ -1079,7 +1079,7 @@ libpython$(VERSION).sl: $(LIBRARY_OBJS) $(LDSHARED) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST) -@@ -697,12 +703,18 @@ +@@ -698,12 +704,18 @@ $(MODULE_OBJS) \ $(SIGNAL_OBJS) \ $(MODOBJS) \ @@ -1098,7 +1098,7 @@ Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile $(CC) -c $(PY_CORE_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \ -@@ -835,6 +847,46 @@ +@@ -836,6 +848,46 @@ Objects/typeslots.inc: $(srcdir)/Include/typeslots.h $(srcdir)/Objects/typeslots.py $(PYTHON) $(srcdir)/Objects/typeslots.py < $(srcdir)/Include/typeslots.h > Objects/typeslots.inc @@ -1145,7 +1145,7 @@ ############################################################################ # Header files -@@ -1531,6 +1583,11 @@ +@@ -1535,6 +1587,11 @@ find build -name '*.py[co]' -exec rm -f {} ';' || true -rm -f pybuilddir.txt -rm -f Lib/lib2to3/*Grammar*.pickle @@ -1157,7 +1157,7 @@ -rm -f Modules/_testembed Modules/_freeze_importlib profile-removal: -@@ -1562,6 +1619,11 @@ +@@ -1566,6 +1623,11 @@ -o -name '*.orig' -o -name '*.rej' \ -o -name '*.bak' ')' \ -exec rm -f {} ';' @@ -1355,8 +1355,8 @@ _PyObject_GC_TRACK(f); return f; } ---- Python-3.4.0/Objects/typeobject.c -+++ Python-3.4.0/Objects/typeobject.c +--- Python-3.4.3/Objects/typeobject.c.~1~ 2015-02-25 03:27:46.000000000 -0800 ++++ Python-3.4.3/Objects/typeobject.c 2015-02-25 07:39:20.467592808 -0800 @@ -4,6 +4,10 @@ #include "frameobject.h" #include "structmember.h" @@ -1368,7 +1368,7 @@ #include -@@ -880,8 +884,29 @@ +@@ -909,8 +913,29 @@ PyType_GenericAlloc(PyTypeObject *type, Py_ssize_t nitems) { PyObject *obj; @@ -1399,7 +1399,7 @@ if (PyType_IS_GC(type)) obj = _PyObject_GC_Malloc(size); -@@ -903,6 +928,23 @@ +@@ -932,6 +957,23 @@ if (PyType_IS_GC(type)) _PyObject_GC_TRACK(obj); @@ -1423,7 +1423,7 @@ return obj; } -@@ -1023,9 +1065,56 @@ +@@ -1052,9 +1094,56 @@ return 0; } @@ -1480,8 +1480,8 @@ PyTypeObject *type, *base; destructor basedealloc; PyThreadState *tstate = PyThreadState_GET(); ---- Python-3.4.2/Python/ceval.c.~1~ 2014-09-22 05:57:05.000000000 -0700 -+++ Python-3.4.2/Python/ceval.c 2014-09-22 11:50:27.740913482 -0700 +--- Python-3.4.3/Python/ceval.c.~1~ 2015-02-25 03:27:46.000000000 -0800 ++++ Python-3.4.3/Python/ceval.c 2015-02-25 07:40:45.132085013 -0800 @@ -18,6 +18,13 @@ #include @@ -1496,7 +1496,7 @@ #ifndef WITH_TSC #define READ_TIMESTAMP(var) -@@ -119,6 +126,12 @@ +@@ -121,6 +128,12 @@ #define CALL_FLAG_VAR 1 #define CALL_FLAG_KW 2 @@ -1509,7 +1509,7 @@ #ifdef LLTRACE static int lltrace; static int prtrace(PyObject *, char *); -@@ -778,6 +791,49 @@ +@@ -780,6 +793,49 @@ NULL, NULL); } @@ -1559,7 +1559,7 @@ /* Interpreter main loop */ -@@ -789,8 +845,16 @@ +@@ -791,8 +847,16 @@ return PyEval_EvalFrameEx(f, 0); } @@ -1576,7 +1576,7 @@ { #ifdef DXPAIRS int lastopcode = 0; -@@ -911,7 +975,7 @@ +@@ -913,7 +977,7 @@ #ifdef LLTRACE #define FAST_DISPATCH() \ { \ @@ -1585,7 +1585,7 @@ f->f_lasti = INSTR_OFFSET(); \ goto *opcode_targets[*next_instr++]; \ } \ -@@ -920,7 +984,7 @@ +@@ -922,7 +986,7 @@ #else #define FAST_DISPATCH() \ { \ @@ -1594,7 +1594,7 @@ f->f_lasti = INSTR_OFFSET(); \ goto *opcode_targets[*next_instr++]; \ } \ -@@ -1156,6 +1220,11 @@ +@@ -1158,6 +1222,11 @@ } } @@ -1606,7 +1606,7 @@ co = f->f_code; names = co->co_names; consts = co->co_consts; -@@ -1350,6 +1419,12 @@ +@@ -1352,6 +1421,12 @@ /* Main switch on opcode */ READ_TIMESTAMP(inst0); @@ -1619,7 +1619,7 @@ switch (opcode) { /* BEWARE! -@@ -3223,6 +3298,10 @@ +@@ -3226,6 +3301,10 @@ /* pop frame */ exit_eval_frame: @@ -1630,7 +1630,7 @@ Py_LeaveRecursiveCall(); f->f_executing = 0; tstate->frame = f->f_back; -@@ -3922,6 +4001,57 @@ +@@ -3925,6 +4004,57 @@ return result; } @@ -1688,7 +1688,7 @@ PyObject * _PyEval_CallTracing(PyObject *func, PyObject *args) { -@@ -3939,6 +4069,51 @@ +@@ -3942,6 +4072,51 @@ return result; } @@ -1740,8 +1740,8 @@ /* See Objects/lnotab_notes.txt for a description of how tracing works. */ static int maybe_call_line_trace(Py_tracefunc func, PyObject *obj, ---- Python-3.4.2/configure.~1~ 2014-09-22 05:57:05.000000000 -0700 -+++ Python-3.4.2/configure 2014-09-22 12:48:32.849088475 -0700 +--- Python-3.4.3/configure.~1~ 2015-02-25 03:27:46.000000000 -0800 ++++ Python-3.4.3/configure 2015-02-25 07:42:00.367566318 -0800 @@ -642,6 +642,11 @@ MACHDEP_OBJS DYNLOADFILE @@ -1754,7 +1754,7 @@ THREADOBJ LDLAST USE_THREAD_MODULE -@@ -812,6 +817,7 @@ +@@ -814,6 +819,7 @@ with_tsc with_pymalloc with_valgrind @@ -1762,7 +1762,7 @@ with_fpectl with_libm with_libc -@@ -1495,6 +1501,7 @@ +@@ -1500,6 +1506,7 @@ --with(out)-tsc enable/disable timestamp counter profile --with(out)-pymalloc disable/enable specialized mallocs --with-valgrind Enable Valgrind support @@ -1770,7 +1770,7 @@ --with-fpectl enable SIGFPE catching --with-libm=STRING math library --with-libc=STRING C library -@@ -10386,6 +10393,174 @@ +@@ -10460,6 +10467,174 @@ OPT="-DDYNAMIC_ANNOTATIONS_ENABLED=1 $OPT" fi @@ -1945,9 +1945,9 @@ # -I${DLINCLDIR} is added to the compile rule for importdl.o DLINCLDIR=. ---- Python-3.4.2/configure.ac.~1~ 2014-09-22 05:57:05.000000000 -0700 -+++ Python-3.4.2/configure.ac 2014-09-22 12:51:15.173895356 -0700 -@@ -2874,6 +2874,62 @@ +--- Python-3.4.3/configure.ac.~1~ 2015-02-25 03:27:46.000000000 -0800 ++++ Python-3.4.3/configure.ac 2015-02-25 07:45:54.186719967 -0800 +@@ -2877,6 +2877,62 @@ OPT="-DDYNAMIC_ANNOTATIONS_ENABLED=1 $OPT" fi @@ -2010,9 +2010,9 @@ # -I${DLINCLDIR} is added to the compile rule for importdl.o AC_SUBST(DLINCLDIR) DLINCLDIR=. ---- Python-3.4.0/pyconfig.h.in -+++ Python-3.4.0/pyconfig.h.in -@@ -1328,6 +1328,9 @@ +--- Python-3.4.3/pyconfig.h.in.~1~ 2015-02-25 03:27:46.000000000 -0800 ++++ Python-3.4.3/pyconfig.h.in 2015-02-25 07:51:33.792536393 -0800 +@@ -1334,6 +1334,9 @@ /* Define if you want documentation strings in extension modules */ #undef WITH_DOC_STRINGS diff -r e12ff6f7add3 -r eb4c6284602f components/python/python34/patches/05-studio-profile.patch --- a/components/python/python34/patches/05-studio-profile.patch Thu Jan 01 10:27:03 2015 -0800 +++ b/components/python/python34/patches/05-studio-profile.patch Wed Feb 25 20:44:31 2015 -0800 @@ -4,9 +4,9 @@ that the profiling options be used at all steps of the build -- not just compilation. As it is Solaris-specific, it is not suitable for upstream. ---- Python-3.4.2/Makefile.pre.in.~2~ 2014-09-22 14:03:21.153426271 -0700 -+++ Python-3.4.2/Makefile.pre.in 2014-09-22 14:03:21.234552368 -0700 -@@ -477,30 +477,39 @@ +--- Python-3.4.3/Makefile.pre.in.~2~ 2015-02-25 08:04:46.338074390 -0800 ++++ Python-3.4.3/Makefile.pre.in 2015-02-25 08:04:46.418252956 -0800 +@@ -478,30 +478,39 @@ profile-opt: @echo "Building with support for profile generation:" $(MAKE) clean @@ -20,9 +20,9 @@ $(MAKE) build_all_use_profile build_all_generate_profile: -- $(MAKE) all CFLAGS="$(CFLAGS) -fprofile-generate" LIBS="$(LIBS) -lgcov" +- $(MAKE) all CFLAGS_NODIST="$(CFLAGS) -fprofile-generate" LDFLAGS="-fprofile-generate" LIBS="$(LIBS) -lgcov" + $(MAKE) all CC="$(CC) -xprofile=collect:$(XPROFILE_DIR)" \ -+ CFLAGS="$(CFLAGS) -xprofile=collect:$(XPROFILE_DIR)" \ ++ CFLAGS_NODIST="$(CFLAGS) -xprofile=collect:$(XPROFILE_DIR)" \ + LDFLAGS="$(LDFLAGS) -xprofile=collect:$(XPROFILE_DIR)" \ + BLDSHARED="$(BLDSHARED) -xprofile=collect:$(XPROFILE_DIR)" @@ -32,9 +32,9 @@ + LD_LIBRARY_PATH=. $(RUNSHARED) ./$(BUILDPYTHON) $(PROFILE_TASK) build_all_use_profile: -- $(MAKE) all CFLAGS="$(CFLAGS) -fprofile-use -fprofile-correction" +- $(MAKE) all CFLAGS_NODIST="$(CFLAGS) -fprofile-use -fprofile-correction" + $(MAKE) all CC="$(CC) -xprofile=use:$(XPROFILE_DIR)" \ -+ CFLAGS="$(CFLAGS) -xprofile=use:$(XPROFILE_DIR)" \ ++ CFLAGS_NODIST="$(CFLAGS) -xprofile=use:$(XPROFILE_DIR)" \ + LDFLAGS="$(LDFLAGS) -xprofile=use:$(XPROFILE_DIR)" \ + BLDSHARED="$(BLDSHARED) -xprofile=use:$(XPROFILE_DIR)" @@ -51,7 +51,7 @@ coverage-lcov: @echo "Creating Coverage HTML report with LCOV:" -@@ -571,13 +580,9 @@ +@@ -572,13 +581,9 @@ # -s, --silent or --quiet is always the first char. # Under BSD make, MAKEFLAGS might be " -s -v x=y". sharedmods: $(BUILDPYTHON) pybuilddir.txt @@ -66,7 +66,7 @@ # Build static library # avoid long command lines, same as LIBRARY_OBJS -@@ -1591,7 +1596,7 @@ +@@ -1595,7 +1600,7 @@ -rm -f Modules/_testembed Modules/_freeze_importlib profile-removal: diff -r e12ff6f7add3 -r eb4c6284602f components/python/python34/patches/07-ucred.patch --- a/components/python/python34/patches/07-ucred.patch Thu Jan 01 10:27:03 2015 -0800 +++ b/components/python/python34/patches/07-ucred.patch Wed Feb 25 20:44:31 2015 -0800 @@ -410,9 +410,9 @@ + + return m; +} ---- Python-3.4.2/setup.py.~3~ 2014-09-22 14:12:32.357526710 -0700 -+++ Python-3.4.2/setup.py 2014-09-22 14:12:32.421969305 -0700 -@@ -1485,6 +1485,13 @@ +--- Python-3.4.3/setup.py.~3~ 2015-02-25 08:14:54.409345225 -0800 ++++ Python-3.4.3/setup.py 2015-02-25 08:14:54.469040486 -0800 +@@ -1512,6 +1512,13 @@ # Stefan Krah's _decimal module exts.append(self._decimal_ext()) diff -r e12ff6f7add3 -r eb4c6284602f components/python/python34/patches/08-dlpi.patch --- a/components/python/python34/patches/08-dlpi.patch Thu Jan 01 10:27:03 2015 -0800 +++ b/components/python/python34/patches/08-dlpi.patch Wed Feb 25 20:44:31 2015 -0800 @@ -1223,9 +1223,9 @@ + + return mod; +} ---- Python-3.4.2/setup.py.~4~ 2014-09-22 14:13:40.664675485 -0700 -+++ Python-3.4.2/setup.py 2014-09-22 14:13:40.683389017 -0700 -@@ -1492,6 +1492,12 @@ +--- Python-3.4.3/setup.py.~4~ 2015-02-25 08:17:06.183641123 -0800 ++++ Python-3.4.3/setup.py 2015-02-25 08:17:06.196157035 -0800 +@@ -1519,6 +1519,12 @@ exts.append( Extension('ucred', ['ucred.c'], libraries = ['tsol']) ) diff -r e12ff6f7add3 -r eb4c6284602f components/python/python34/patches/10-rbac.patch --- a/components/python/python34/patches/10-rbac.patch Thu Jan 01 10:27:03 2015 -0800 +++ b/components/python/python34/patches/10-rbac.patch Wed Feb 25 20:44:31 2015 -0800 @@ -1283,9 +1283,9 @@ + 0, /* tp_free */ + 0, /* tp_is_gc */ +}; ---- Python-3.4.2/setup.py.~5~ 2014-09-22 14:15:00.047444289 -0700 -+++ Python-3.4.2/setup.py 2014-09-22 14:15:00.082157199 -0700 -@@ -1498,6 +1498,22 @@ +--- Python-3.4.3/setup.py.~5~ 2015-02-25 08:21:26.778968857 -0800 ++++ Python-3.4.3/setup.py 2015-02-25 08:21:26.801861210 -0800 +@@ -1525,6 +1525,22 @@ exts.append( Extension('dlpi', ['dlpimodule.c'], libraries = ['dlpi']) ) diff -r e12ff6f7add3 -r eb4c6284602f components/python/python34/patches/11-closerange.patch --- a/components/python/python34/patches/11-closerange.patch Thu Jan 01 10:27:03 2015 -0800 +++ b/components/python/python34/patches/11-closerange.patch Wed Feb 25 20:44:31 2015 -0800 @@ -1,9 +1,9 @@ This patch uses fdwalk(3c) to close file descriptors; as that function is not widely implemented, this is unsuitable for upstream. ---- Python-3.4.0/Modules/posixmodule.c.~1~ 2014-03-16 19:31:31.000000000 -0700 -+++ Python-3.4.0/Modules/posixmodule.c 2014-03-17 13:31:33.433740698 -0700 -@@ -7789,16 +7789,34 @@ +--- Python-3.4.3/Modules/posixmodule.c.~1~ 2015-02-25 03:27:46.000000000 -0800 ++++ Python-3.4.3/Modules/posixmodule.c 2015-02-25 08:22:50.773678769 -0800 +@@ -7809,16 +7809,34 @@ "closerange(fd_low, fd_high)\n\n\ Closes all file descriptors in [fd_low, fd_high), ignoring errors."); diff -r e12ff6f7add3 -r eb4c6284602f components/python/python34/patches/12-py_db.patch --- a/components/python/python34/patches/12-py_db.patch Thu Jan 01 10:27:03 2015 -0800 +++ b/components/python/python34/patches/12-py_db.patch Wed Feb 25 20:44:31 2015 -0800 @@ -1,9 +1,9 @@ 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-3.4.2/Makefile.pre.in.~3~ 2014-09-22 14:16:07.846210795 -0700 -+++ Python-3.4.2/Makefile.pre.in 2014-09-22 14:16:07.961725537 -0700 -@@ -471,7 +471,7 @@ +--- Python-3.4.3/Makefile.pre.in.~3~ 2015-02-25 08:23:53.006331779 -0800 ++++ Python-3.4.3/Makefile.pre.in 2015-02-25 08:23:53.089707662 -0800 +@@ -472,7 +472,7 @@ # Default target all: build_all @@ -12,7 +12,7 @@ # Compile a binary with gcc profile guided optimization. profile-opt: -@@ -673,6 +673,15 @@ +@@ -674,6 +674,15 @@ @mv config.c Modules @echo "The Makefile was updated, you may need to re-run make." @@ -28,7 +28,7 @@ Modules/Setup: $(srcdir)/Modules/Setup.dist @if test -f Modules/Setup; then \ -@@ -1042,7 +1051,7 @@ +@@ -1043,7 +1052,7 @@ $(TESTRUNNER) $(QUICKTESTOPTS) diff -r e12ff6f7add3 -r eb4c6284602f components/python/python34/patches/14-ossaudiodev.patch --- a/components/python/python34/patches/14-ossaudiodev.patch Thu Jan 01 10:27:03 2015 -0800 +++ b/components/python/python34/patches/14-ossaudiodev.patch Wed Feb 25 20:44:31 2015 -0800 @@ -2,9 +2,9 @@ Some OSS ioctls are not supported on Solaris, so they are ifdef'd out. As the patch is Solaris-specific, it is not suitable for upstream. ---- Python-3.4.2/setup.py.~6~ 2014-09-22 14:17:20.562920233 -0700 -+++ Python-3.4.2/setup.py 2014-09-22 14:17:20.631967980 -0700 -@@ -1569,7 +1569,7 @@ +--- Python-3.4.3/setup.py.~6~ 2015-02-25 08:25:07.739704118 -0800 ++++ Python-3.4.3/setup.py 2015-02-25 08:25:07.807400186 -0800 +@@ -1596,7 +1596,7 @@ # End multiprocessing # Platform-specific libraries diff -r e12ff6f7add3 -r eb4c6284602f components/python/python34/patches/19-SOABI.patch --- a/components/python/python34/patches/19-SOABI.patch Thu Jan 01 10:27:03 2015 -0800 +++ b/components/python/python34/patches/19-SOABI.patch Wed Feb 25 20:44:31 2015 -0800 @@ -1,9 +1,9 @@ This patch was developed in-house. We have not yet decided whether to offer it upstream or not. ---- Python-3.4.2/configure.ac.~3~ 2014-09-22 14:35:47.865240136 -0700 -+++ Python-3.4.2/configure.ac 2014-09-22 14:35:48.074504467 -0700 -@@ -4143,7 +4143,7 @@ +--- Python-3.4.3/configure.ac.~3~ 2015-02-25 08:26:17.783623099 -0800 ++++ Python-3.4.3/configure.ac 2015-02-25 08:26:17.981864039 -0800 +@@ -4146,7 +4146,7 @@ AC_SUBST(EXT_SUFFIX) case $ac_sys_system in diff -r e12ff6f7add3 -r eb4c6284602f components/python/python34/patches/20-disable-sslv3.patch --- a/components/python/python34/patches/20-disable-sslv3.patch Thu Jan 01 10:27:03 2015 -0800 +++ b/components/python/python34/patches/20-disable-sslv3.patch Wed Feb 25 20:44:31 2015 -0800 @@ -1,9 +1,9 @@ This patch comes from in-house. It has not yet been submitted upstream, but submission is planned. ---- Python-3.4.2/Modules/_ssl.c.~1~ 2014-10-08 01:18:15.000000000 -0700 -+++ Python-3.4.2/Modules/_ssl.c 2015-01-08 12:47:54.633548859 -0800 -@@ -2059,6 +2059,8 @@ +--- Python-3.4.3/Modules/_ssl.c.~1~ 2015-02-25 03:27:45.000000000 -0800 ++++ Python-3.4.3/Modules/_ssl.c 2015-02-25 08:51:04.532103249 -0800 +@@ -2061,6 +2061,8 @@ options = SSL_OP_ALL & ~SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS; if (proto_version != PY_SSL_VERSION_SSL2) options |= SSL_OP_NO_SSLv2; @@ -12,9 +12,9 @@ SSL_CTX_set_options(self->ctx, options); #ifndef OPENSSL_NO_ECDH ---- Python-3.4.2/Lib/test/test_ssl.py.~1~ 2014-10-08 01:18:14.000000000 -0700 -+++ Python-3.4.2/Lib/test/test_ssl.py 2015-01-08 18:09:09.276695442 -0800 -@@ -674,10 +674,7 @@ +--- Python-3.4.3/Lib/test/test_ssl.py.~1~ 2015-02-25 03:27:45.000000000 -0800 ++++ Python-3.4.3/Lib/test/test_ssl.py 2015-02-25 08:50:21.079031281 -0800 +@@ -675,10 +675,7 @@ @skip_if_broken_ubuntu_ssl def test_options(self): ctx = ssl.SSLContext(ssl.PROTOCOL_TLSv1) @@ -26,26 +26,28 @@ self.assertEqual(ssl.OP_ALL | ssl.OP_NO_SSLv2 | ssl.OP_NO_SSLv3, ctx.options) if can_clear_options(): -@@ -2149,15 +2146,15 @@ - sys.stdout.write( +@@ -2171,17 +2168,17 @@ " SSL2 client to SSL23 server test unexpectedly failed:\n %s\n" % str(x)) -- try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, True) -+ try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, False) + if hasattr(ssl, 'PROTOCOL_SSLv3'): +- try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, True) ++ try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, False) try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv23, True) try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_TLSv1, True) -- try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, True, ssl.CERT_OPTIONAL) -+ try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, False, ssl.CERT_OPTIONAL) + if hasattr(ssl, 'PROTOCOL_SSLv3'): +- try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, True, ssl.CERT_OPTIONAL) ++ try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, False, ssl.CERT_OPTIONAL) try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv23, True, ssl.CERT_OPTIONAL) try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_TLSv1, True, ssl.CERT_OPTIONAL) -- try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, True, ssl.CERT_REQUIRED) -+ try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, False, ssl.CERT_REQUIRED) + if hasattr(ssl, 'PROTOCOL_SSLv3'): +- try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, True, ssl.CERT_REQUIRED) ++ try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv3, False, ssl.CERT_REQUIRED) try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_SSLv23, True, ssl.CERT_REQUIRED) try_protocol_combo(ssl.PROTOCOL_SSLv23, ssl.PROTOCOL_TLSv1, True, ssl.CERT_REQUIRED) -@@ -2186,7 +2183,8 @@ +@@ -2213,7 +2210,8 @@ try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_TLSv1, False) if no_sslv2_implies_sslv3_hello(): # No SSLv2 => client will use an SSLv3 hello on recent OpenSSLs diff -r e12ff6f7add3 -r eb4c6284602f components/python/python34/python-34.p5m --- a/components/python/python34/python-34.p5m Thu Jan 01 10:27:03 2015 -0800 +++ b/components/python/python34/python-34.p5m Wed Feb 25 20:44:31 2015 -0800 @@ -128,6 +128,8 @@ file path=usr/include/python3.4m/pyconfig.h file path=usr/include/python3.4m/pyctype.h file path=usr/include/python3.4m/pydebug.h +file path=usr/include/python3.4m/pydtrace.h +file path=usr/include/python3.4m/pydtrace_offsets.h file path=usr/include/python3.4m/pyerrors.h file path=usr/include/python3.4m/pyexpat.h file path=usr/include/python3.4m/pyfpe.h @@ -204,6 +206,7 @@ file path=usr/lib/python3.4/asyncio/protocols.py file path=usr/lib/python3.4/asyncio/queues.py file path=usr/lib/python3.4/asyncio/selector_events.py +file path=usr/lib/python3.4/asyncio/sslproto.py file path=usr/lib/python3.4/asyncio/streams.py file path=usr/lib/python3.4/asyncio/subprocess.py file path=usr/lib/python3.4/asyncio/tasks.py @@ -248,6 +251,7 @@ file path=usr/lib/python3.4/config-3.4m/install-sh file path=usr/lib/python3.4/config-3.4m/libpython3.4m.a file path=usr/lib/python3.4/config-3.4m/makesetup +file path=usr/lib/python3.4/config-3.4m/python-config.py pkg.tmp.autopyc=false file path=usr/lib/python3.4/configparser.py file path=usr/lib/python3.4/contextlib.py file path=usr/lib/python3.4/copy.py @@ -592,8 +596,8 @@ file path=usr/lib/python3.4/encodings/zlib_codec.py file path=usr/lib/python3.4/ensurepip/__init__.py file path=usr/lib/python3.4/ensurepip/__main__.py -file path=usr/lib/python3.4/ensurepip/_bundled/pip-1.5.6-py2.py3-none-any.whl -file path=usr/lib/python3.4/ensurepip/_bundled/setuptools-2.1-py2.py3-none-any.whl +file path=usr/lib/python3.4/ensurepip/_bundled/pip-6.0.8-py2.py3-none-any.whl +file path=usr/lib/python3.4/ensurepip/_bundled/setuptools-12.0.5-py2.py3-none-any.whl file path=usr/lib/python3.4/ensurepip/_uninstall.py file path=usr/lib/python3.4/enum.py file path=usr/lib/python3.4/filecmp.py @@ -730,7 +734,6 @@ file path=usr/lib/python3.4/idlelib/rpc.py file path=usr/lib/python3.4/idlelib/run.py file path=usr/lib/python3.4/idlelib/tabbedpages.py -file path=usr/lib/python3.4/idlelib/testcode.py file path=usr/lib/python3.4/idlelib/textView.py file path=usr/lib/python3.4/imaplib.py file path=usr/lib/python3.4/imghdr.py @@ -896,6 +899,7 @@ file path=usr/lib/python3.4/lib2to3/pytree.py file path=usr/lib/python3.4/lib2to3/refactor.py file path=usr/lib/python3.4/lib2to3/tests/__init__.py +file path=usr/lib/python3.4/lib2to3/tests/__main__.py file path=usr/lib/python3.4/lib2to3/tests/data/README file path=usr/lib/python3.4/lib2to3/tests/data/bom.py pkg.tmp.autopyc=false file path=usr/lib/python3.4/lib2to3/tests/data/crlf.py pkg.tmp.autopyc=false @@ -1378,6 +1382,7 @@ file path=usr/lib/python3.4/test/sample_doctest_no_docstrings.py file path=usr/lib/python3.4/test/sample_doctest_no_doctests.py file path=usr/lib/python3.4/test/script_helper.py +file path=usr/lib/python3.4/test/selfsigned_pythontestdotnet.pem file path=usr/lib/python3.4/test/seq_tests.py file path=usr/lib/python3.4/test/sgml_input.html file path=usr/lib/python3.4/test/sha256.pem @@ -1431,6 +1436,7 @@ file path=usr/lib/python3.4/test/test_asyncio/test_proactor_events.py file path=usr/lib/python3.4/test/test_asyncio/test_queues.py file path=usr/lib/python3.4/test/test_asyncio/test_selector_events.py +file path=usr/lib/python3.4/test/test_asyncio/test_sslproto.py file path=usr/lib/python3.4/test/test_asyncio/test_streams.py file path=usr/lib/python3.4/test/test_asyncio/test_subprocess.py file path=usr/lib/python3.4/test/test_asyncio/test_tasks.py @@ -1851,6 +1857,7 @@ file path=usr/lib/python3.4/test/test_sax.py file path=usr/lib/python3.4/test/test_sched.py file path=usr/lib/python3.4/test/test_scope.py +file path=usr/lib/python3.4/test/test_script_helper.py file path=usr/lib/python3.4/test/test_select.py file path=usr/lib/python3.4/test/test_selectors.py file path=usr/lib/python3.4/test/test_set.py diff -r e12ff6f7add3 -r eb4c6284602f components/python/python34/test/results-64.master --- a/components/python/python34/test/results-64.master Thu Jan 01 10:27:03 2015 -0800 +++ b/components/python/python34/test/results-64.master Wed Feb 25 20:44:31 2015 -0800 @@ -1,12 +1,12 @@ -360 tests OK. +362 tests OK. 8 tests failed: - test_cmd_line_script test_ctypes test_dtrace test_import - test_readline test_site test_socket test_time + test_cmd_line_script test_ctypes test_dtrace test_import test_re + test_site test_socket test_time 2 tests altered the execution environment: test___all__ test_warnings -20 tests skipped: - test_curses test_epoll test_gdb test_kqueue test_msilib - test_ossaudiodev test_pep277 test_smtpnet test_socketserver - test_startfile test_timeout test_tk test_ttk_guionly - test_unicode_file test_urllib2net test_urllibnet test_winreg - test_winsound test_xmlrpc_net test_zipfile64 +19 tests skipped: + test_epoll test_gdb test_kqueue test_msilib test_ossaudiodev + test_pep277 test_smtpnet test_socketserver test_startfile + test_timeout test_tk test_ttk_guionly test_unicode_file + test_urllib2net test_urllibnet test_winreg test_winsound + test_xmlrpc_net test_zipfile64 diff -r e12ff6f7add3 -r eb4c6284602f tools/.gnupg/pubring.gpg Binary file tools/.gnupg/pubring.gpg has changed