Makefile.fetch | 2 download.lst | 3 python3/UnpackedTarball_python3.mk | 12 -- python3/i100492-freebsd.patch.1 | 80 ------------- python3/python-3.3.0-darwin.patch.1 | 26 ---- python3/python-3.3.0-implicit-int.patch.1 | 30 ----- python3/python-3.3.0-msvc-disable.patch.1 | 76 ------------- python3/python-3.3.0-msvc-x64.patch.1 | 135 +---------------------- python3/python-3.3.0-ssl.patch.1 | 162 ---------------------------- python3/python-3.3.3-aix.patch.1 | 145 ------------------------- python3/python-3.3.3-msvc2012-winxp.patch.1 | 117 ++++++++++++++++++++ python3/python-3.3.3-py17797.patch.1 | 73 ++++++------ python3/python-3.3.7-py30657.patch.1 | 19 +++ python3/python-msvc-disable-sse2.patch.1 | 23 +++ python3/ubsan.patch.0 | 59 ++++++++++ 15 files changed, 273 insertions(+), 689 deletions(-)
New commits: commit b78c901252ee1cf34b3b7e4f6c0dff2fdeacbbbd Author: Thorsten Behrens <[email protected]> AuthorDate: Thu Aug 16 15:36:26 2018 +0200 Commit: Thorsten Behrens <[email protected]> CommitDate: Thu Aug 16 15:36:26 2018 +0200 python3: Check & prevent integer overflow in PyString_DecodeEscape Backport from upstream 3.4 / bpo-30657: Fix CVE-2017-1000158 Change-Id: Ic978f7623231ec7e7ca5de992762b17b597ee675 diff --git a/python3/UnpackedTarball_python3.mk b/python3/UnpackedTarball_python3.mk index d012860afb1a..24bfaa673b5f 100644 --- a/python3/UnpackedTarball_python3.mk +++ b/python3/UnpackedTarball_python3.mk @@ -27,6 +27,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\ python3/python-3.3.3-msvc2012-winxp.patch.1 \ python3/python-msvc-disable-sse2.patch.1 \ python3/ubsan.patch.0 \ + python3/python-3.3.7-py30657.patch.1 \ )) ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD SOLARIS,$(OS)),) diff --git a/python3/python-3.3.7-py30657.patch.1 b/python3/python-3.3.7-py30657.patch.1 new file mode 100644 index 000000000000..a9d24320f9f6 --- /dev/null +++ b/python3/python-3.3.7-py30657.patch.1 @@ -0,0 +1,19 @@ +diff --git a/Objects/bytesobject.c b/Objects/bytesobject.c +index 27f406947208..08c91a265adc 100644 +--- a/Objects/bytesobject.c ++++ b/Objects/bytesobject.c +@@ -368,7 +368,13 @@ PyObject *PyBytes_DecodeEscape(const char *s, + char *p, *buf; + const char *end; + PyObject *v; +- Py_ssize_t newlen = recode_encoding ? 4*len:len; ++ Py_ssize_t newlen; ++ /* Check for integer overflow */ ++ if (recode_encoding && (len > PY_SSIZE_T_MAX / 4)) { ++ PyErr_SetString(PyExc_OverflowError, "string is too large"); ++ return NULL; ++ } ++ newlen = recode_encoding ? 4*len:len; + v = PyBytes_FromStringAndSize((char *)NULL, newlen); + if (v == NULL) + return NULL; commit 9497d77a120ad277af5cde19cecc78645c9e756e Author: Thorsten Behrens <[email protected]> AuthorDate: Thu Aug 16 15:23:33 2018 +0200 Commit: Thorsten Behrens <[email protected]> CommitDate: Thu Aug 16 15:23:33 2018 +0200 python3: update various patches - take python-3.3.3-msvc2012-winxp.patch.1 from 6.0 - take python-msvc-disable-sse2.patch.1 from 6.0 - take ubsan.patch.0 from 6.0 - longobject.c and listobject.c bits apparently fixed upstream already - update python-3.3.3-py17797.patch.1 from 6.0 Plus remove obsolete VS2008 support, this is cherry-picked from 4ce1cec2a4c98451b8b686f6f7a114a6927f0cae Change-Id: I1a37e92e9e06a9e66efe6d39234fbe19c2c0c2c6 diff --git a/python3/UnpackedTarball_python3.mk b/python3/UnpackedTarball_python3.mk index 90f1f68d0a98..d012860afb1a 100644 --- a/python3/UnpackedTarball_python3.mk +++ b/python3/UnpackedTarball_python3.mk @@ -24,6 +24,9 @@ $(eval $(call gb_UnpackedTarball_add_patches,python3,\ python3/python-3.3.0-gcc-4.8.patch.1 \ python3/python-3.3.0-pythreadstate.patch.1 \ python3/python-3.3.3-py17797.patch.1 \ + python3/python-3.3.3-msvc2012-winxp.patch.1 \ + python3/python-msvc-disable-sse2.patch.1 \ + python3/ubsan.patch.0 \ )) ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD SOLARIS,$(OS)),) diff --git a/python3/python-3.3.3-msvc2012-winxp.patch.1 b/python3/python-3.3.3-msvc2012-winxp.patch.1 new file mode 100644 index 000000000000..2addd4962c07 --- /dev/null +++ b/python3/python-3.3.3-msvc2012-winxp.patch.1 @@ -0,0 +1,117 @@ +without explicit subsystem set, the linker tries to open a file +with the name of the comptibility version +(fatal error LNK1181: cannot open input file ",5.01") +diff -ur python3.org/PCbuild/_ctypes.vcxproj python3/PCbuild/_ctypes.vcxproj +--- python3.org/PCbuild/_ctypes.vcxproj 2014-05-19 19:06:01.274114800 +0200 ++++ python3/PCbuild/_ctypes.vcxproj 2014-05-19 19:07:13.649079800 +0200 +@@ -174,7 +174,7 @@ + </ClCompile> + <Link> + <AdditionalOptions>/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions)</AdditionalOptions> +- <SubSystem>NotSet</SubSystem> ++ <SubSystem>Console</SubSystem> + <BaseAddress>0x1D1A0000</BaseAddress> + </Link> + </ItemDefinitionGroup> +@@ -187,7 +187,7 @@ + </ClCompile> + <Link> + <AdditionalOptions>/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions)</AdditionalOptions> +- <SubSystem>NotSet</SubSystem> ++ <SubSystem>Console</SubSystem> + <BaseAddress>0x1D1A0000</BaseAddress> + </Link> + </ItemDefinitionGroup> +@@ -197,7 +197,7 @@ + </ClCompile> + <Link> + <AdditionalOptions>/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions)</AdditionalOptions> +- <SubSystem>NotSet</SubSystem> ++ <SubSystem>Console</SubSystem> + <BaseAddress>0x1D1A0000</BaseAddress> + </Link> + </ItemDefinitionGroup> +@@ -210,7 +210,7 @@ + </ClCompile> + <Link> + <AdditionalOptions>/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions)</AdditionalOptions> +- <SubSystem>NotSet</SubSystem> ++ <SubSystem>Console</SubSystem> + <BaseAddress>0x1D1A0000</BaseAddress> + <TargetMachine>MachineX64</TargetMachine> + </Link> +@@ -221,7 +221,7 @@ + </ClCompile> + <Link> + <AdditionalOptions>/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions)</AdditionalOptions> +- <SubSystem>NotSet</SubSystem> ++ <SubSystem>Console</SubSystem> + <BaseAddress>0x1D1A0000</BaseAddress> + </Link> + </ItemDefinitionGroup> +@@ -234,7 +234,7 @@ + </ClCompile> + <Link> + <AdditionalOptions>/EXPORT:DllGetClassObject,PRIVATE /EXPORT:DllCanUnloadNow,PRIVATE %(AdditionalOptions)</AdditionalOptions> +- <SubSystem>NotSet</SubSystem> ++ <SubSystem>Console</SubSystem> + <BaseAddress>0x1D1A0000</BaseAddress> + <TargetMachine>MachineX64</TargetMachine> + </Link> +diff -ur python3.org/PCbuild/_decimal.vcxproj python3/PCbuild/_decimal.vcxproj +--- python3.org/PCbuild/_decimal.vcxproj 2014-05-19 19:06:01.274114800 +0200 ++++ python3/PCbuild/_decimal.vcxproj 2014-05-19 19:07:13.649079800 +0200 +@@ -176,7 +176,7 @@ + <AdditionalIncludeDirectories>..\Modules\_decimal;..\Modules\_decimal\libmpdec;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + <Link> +- <SubSystem>NotSet</SubSystem> ++ <SubSystem>Console</SubSystem> + <BaseAddress>0x1D1A0000</BaseAddress> + </Link> + </ItemDefinitionGroup> +@@ -189,7 +189,7 @@ + <AdditionalIncludeDirectories>..\Modules\_decimal;..\Modules\_decimal\libmpdec;..\Include;..\PC;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + <Link> +- <SubSystem>NotSet</SubSystem> ++ <SubSystem>Console</SubSystem> + <BaseAddress>0x1D1A0000</BaseAddress> + </Link> + </ItemDefinitionGroup> +@@ -199,7 +199,7 @@ + <AdditionalIncludeDirectories>..\Modules\_decimal;..\Modules\_decimal\libmpdec;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + <Link> +- <SubSystem>NotSet</SubSystem> ++ <SubSystem>Console</SubSystem> + <BaseAddress>0x1D1A0000</BaseAddress> + </Link> + </ItemDefinitionGroup> +@@ -212,7 +212,7 @@ + <AdditionalIncludeDirectories>..\Modules\_decimal;..\Modules\_decimal\libmpdec;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + <Link> +- <SubSystem>NotSet</SubSystem> ++ <SubSystem>Console</SubSystem> + <BaseAddress>0x1D1A0000</BaseAddress> + <TargetMachine>MachineX64</TargetMachine> + </Link> +@@ -223,7 +223,7 @@ + <AdditionalIncludeDirectories>..\Modules\_decimal;..\Modules\_decimal\libmpdec;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + <Link> +- <SubSystem>NotSet</SubSystem> ++ <SubSystem>Console</SubSystem> + <BaseAddress>0x1D1A0000</BaseAddress> + </Link> + </ItemDefinitionGroup> +@@ -236,7 +236,7 @@ + <AdditionalIncludeDirectories>..\Modules\_decimal;..\Modules\_decimal\libmpdec;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + <Link> +- <SubSystem>NotSet</SubSystem> ++ <SubSystem>Console</SubSystem> + <BaseAddress>0x1D1A0000</BaseAddress> + <TargetMachine>MachineX64</TargetMachine> + </Link> diff --git a/python3/python-3.3.3-py17797.patch.1 b/python3/python-3.3.3-py17797.patch.1 index 3c43fb120713..8fcb703f1935 100644 --- a/python3/python-3.3.3-py17797.patch.1 +++ b/python3/python-3.3.3-py17797.patch.1 @@ -3,42 +3,43 @@ http://connect.microsoft.com/VisualStudio/feedback/details/785119/ Visual Studio 2012 changed return value for fileno function that breaks when python tries to check/setup stdin/out/err -diff -ur python3.org/Python/pythonrun.c python3/Python/pythonrun.c ---- python3.org/Python/pythonrun.c 2014-05-19 19:06:01.305362400 +0200 -+++ python3/Python/pythonrun.c 2014-05-19 19:07:13.649079800 +0200 -@@ -1083,7 +1083,11 @@ - * and fileno() may point to an invalid file descriptor. For example - * GUI apps don't have valid standard streams by default. - */ -+#ifdef MS_WINDOWS -+ if (!is_valid_fd(fd) || GetStdHandle(STD_INPUT_HANDLE) == NULL) { +GetStdHandle on Windows XP behaves contrary to the documentation... + +diff --git a/Python/pythonrun.c b/Python/pythonrun.c +index 91d56b7..d28ffc7 100644 +--- a/Python/pythonrun.c ++++ b/Python/pythonrun.c +@@ -1015,13 +1015,28 @@ error: + static int + is_valid_fd(int fd) + { +- int dummy_fd; + if (fd < 0 || !_PyVerify_fd(fd)) + return 0; +- dummy_fd = dup(fd); +- if (dummy_fd < 0) +- return 0; +- close(dummy_fd); ++ ++#if defined(MS_WINDOWS) && defined(HAVE_FSTAT) ++ /* dup (DuplicateHandle) doesn't say fd is a valid *file* handle. ++ * It could be a current thread pseudo-handle. ++ */ ++ { ++ struct stat buf; ++ if (fstat(fd, &buf) < 0 && (errno == EBADF || errno == ENOENT)) ++ return 0; ++ } +#else - if (!is_valid_fd(fd)) { ++ { ++ int dummy_fd; ++ dummy_fd = dup(fd); ++ if (dummy_fd < 0) ++ return 0; ++ close(dummy_fd); ++ } +#endif - std = Py_None; - Py_INCREF(std); - } -@@ -1098,7 +1102,11 @@ ++ + return 1; + } - /* Set sys.stdout */ - fd = fileno(stdout); -+#ifdef MS_WINDOWS -+ if (!is_valid_fd(fd) || GetStdHandle(STD_OUTPUT_HANDLE) == NULL) { -+#else - if (!is_valid_fd(fd)) { -+#endif - std = Py_None; - Py_INCREF(std); - } -@@ -1114,7 +1122,11 @@ - #if 1 /* Disable this if you have trouble debugging bootstrap stuff */ - /* Set sys.stderr, replaces the preliminary stderr */ - fd = fileno(stderr); -+#ifdef MS_WINDOWS -+ if (!is_valid_fd(fd) || GetStdHandle(STD_ERROR_HANDLE) == NULL) { -+#else - if (!is_valid_fd(fd)) { -+#endif - std = Py_None; - Py_INCREF(std); - } diff --git a/python3/python-msvc-disable-sse2.patch.1 b/python3/python-msvc-disable-sse2.patch.1 new file mode 100644 index 000000000000..399aa6016dfc --- /dev/null +++ b/python3/python-msvc-disable-sse2.patch.1 @@ -0,0 +1,23 @@ +fdo#82430 disable SSE2 default of MSVC2012 + +--- python3/PCbuild/release.props.old 2014-10-01 23:47:33.348095403 +0200 ++++ python3/PCbuild/release.props 2014-10-01 23:48:05.051092945 +0200 +@@ -9,6 +9,7 @@ + <ItemDefinitionGroup> + <ClCompile> + <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> ++ <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet> + </ClCompile> + </ItemDefinitionGroup> + <ItemGroup> +--- python3/PCbuild/make_buildinfo.c.orig 2014-11-03 00:48:58.841000000 +0100 ++++ python3/PCbuild/make_buildinfo.c 2014-11-03 00:49:16.266200000 +0100 +@@ -109,7 +109,7 @@ + + int main(int argc, char*argv[]) + { +- char command[CMD_SIZE] = "cl.exe -c -D_WIN32 -DUSE_DL_EXPORT -D_WINDOWS -DWIN32 -D_WINDLL "; ++ char command[CMD_SIZE] = "cl.exe -arch:SSE -c -D_WIN32 -DUSE_DL_EXPORT -D_WINDOWS -DWIN32 -D_WINDLL "; + char tmppath[CMD_SIZE] = ""; + int do_unlink, result; + char *tmpdir = NULL; diff --git a/python3/ubsan.patch.0 b/python3/ubsan.patch.0 new file mode 100644 index 000000000000..f3623cfd7615 --- /dev/null +++ b/python3/ubsan.patch.0 @@ -0,0 +1,59 @@ +--- Modules/_ctypes/libffi/src/x86/ffi64.c ++++ Modules/_ctypes/libffi/src/x86/ffi64.c +@@ -545,11 +545,15 @@ + tramp = (volatile unsigned short *) &closure->tramp[0]; + + tramp[0] = 0xbb49; /* mov <code>, %r11 */ +- *((unsigned long long * volatile) &tramp[1]) +- = (unsigned long) ffi_closure_unix64; ++ tramp[1] = (unsigned long) ffi_closure_unix64; ++ tramp[2] = ((unsigned long) ffi_closure_unix64) >> 16; ++ tramp[3] = ((unsigned long) ffi_closure_unix64) >> 32; ++ tramp[4] = ((unsigned long) ffi_closure_unix64) >> 48; + tramp[5] = 0xba49; /* mov <data>, %r10 */ +- *((unsigned long long * volatile) &tramp[6]) +- = (unsigned long) codeloc; ++ tramp[6] = (unsigned long) codeloc; ++ tramp[7] = ((unsigned long) codeloc) >> 16; ++ tramp[8] = ((unsigned long) codeloc) >> 32; ++ tramp[9] = ((unsigned long) codeloc) >> 48; + + /* Set the carry bit iff the function uses any sse registers. + This is clc or stc, together with the first byte of the jmp. */ +--- Objects/bytearrayobject.c ++++ Objects/bytearrayobject.c +@@ -294,7 +294,7 @@ + PyBuffer_Release(&vo); + return NULL; + } +- memcpy(self->ob_bytes + mysize, vo.buf, vo.len); ++ if (vo.len != 0) memcpy(self->ob_bytes + mysize, vo.buf, vo.len); + PyBuffer_Release(&vo); + Py_INCREF(self); + return (PyObject *)self; +--- Objects/listobject.c ++++ Objects/listobject.c +@@ -641,7 +641,7 @@ + goto Error; + } + } +- memcpy(recycle, &item[ilow], s); ++ if (s != 0) memcpy(recycle, &item[ilow], s); + + if (d < 0) { /* Delete -d items */ + memmove(&item[ihigh+d], &item[ihigh], +--- Modules/_ctypes/_ctypes.c ++++ Modules/_ctypes/_ctypes.c +@@ -1328,8 +1328,10 @@ + if (stgdict->shape == NULL) + goto error; + stgdict->shape[0] = length; +- memmove(&stgdict->shape[1], itemdict->shape, +- sizeof(Py_ssize_t) * (stgdict->ndim - 1)); ++ if (itemdict->shape) { ++ memmove(&stgdict->shape[1], itemdict->shape, ++ sizeof(Py_ssize_t) * (stgdict->ndim - 1)); ++ } + + itemsize = itemdict->size; + if (length * itemsize < 0) { commit 0dc7779486da3207f65c9e7211c31c34640f75ea Author: Michael Stahl <[email protected]> AuthorDate: Tue Apr 15 16:48:59 2014 +0200 Commit: Thorsten Behrens <[email protected]> CommitDate: Thu Aug 16 15:07:32 2018 +0200 python3: remove obsolete MSVC2008 patches Change-Id: Ie514017dc186fea4c3f2699e92bfe46706eb6413 (cherry picked from commit 4ce1cec2a4c98451b8b686f6f7a114a6927f0cae) diff --git a/python3/UnpackedTarball_python3.mk b/python3/UnpackedTarball_python3.mk index c64f072e4f6a..90f1f68d0a98 100644 --- a/python3/UnpackedTarball_python3.mk +++ b/python3/UnpackedTarball_python3.mk @@ -13,10 +13,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,python3,$(PYTHON_TARBALL))) $(eval $(call gb_UnpackedTarball_fix_end_of_line,python3,\ PCbuild/pcbuild.sln \ - PC/VS9.0/pcbuild.sln \ - PC/VS9.0/make_versioninfo.vcproj \ - PC/VS9.0/x64.vsprops \ - PC/VS9.0/_ssl.vcproj \ )) $(eval $(call gb_UnpackedTarball_add_patches,python3,\ diff --git a/python3/python-3.3.0-msvc-disable.patch.1 b/python3/python-3.3.0-msvc-disable.patch.1 index e9cbef594786..6a6a9509a4ef 100644 --- a/python3/python-3.3.0-msvc-disable.patch.1 +++ b/python3/python-3.3.0-msvc-disable.patch.1 @@ -1,81 +1,5 @@ Disable some stuff LO does not need, especially stuff with external dependencies -diff -ru python3/PC/VS9.0/pcbuild.sln python3.new/PC/VS9.0/pcbuild.sln ---- python3/PC/VS9.0/pcbuild.sln 2012-09-29 10:00:47.000000000 +0200 -+++ python3.new/PC/VS9.0/pcbuild.sln 2012-11-12 22:34:55.365289858 +0100 -@@ -15,16 +15,6 @@ - {C73F0EC1-358B-4177-940F-0846AC8B04CD} = {C73F0EC1-358B-4177-940F-0846AC8B04CD} - EndProjectSection - EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pythonw", "pythonw.vcproj", "{F4229CC3-873C-49AE-9729-DD308ED4CD4A}" -- ProjectSection(ProjectDependencies) = postProject -- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -- EndProjectSection --EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "w9xpopen", "w9xpopen.vcproj", "{E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}" -- ProjectSection(ProjectDependencies) = postProject -- {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} -- EndProjectSection --EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_buildinfo", "make_buildinfo.vcproj", "{C73F0EC1-358B-4177-940F-0846AC8B04CD}" - EndProject - Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{553EC33E-9816-4996-A660-5D6186A0B0B3}" -@@ -68,12 +58,6 @@ - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} - EndProjectSection - EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_sqlite3", "_sqlite3.vcproj", "{13CECB97-4119-4316-9D42-8534019A5A44}" -- ProjectSection(ProjectDependencies) = postProject -- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -- {A1A295E5-463C-437F-81CA-1F32367685DA} = {A1A295E5-463C-437F-81CA-1F32367685DA} -- EndProjectSection --EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ssl", "_ssl.vcproj", "{C6E20F84-3247-4AD6-B051-B073268F73BA}" - ProjectSection(ProjectDependencies) = postProject - {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} -@@ -87,21 +71,6 @@ - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} - EndProjectSection - EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_tkinter", "_tkinter.vcproj", "{4946ECAC-2E69-4BF8-A90A-F5136F5094DF}" -- ProjectSection(ProjectDependencies) = postProject -- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -- EndProjectSection --EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_bz2", "_bz2.vcproj", "{73FCD2BD-F133-46B7-8EC1-144CD82A59D5}" -- ProjectSection(ProjectDependencies) = postProject -- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -- EndProjectSection --EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_lzma", "_lzma.vcproj", "{F9D71780-F393-11E0-BE50-0800200C9A66}" -- ProjectSection(ProjectDependencies) = postProject -- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -- EndProjectSection --EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "select", "select.vcproj", "{18CAE28C-B454-46C1-87A0-493D91D97F03}" - ProjectSection(ProjectDependencies) = postProject - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -@@ -117,20 +86,6 @@ - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} - EndProjectSection - EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdist_wininst", "bdist_wininst.vcproj", "{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}" --EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_hashlib", "_hashlib.vcproj", "{447F05A8-F581-4CAC-A466-5AC7936E207E}" -- ProjectSection(ProjectDependencies) = postProject -- {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} -- {E5B04CC0-EB4C-42AB-B4DC-18EF95F864B0} = {E5B04CC0-EB4C-42AB-B4DC-18EF95F864B0} -- {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} -- EndProjectSection --EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sqlite3", "sqlite3.vcproj", "{A1A295E5-463C-437F-81CA-1F32367685DA}" -- ProjectSection(ProjectDependencies) = postProject -- {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} = {6DE10744-E396-40A5-B4E2-1B69AA7C8D31} -- EndProjectSection --EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_multiprocessing", "_multiprocessing.vcproj", "{9E48B300-37D1-11DD-8C41-005056C00008}" - ProjectSection(ProjectDependencies) = postProject - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} diff -ru python3/PCbuild/pcbuild.sln python3.new/PCbuild/pcbuild.sln --- python3/PCbuild/pcbuild.sln 2012-09-29 10:00:48.000000000 +0200 +++ python3.new/PCbuild/pcbuild.sln 2012-11-12 22:13:49.445159668 +0100 diff --git a/python3/python-3.3.0-msvc-x64.patch.1 b/python3/python-3.3.0-msvc-x64.patch.1 index 9c3c96352f72..8882a1c87fc0 100644 --- a/python3/python-3.3.0-msvc-x64.patch.1 +++ b/python3/python-3.3.0-msvc-x64.patch.1 @@ -1,118 +1,5 @@ Fix Python build for x64 Windows -diff -ru python3/PC/VS9.0/make_versioninfo.vcproj python3.new/PC/VS9.0/make_versioninfo.vcproj ---- python3/PC/VS9.0/make_versioninfo.vcproj 2012-09-29 10:00:47.000000000 +0200 -+++ python3.new/PC/VS9.0/make_versioninfo.vcproj 2012-11-12 22:44:03.027363013 +0100 -@@ -124,6 +124,8 @@ - InlineFunctionExpansion="1" - EnableIntrinsicFunctions="true" - PreprocessorDefinitions="_CONSOLE" -+ RuntimeLibrary="2" -+ CompileAs="0" - /> - <Tool - Name="VCManagedResourceCompilerTool" -@@ -137,6 +139,8 @@ - <Tool - Name="VCLinkerTool" - OutputFile="$(SolutionDir)make_versioninfo.exe" -+ ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" -+ SubSystem="1" - /> - <Tool - Name="VCALinkTool" -@@ -281,7 +285,8 @@ - <Tool - Name="VCLinkerTool" - OutputFile="$(SolutionDir)make_versioninfo_d.exe" -- TargetMachine="17" -+ ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb" -+ SubSystem="1" - /> - <Tool - Name="VCALinkTool" -diff -ru python3/PC/VS9.0/pcbuild.sln python3.new/PC/VS9.0/pcbuild.sln ---- python3/PC/VS9.0/pcbuild.sln 2012-09-29 10:00:47.000000000 +0200 -+++ python3.new/PC/VS9.0/pcbuild.sln 2012-11-12 22:34:55.365289858 +0100 -@@ -182,20 +137,20 @@ - {B11D750F-CD1F-4A96-85CE-E69A5C5259F9}.Release|x64.Build.0 = Release|x64 - {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.ActiveCfg = Debug|Win32 - {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|Win32.Build.0 = Debug|Win32 -- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.ActiveCfg = Debug|Win32 -- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.Build.0 = Debug|Win32 -+ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.ActiveCfg = Debug|x64 -+ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Debug|x64.Build.0 = Debug|x64 - {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|Win32.ActiveCfg = Release|Win32 - {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|Win32.Build.0 = Release|Win32 -- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.ActiveCfg = Release|Win32 -- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.Build.0 = Release|Win32 -+ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.ActiveCfg = Release|x64 -+ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGInstrument|x64.Build.0 = Release|x64 - {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|Win32.ActiveCfg = Release|Win32 - {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|Win32.Build.0 = Release|Win32 -- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.ActiveCfg = Release|Win32 -- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.Build.0 = Release|Win32 -+ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.ActiveCfg = Release|x64 -+ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.PGUpdate|x64.Build.0 = Release|x64 - {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|Win32.ActiveCfg = Release|Win32 - {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|Win32.Build.0 = Release|Win32 -- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.ActiveCfg = Release|Win32 -- {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.Build.0 = Release|Win32 -+ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.ActiveCfg = Release|x64 -+ {F0E0541E-F17D-430B-97C4-93ADF0DD284E}.Release|x64.Build.0 = Release|x64 - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|Win32.ActiveCfg = Debug|Win32 - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|Win32.Build.0 = Debug|Win32 - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}.Debug|x64.ActiveCfg = Debug|x64 -@@ -246,20 +201,20 @@ - {E9E0A1F6-0009-4E8C-B8F8-1B8F5D49A058}.Release|x64.Build.0 = Release|x64 - {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|Win32.ActiveCfg = Release|Win32 - {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|Win32.Build.0 = Release|Win32 -- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.ActiveCfg = Release|Win32 -- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.Build.0 = Release|Win32 -+ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.ActiveCfg = Release|x64 -+ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Debug|x64.Build.0 = Release|x64 - {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|Win32.ActiveCfg = Release|Win32 - {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|Win32.Build.0 = Release|Win32 -- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.ActiveCfg = Release|Win32 -- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.Build.0 = Release|Win32 -+ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.ActiveCfg = Release|x64 -+ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGInstrument|x64.Build.0 = Release|x64 - {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|Win32.ActiveCfg = Release|Win32 - {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|Win32.Build.0 = Release|Win32 -- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.ActiveCfg = Release|Win32 -- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.Build.0 = Release|Win32 -+ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.ActiveCfg = Release|x64 -+ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.PGUpdate|x64.Build.0 = Release|x64 - {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|Win32.ActiveCfg = Release|Win32 - {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|Win32.Build.0 = Release|Win32 -- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.ActiveCfg = Release|Win32 -- {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.Build.0 = Release|Win32 -+ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.ActiveCfg = Release|x64 -+ {C73F0EC1-358B-4177-940F-0846AC8B04CD}.Release|x64.Build.0 = Release|x64 - {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|Win32.ActiveCfg = Debug|Win32 - {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|Win32.Build.0 = Debug|Win32 - {28B5D777-DDF2-4B6B-B34F-31D938813856}.Debug|x64.ActiveCfg = Debug|x64 -diff -ru python3/PC/VS9.0/x64.vsprops python3.new/PC/VS9.0/x64.vsprops ---- python3/PC/VS9.0/x64.vsprops 2012-09-29 10:00:47.000000000 +0200 -+++ python3.new/PC/VS9.0/x64.vsprops 2012-11-12 22:45:30.584374039 +0100 -@@ -3,7 +3,7 @@ - ProjectType="Visual C++" - Version="8.00" - Name="amd64" -- OutputDirectory="$(SolutionDir)\amd64\" -+ OutputDirectory="$(SolutionDir)" - IntermediateDirectory="$(SolutionDir)$(PlatformName)-temp-$(ConfigurationName)\$(ProjectName)\" - > - <Tool -@@ -15,8 +15,4 @@ - Name="VCLinkerTool" - TargetMachine="17" - /> -- <UserMacro -- Name="PythonExe" -- Value="$(HOST_PYTHON)" -- /> - </VisualStudioPropertySheet> diff -ru python3/PCbuild/pcbuild.sln python3.new/PCbuild/pcbuild.sln --- python3/PCbuild/pcbuild.sln 2012-09-29 10:00:48.000000000 +0200 +++ python3.new/PCbuild/pcbuild.sln 2012-11-12 22:13:49.445159668 +0100 diff --git a/python3/python-3.3.0-ssl.patch.1 b/python3/python-3.3.0-ssl.patch.1 index d5777dfc3252..b85fe076fff8 100644 --- a/python3/python-3.3.0-ssl.patch.1 +++ b/python3/python-3.3.0-ssl.patch.1 @@ -24,168 +24,6 @@ diff -ru python3.old_/Modules/Setup.dist python3/Modules/Setup.dist # The _tkinter module. -diff -ru python3.old_/PC/VS9.0/pcbuild.sln python3/PC/VS9.0/pcbuild.sln ---- python3.old_/PC/VS9.0/pcbuild.sln 2012-09-29 10:00:47.000000000 +0200 -+++ python3/PC/VS9.0/pcbuild.sln 2012-11-13 14:44:29.329147866 +0100 -@@ -136,11 +136,6 @@ - {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} = {CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} - EndProjectSection - EndProject --Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ssl", "ssl.vcproj", "{E5B04CC0-EB4C-42AB-B4DC-18EF95F864B0}" -- ProjectSection(ProjectDependencies) = postProject -- {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} = {B11D750F-CD1F-4A96-85CE-E69A5C5259F9} -- EndProjectSection --EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kill_python", "kill_python.vcproj", "{6DE10744-E396-40A5-B4E2-1B69AA7C8D31}" - EndProject - Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "python3dll", "python3dll.vcproj", "{885D4898-D08D-4091-9C40-C700CFE3FC5A}" -diff -ru python3.old_/PC/VS9.0/_ssl.vcproj python3/PC/VS9.0/_ssl.vcproj ---- python3.old_/PC/VS9.0/_ssl.vcproj 2012-09-29 10:00:47.000000000 +0200 -+++ python3/PC/VS9.0/_ssl.vcproj 2012-11-13 14:27:15.874169273 +0100 -@@ -42,7 +42,7 @@ - /> - <Tool - Name="VCCLCompilerTool" -- AdditionalIncludeDirectories="$(opensslDir)\inc32" -+ AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include" - /> - <Tool - Name="VCManagedResourceCompilerTool" -@@ -56,7 +56,7 @@ - /> - <Tool - Name="VCLinkerTool" -- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" -+ AdditionalDependencies="ws2_32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib" - /> - <Tool - Name="VCALinkTool" -@@ -104,7 +104,7 @@ - /> - <Tool - Name="VCCLCompilerTool" -- AdditionalIncludeDirectories="$(opensslDir)\inc64" -+ AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include" - /> - <Tool - Name="VCManagedResourceCompilerTool" -@@ -118,7 +118,7 @@ - /> - <Tool - Name="VCLinkerTool" -- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib" -+ AdditionalDependencies="ws2_32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib" - /> - <Tool - Name="VCALinkTool" -@@ -166,7 +166,7 @@ - /> - <Tool - Name="VCCLCompilerTool" -- AdditionalIncludeDirectories="$(opensslDir)\inc32" -+ AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include" - /> - <Tool - Name="VCManagedResourceCompilerTool" -@@ -180,7 +180,7 @@ - /> - <Tool - Name="VCLinkerTool" -- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" -+ AdditionalDependencies="ws2_32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib" - /> - <Tool - Name="VCALinkTool" -@@ -229,7 +229,7 @@ - /> - <Tool - Name="VCCLCompilerTool" -- AdditionalIncludeDirectories="$(opensslDir)\inc64" -+ AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include" - /> - <Tool - Name="VCManagedResourceCompilerTool" -@@ -243,7 +243,7 @@ - /> - <Tool - Name="VCLinkerTool" -- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib" -+ AdditionalDependencies="ws2_32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib" - /> - <Tool - Name="VCALinkTool" -@@ -291,7 +291,7 @@ - /> - <Tool - Name="VCCLCompilerTool" -- AdditionalIncludeDirectories="$(opensslDir)\inc32" -+ AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include" - /> - <Tool - Name="VCManagedResourceCompilerTool" -@@ -305,7 +305,7 @@ - /> - <Tool - Name="VCLinkerTool" -- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" -+ AdditionalDependencies="ws2_32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib" - /> - <Tool - Name="VCALinkTool" -@@ -354,7 +354,7 @@ - /> - <Tool - Name="VCCLCompilerTool" -- AdditionalIncludeDirectories="$(opensslDir)\inc64" -+ AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include" - /> - <Tool - Name="VCManagedResourceCompilerTool" -@@ -368,7 +368,7 @@ - /> - <Tool - Name="VCLinkerTool" -- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib" -+ AdditionalDependencies="ws2_32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib" - TargetMachine="17" - /> - <Tool -@@ -417,7 +417,7 @@ - /> - <Tool - Name="VCCLCompilerTool" -- AdditionalIncludeDirectories="$(opensslDir)\inc32" -+ AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include" - /> - <Tool - Name="VCManagedResourceCompilerTool" -@@ -431,7 +431,7 @@ - /> - <Tool - Name="VCLinkerTool" -- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" -+ AdditionalDependencies="ws2_32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib" - /> - <Tool - Name="VCALinkTool" -@@ -480,7 +480,7 @@ - /> - <Tool - Name="VCCLCompilerTool" -- AdditionalIncludeDirectories="$(opensslDir)\inc64" -+ AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include" - /> - <Tool - Name="VCManagedResourceCompilerTool" -@@ -494,7 +494,7 @@ - /> - <Tool - Name="VCLinkerTool" -- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib" -+ AdditionalDependencies="ws2_32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\libeay32.lib $(WORKDIR)\UnpackedTarball\openssl\out32dll\ssleay32.lib" - TargetMachine="17" - /> - <Tool diff -ru python3.old_/PCbuild/pcbuild.sln python3/PCbuild/pcbuild.sln --- python3.old_/PCbuild/pcbuild.sln 2012-09-29 10:00:48.000000000 +0200 +++ python3/PCbuild/pcbuild.sln 2012-11-13 14:50:39.220142472 +0100 commit 6189ff27d196b1d3e275c0dcf96fd8a0b8215f8c Author: Thorsten Behrens <[email protected]> AuthorDate: Thu Aug 16 14:40:02 2018 +0200 Commit: Thorsten Behrens <[email protected]> CommitDate: Thu Aug 16 14:51:28 2018 +0200 python3: upgrade to 3.3.7 - update to latest stable from 3.3 branch, with some security fixes - adjust patches - python-3.3.0-implicit-int.patch.1 now upstream - drop patches for unsupported platforms Change-Id: I3aac4f1a702ba7239830c4ebf887bc66afedf9cb diff --git a/Makefile.fetch b/Makefile.fetch index c3c471174b7d..3bfca1e61c36 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -82,6 +82,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,MWAW,MWAW_TARBALL) \ $(call fetch_Optional,NSS,NSS_TARBALL) \ $(call fetch_Optional,OPENSSL,OPENSSL_TARBALL) \ + $(call fetch_Optional,PYTHON,PYTHON_TARBALL) \ $(call fetch_Optional,VISIO,VISIO_TARBALL) \ $(call fetch_Optional,ZLIB,ZLIB_TARBALL) \ ,$(call fetch_Download_item_special,https://dev-www.libreoffice.org/src,$(item))) @@ -152,7 +153,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,CAIRO,$(PIXMAN_TARBALL)) \ $(call fetch_Optional,LIBPNG,$(PNG_TARBALL)) \ $(call fetch_Optional,POSTGRESQL,$(POSTGRESQL_TARBALL)) \ - $(call fetch_Optional,PYTHON,$(PYTHON_TARBALL)) \ $(call fetch_Optional,REDLAND,$(RAPTOR_TARBALL)) \ $(call fetch_Optional,REDLAND,$(RASQAL_TARBALL)) \ $(call fetch_Optional,REDLAND,$(REDLAND_TARBALL)) \ diff --git a/download.lst b/download.lst index 24a7d0db48c1..33f52b13134b 100644 --- a/download.lst +++ b/download.lst @@ -16,6 +16,8 @@ ZLIB_MD5SUM := 85adef240c5f370b308da8c938951a68 export ZLIB_TARBALL := zlib-1.2.11.tar.xz OPENSSL_MD5SUM := 44279b8557c3247cbe324e2322ecd114 export OPENSSL_TARBALL := openssl-1.0.2o.tar.gz +PYTHON_MD5SUM := 84e2f12f044ca53b577f6224c53f82ac +export PYTHON_TARBALL := Python-3.3.7.tar.xz export AFMS_TARBALL := 1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz export APACHE_COMMONS_CODEC_TARBALL := 2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz @@ -84,7 +86,6 @@ export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2 export PNG_MD5SUM := 6652e428d1d3fc3c6cb1362159b1cf3b export PNG_TARBALL := libpng-1.5.24.tar.gz export POSTGRESQL_TARBALL := c0b4799ea9850eae3ead14f0a60e9418-postgresql-9.2.1.tar.bz2 -export PYTHON_TARBALL := f3ebe34d4d8695bf889279b54673e10c-Python-3.3.3.tar.bz2 export RAPTOR_TARBALL := 4ceb9316488b0ea01acf011023cf7fff-raptor2-2.0.9.tar.gz export RASQAL_TARBALL := b12c5f9cfdb6b04efce5a4a186b8416b-rasqal-0.9.30.tar.gz export REDLAND_TARBALL := 32f8e1417a64d3c6f2c727f9053f55ea-redland-1.0.16.tar.gz diff --git a/python3/UnpackedTarball_python3.mk b/python3/UnpackedTarball_python3.mk index acd420d4dea4..c64f072e4f6a 100644 --- a/python3/UnpackedTarball_python3.mk +++ b/python3/UnpackedTarball_python3.mk @@ -20,15 +20,11 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,python3,\ )) $(eval $(call gb_UnpackedTarball_add_patches,python3,\ - python3/i100492-freebsd.patch.1 \ python3/python-3.3.0-i42553.patch.2 \ - python3/python-3.3.3-aix.patch.1 \ - python3/python-3.3.0-darwin.patch.1 \ python3/python-3.3.0-msvc2012.patch.1 \ python3/python-3.3.0-msvc-disable.patch.1 \ python3/python-3.3.0-msvc-x64.patch.1 \ python3/python-3.3.0-ssl.patch.1 \ - python3/python-3.3.0-implicit-int.patch.1 \ python3/python-3.3.0-gcc-4.8.patch.1 \ python3/python-3.3.0-pythreadstate.patch.1 \ python3/python-3.3.3-py17797.patch.1 \ diff --git a/python3/i100492-freebsd.patch.1 b/python3/i100492-freebsd.patch.1 deleted file mode 100644 index 7189a7e81956..000000000000 --- a/python3/i100492-freebsd.patch.1 +++ /dev/null @@ -1,80 +0,0 @@ -FreeBSD porting fixes, patch by [email protected] - ---- Python-3.3.0/configure 2012-11-28 09:00:41.094955090 +0000 -+++ Python-3.3.0/configure 2012-11-28 09:01:13.033329526 +0000 -@@ -5545,11 +5545,6 @@ - LDLIBRARY='libpython$(LDVERSION).so' - BLDLIBRARY='-L. -lpython$(LDVERSION)' - RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} -- case $ac_sys_system in -- FreeBSD*) -- SOVERSION=`echo $SOVERSION|cut -d "." -f 1` -- ;; -- esac - INSTSONAME="$LDLIBRARY".$SOVERSION - if test "$with_pydebug" != yes - then ---- Python-3.3.0/Lib/test/test_threading.py 2012-11-28 09:00:41.292957412 +0000 -+++ Python-3.3.0/Lib/test/test_threading.py 2012-11-28 09:01:13.017329339 +0000 -@@ -451,7 +451,7 @@ - # #12316 and #11870), and fork() from a worker thread is known to trigger - # problems with some operating systems (issue #3863): skip problematic tests - # on platforms known to behave badly. -- platforms_to_skip = ('freebsd4', 'freebsd5', 'freebsd6', 'netbsd5', -+ platforms_to_skip = ('freebsd4', 'freebsd5', 'freebsd6', 'freebsd7', 'netbsd5', - 'os2emx', 'hp-ux11') - - def _run_and_join(self, script): ---- Python-3.3.0/Python/thread_pthread.h 2012-11-28 09:00:41.097955124 +0000 -+++ Python-3.3.0/Python/thread_pthread.h 2012-11-28 09:01:13.018329351 +0000 -@@ -42,6 +42,10 @@ - #endif - #endif - -+#ifdef __FreeBSD__ -+#include <osreldate.h> -+#endif -+ - /* The POSIX spec says that implementations supporting the sem_* - family of functions must indicate this by defining - _POSIX_SEMAPHORES. */ -@@ -60,7 +64,6 @@ - in default setting. So the process scope is preferred to get - enough number of threads to work. */ - #ifdef __FreeBSD__ --#include <osreldate.h> - #if __FreeBSD_version >= 500000 && __FreeBSD_version < 504101 - #undef PTHREAD_SYSTEM_SCHED_SUPPORTED - #endif -@@ -186,6 +189,9 @@ - { - pthread_t th; - int status; -+#ifdef __FreeBSD__ -+ sigset_t set, oset; -+#endif - #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED) - pthread_attr_t attrs; - #endif -@@ -214,7 +220,10 @@ - #if defined(PTHREAD_SYSTEM_SCHED_SUPPORTED) - pthread_attr_setscope(&attrs, PTHREAD_SCOPE_SYSTEM); - #endif -- -+#ifdef __FreeBSD__ -+ sigfillset(&set); -+ SET_THREAD_SIGMASK(SIG_BLOCK, &set, &oset); -+#endif - status = pthread_create(&th, - #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED) - &attrs, -@@ -225,6 +234,9 @@ - (void *)arg - ); - -+#ifdef __FreeBSD__ -+ SET_THREAD_SIGMASK(SIG_SETMASK, &oset, NULL); -+#endif - #if defined(THREAD_STACK_SIZE) || defined(PTHREAD_SYSTEM_SCHED_SUPPORTED) - pthread_attr_destroy(&attrs); - #endif diff --git a/python3/python-3.3.0-darwin.patch.1 b/python3/python-3.3.0-darwin.patch.1 deleted file mode 100644 index 7c43d8b419db..000000000000 --- a/python3/python-3.3.0-darwin.patch.1 +++ /dev/null @@ -1,26 +0,0 @@ -LO needs to build both against MacOSX SDK and not produce universal binaries. - -diff -ru python3.old_/configure python3/configure ---- python3.old_/configure 2012-09-29 10:00:50.000000000 +0200 -+++ python3/configure 2012-11-13 16:37:26.030013256 +0100 -@@ -6353,7 +6353,19 @@ - if test "${enable_universalsdk}"; then - UNIVERSAL_ARCH_FLAGS="" - if test "$UNIVERSAL_ARCHS" = "32-bit" ; then -- UNIVERSAL_ARCH_FLAGS="-arch ppc -arch i386" -+ # LO does not use Universal Binaries (but the only way to set a SDK -+ # here implies that, so de-universalize here...) -+ case `/usr/bin/arch` in -+ i386) -+ UNIVERSAL_ARCH_FLAGS="-arch i386" -+ ;; -+ ppc) -+ UNIVERSAL_ARCH_FLAGS="-arch ppc" -+ ;; -+ *) -+ as_fn_error $? "Unexpected output of 'arch' on OSX" "$LINENO" 5 -+ ;; -+ esac - ARCH_RUN_32BIT="" - LIPO_32BIT_FLAGS="" - elif test "$UNIVERSAL_ARCHS" = "64-bit" ; then diff --git a/python3/python-3.3.0-implicit-int.patch.1 b/python3/python-3.3.0-implicit-int.patch.1 deleted file mode 100644 index 6e4d2b05127d..000000000000 --- a/python3/python-3.3.0-implicit-int.patch.1 +++ /dev/null @@ -1,30 +0,0 @@ -fix function names in import.h - -MSVC complains about some declarations in Include/import.h. -Apparently the problem is a missing space between PyAPI_FUNC(int) and the -function name, leading to concatenated int_PyImport... names and no -return type. - -diff -ru python3.old/Include/import.h python3/Include/import.h ---- python3.old/Include/import.h 2012-09-29 10:00:26.000000000 +0200 -+++ python3/Include/import.h 2012-11-27 16:09:26.449390966 +0100 -@@ -86,15 +86,15 @@ - - PyAPI_FUNC(void) _PyImport_ReInitLock(void); - --PyAPI_FUNC(PyObject *)_PyImport_FindBuiltin( -+PyAPI_FUNC(PyObject *) _PyImport_FindBuiltin( - const char *name /* UTF-8 encoded string */ - ); --PyAPI_FUNC(PyObject *)_PyImport_FindExtensionObject(PyObject *, PyObject *); --PyAPI_FUNC(int)_PyImport_FixupBuiltin( -+PyAPI_FUNC(PyObject *) _PyImport_FindExtensionObject(PyObject *, PyObject *); -+PyAPI_FUNC(int) _PyImport_FixupBuiltin( - PyObject *mod, - char *name /* UTF-8 encoded string */ - ); --PyAPI_FUNC(int)_PyImport_FixupExtensionObject(PyObject*, PyObject *, PyObject *); -+PyAPI_FUNC(int) _PyImport_FixupExtensionObject(PyObject*, PyObject *, PyObject *); - - struct _inittab { - char *name; /* ASCII encoded string */ diff --git a/python3/python-3.3.0-msvc-x64.patch.1 b/python3/python-3.3.0-msvc-x64.patch.1 index 7071573c04ac..9c3c96352f72 100644 --- a/python3/python-3.3.0-msvc-x64.patch.1 +++ b/python3/python-3.3.0-msvc-x64.patch.1 @@ -323,7 +323,7 @@ diff -ru python3/PCbuild/pcbuild.sln python3.new/PCbuild/pcbuild.sln <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> --- python3/PCbuild/pythoncore.vcxproj +++ python3/PCbuild/pythoncore.vcxproj -@@ -185,35 +185,35 @@ +@@ -195,35 +195,35 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <Midl> <TargetEnvironment>X64</TargetEnvironment> @@ -349,14 +349,14 @@ diff -ru python3/PCbuild/pcbuild.sln python3.new/PCbuild/pcbuild.sln <IgnoreSpecificDefaultLibraries>libc;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries> <BaseAddress>0x1e000000</BaseAddress> </Link> + <PreBuildEvent> + <Command>$(KillPythonExe) + IF %ERRORLEVEL% NEQ 0 ( + echo kill_python: warning: could not kill running Pythons, exit code %ERRORLEVEL% + exit /b 0 + )</Command> + </PreBuildEvent> + <PreBuildEvent> + <Message>Killing any running $(PythonExe) instances...</Message> + </PreBuildEvent> </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <AdditionalOptions>/Zm200 %(AdditionalOptions)</AdditionalOptions> - <Optimization>Disabled</Optimization> - <InlineFunctionExpansion>Default</InlineFunctionExpansion> - <IntrinsicFunctions>false</IntrinsicFunctions> - <AdditionalIncludeDirectories>..\Python;..\Modules\zlib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_USRDLL;Py_BUILD_CORE;Py_ENABLE_SHARED;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> - </ClCompile> diff --git a/python3/python-3.3.3-aix.patch.1 b/python3/python-3.3.3-aix.patch.1 deleted file mode 100644 index f510a81da840..000000000000 --- a/python3/python-3.3.3-aix.patch.1 +++ /dev/null @@ -1,145 +0,0 @@ -build with GCC on AIX - ---- Python-3.3.3/configure 2012-11-28 09:05:45.990529603 +0000 -+++ Python-3.3.3/configure 2012-11-28 09:06:23.037963934 +0000 -@@ -3426,8 +3426,6 @@ - else - - case $ac_sys_system in -- AIX*) CC=${CC:-xlc_r} -- without_gcc=;; - *) without_gcc=no;; - esac - fi -@@ -5541,10 +5539,18 @@ - PY3LIBRARY=libpython3.so - fi - ;; -- Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*) -+ Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*|AIX*) - LDLIBRARY='libpython$(LDVERSION).so' -- BLDLIBRARY='-L. -lpython$(LDVERSION)' -- RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} -+ case $ac_sys_system in -+ AIX*) -+ BLDLIBRARY='-Wl,-brtl -L. -lpython$(LDVERSION)' -+ RUNSHARED=LIBPATH=`pwd`:${LIBPATH} -+ ;; -+ *) -+ BLDLIBRARY='-L. -lpython$(LDVERSION)' -+ RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} -+ ;; -+ esac - INSTSONAME="$LDLIBRARY".$SOVERSION - if test "$with_pydebug" != yes - then -@@ -8301,8 +8307,13 @@ - then - case $ac_sys_system/$ac_sys_release in - AIX*) -- BLDSHARED="\$(srcdir)/Modules/ld_so_aix \$(CC) -bI:\$(srcdir)/Modules/python.exp" -- LDSHARED="\$(BINLIBDEST)/config/ld_so_aix \$(CC) -bI:\$(BINLIBDEST)/config/python.exp" -+ if test "$GCC" = "yes"; then -+ LDSHARED='$(CC) -shared' -+ BLDSHARED='$(CC) -Wl,-brtl -shared' -+ else -+ BLDSHARED="\$(srcdir)/Modules/ld_so_aix \$(CC) -bI:\$(srcdir)/Modules/python.exp" -+ LDSHARED="\$(BINLIBDEST)/config/ld_so_aix \$(CC) -bI:\$(BINLIBDEST)/config/python.exp" -+ fi - ;; - IRIX/5*) LDSHARED="ld -shared";; - IRIX*/6*) LDSHARED="ld ${SGI_ABI} -shared -all";; ---- Python-3.3.3/configure.ac 2012-11-28 09:05:45.990529603 +0000 -+++ Python-3.3.3/configure.ac 2012-11-28 09:06:23.038963946 +0000 -@@ -545,8 +545,6 @@ - without_gcc=$withval;; - esac], [ - case $ac_sys_system in -- AIX*) CC=${CC:-xlc_r} -- without_gcc=;; - *) without_gcc=no;; - esac]) - AC_MSG_RESULT($without_gcc) -@@ -910,10 +908,18 @@ - PY3LIBRARY=libpython3.so - fi - ;; -- Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*) -+ Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*|AIX*) - LDLIBRARY='libpython$(LDVERSION).so' -- BLDLIBRARY='-L. -lpython$(LDVERSION)' -- RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} -+ case $ac_sys_system in -+ AIX*) -+ BLDLIBRARY='-Wl,-brtl -L. -lpython$(LDVERSION)' -+ RUNSHARED=LIBPATH=`pwd`:${LIBPATH} -+ ;; -+ *) -+ BLDLIBRARY='-L. -lpython$(LDVERSION)' -+ RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH} -+ ;; -+ esac - case $ac_sys_system in - FreeBSD*) - SOVERSION=`echo $SOVERSION|cut -d "." -f 1` -@@ -1866,8 +1872,13 @@ - then - case $ac_sys_system/$ac_sys_release in - AIX*) -- BLDSHARED="\$(srcdir)/Modules/ld_so_aix \$(CC) -bI:\$(srcdir)/Modules/python.exp" -- LDSHARED="\$(BINLIBDEST)/config/ld_so_aix \$(CC) -bI:\$(BINLIBDEST)/config/python.exp" -+ if test "$GCC" = "yes"; then -+ LDSHARED='$(CC) -shared' -+ BLDSHARED='$(CC) -Wl,-brtl -shared' -+ else -+ BLDSHARED="\$(srcdir)/Modules/ld_so_aix \$(CC) -bI:\$(srcdir)/Modules/python.exp" -+ LDSHARED="\$(BINLIBDEST)/config/ld_so_aix \$(CC) -bI:\$(BINLIBDEST)/config/python.exp" -+ fi - ;; - IRIX/5*) LDSHARED="ld -shared";; - IRIX*/6*) LDSHARED="ld ${SGI_ABI} -shared -all";; ---- Python-3.3.3/Makefile.pre.in 2012-11-28 09:05:45.861528086 +0000 -+++ Python-3.3.3/Makefile.pre.in 2012-11-28 09:06:23.046964040 +0000 -@@ -493,14 +493,20 @@ - - libpython$(LDVERSION).so: $(LIBRARY_OBJS) - if test $(INSTSONAME) != $(LDLIBRARY); then \ -- $(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \ -+ if [ "`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" != "aix" ]; then \ -+ SONAME="-Wl,-h$(INSTSONAME)"; \ -+ fi; \ -+ $(BLDSHARED) $(SONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \ - $(LN) -f $(INSTSONAME) $@; \ - else \ - $(BLDSHARED) -o $@ $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \ - fi - - libpython3.so: libpython$(LDVERSION).so -- $(BLDSHARED) $(NO_AS_NEEDED) -o $@ -Wl,-h$@ $^ -+ if [ "`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" != "aix" ]; then \ -+ SONAME="-Wl,-h$@"; \ -+ fi; \ -+ $(BLDSHARED) $(NO_AS_NEEDED) -o $@ $(SONAME) $^ - - libpython$(LDVERSION).dylib: $(LIBRARY_OBJS) - $(CC) -dynamiclib -Wl,-single_module $(PY_LDFLAGS) -undefined dynamic_lookup -Wl,-install_name,$(prefix)/lib/libpython$(LDVERSION).dylib -Wl,-compatibility_version,$(VERSION) -Wl,-current_version,$(VERSION) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \ -@@ -1106,6 +1112,8 @@ - export PATH; PATH="`pwd`:$$PATH"; \ - export PYTHONPATH; PYTHONPATH="`pwd`/Lib"; \ - export DYLD_FRAMEWORK_PATH; DYLD_FRAMEWORK_PATH="`pwd`"; \ -+ export LD_LIBRARY_PATH; LD_LIBRARY_PATH="`pwd`${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"; \ -+ export LIBPATH; LIBPATH="`pwd`${LIBPATH:+:$LIBPATH}"; \ - export EXE; EXE="$(BUILDEXE)"; \ - if [ -n "$(MULTIARCH)" ]; then export MULTIARCH; MULTIARCH=$(MULTIARCH); fi; \ - export PYTHON_FOR_BUILD; \ ---- Python-3.3.3/Modules/Setup.dist 2012-11-28 09:05:45.935528957 +0000 -+++ Python-3.3.3/Modules/Setup.dist 2012-11-28 09:06:23.052964111 +0000 -@@ -177,7 +177,7 @@ - #_bisect _bisectmodule.c # Bisection algorithms - #_heapq _heapqmodule.c # Heap queue algorithm - --#unicodedata unicodedata.c # static Unicode character database -+unicodedata unicodedata.c # static Unicode character database - - - # Modules with some UNIX dependencies -- on by default: _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
