This is an automated email from the ASF dual-hosted git repository.
ardovm pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 979772527e057b70bb93d4370b1de45120f68236
Author: Damjan Jovanovic <dam...@apache.org>
AuthorDate: Mon Mar 18 17:20:28 2024 +0200
Upgrade OpenSSL to version 3.0.13.
LICENSE and NOTICE files now reflect its new license.
The obsolete "DISABLE_OPENSSL" setting has been removed.
Patch Python 2 to support OpenSSL 3.0.x.
Support old versions of Windows.
Uses Strawberry Perl on Windows to build, fetched as a dependency.
Workarounds for missing integer limit constants in the old version of MSVC
we use.
NASM now works when it's in the PATH, instead of needing --with-nasm-path
to ./configure.
Patch by: me
(cherry picked from commit 4c5b548fb6ece87dd30bbf720aca0d994a749167)
---
main/LICENSE | 125 -------
main/NOTICE | 10 +-
main/RepositoryFixes.mk | 4 +-
main/external_deps.lst | 15 +-
main/openssl/makefile.mk | 94 ++---
main/openssl/openssl.patch | 214 +++--------
main/openssl/openssllnx.patch | 25 --
main/openssl/opensslunx.patch | 10 +
main/openssl/prj/d.lst | 6 +-
main/python/python-2.7.18-msvs9.patch | 579 +++++++++++++++---------------
main/scp2/source/ooo/file_library_ooo.scp | 4 +-
11 files changed, 427 insertions(+), 659 deletions(-)
diff --git a/main/LICENSE b/main/LICENSE
index aa6d1e0b1e..9cf79ea9fb 100644
--- a/main/LICENSE
+++ b/main/LICENSE
@@ -1210,131 +1210,6 @@ ings in this Software without prior written
authorization from him.
____
-For OpenSSL - built in main/openssl/:
-- BSD-style license with advertising clause
-
-The OpenSSL toolkit stays under a double license, i.e. both the conditions of
-the OpenSSL License and the original SSLeay license apply to the toolkit.
-See below for the actual license texts. Actually both licenses are BSD-style
-Open Source licenses. In case of any license issues related to OpenSSL
-please contact openssl-c...@openssl.org.
-
-OpenSSL License
----------------
-
-===================================================================
-Copyright (c) 1998-2018 The OpenSSL Project. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
-3. All advertising materials mentioning features or use of this
- software must display the following acknowledgment:
- "This product includes software developed by the OpenSSL Project
- for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
-
-4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- endorse or promote products derived from this software without
- prior written permission. For written permission, please contact
- openssl-c...@openssl.org.
-
-5. Products derived from this software may not be called "OpenSSL"
- nor may "OpenSSL" appear in their names without prior written
- permission of the OpenSSL Project.
-
-6. Redistributions of any form whatsoever must retain the following
- acknowledgment:
- "This product includes software developed by the OpenSSL Project
- for use in the OpenSSL Toolkit (http://www.openssl.org/)"
-
-THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
-EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR
-ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-===================================================================
-
-This product includes cryptographic software written by Eric Young
-(e...@cryptsoft.com). This product includes software written by Tim
-Hudson (t...@cryptsoft.com).
-
-Original SSLeay License
------------------------
-
-Copyright (C) 1995-1998 Eric Young (e...@cryptsoft.com)
-All rights reserved.
-
-This package is an SSL implementation written
-by Eric Young (e...@cryptsoft.com).
-The implementation was written so as to conform with Netscapes SSL.
-
-This library is free for commercial and non-commercial use as long as
-the following conditions are aheared to. The following conditions
-apply to all code found in this distribution, be it the RC4, RSA,
-lhash, DES, etc., code; not just the SSL code. The SSL documentation
-included with this distribution is covered by the same copyright terms
-except that the holder is Tim Hudson (t...@cryptsoft.com).
-
-Copyright remains Eric Young's, and as such any Copyright notices in
-the code are not to be removed.
-If this package is used in a product, Eric Young should be given attribution
-as the author of the parts of the library used.
-This can be in the form of a textual message at program startup or
-in documentation (online or textual) provided with the package.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the copyright
- notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-3. All advertising materials mentioning features or use of this software
- must display the following acknowledgement:
- "This product includes cryptographic software written by
- Eric Young (e...@cryptsoft.com)"
- The word 'cryptographic' can be left out if the rouines from the library
- being used are not cryptographic related :-).
-4. If you include any Windows specific code (or a derivative thereof) from
- the apps directory (application code) you must include an acknowledgement:
- "This product includes software written by Tim Hudson (t...@cryptsoft.com)"
-
-THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGE.
-
-The licence and distribution terms for any publically available version or
-derivative of this code cannot be changed. i.e. this code cannot simply be
-copied and put under another distribution licence
-[including the GNU Public Licence.]
-
-____
-
For ICC - built in main/icc/:
- ICC Software License equal to BSD license
diff --git a/main/NOTICE b/main/NOTICE
index 43d0de4cc7..2ccf6b03fa 100644
--- a/main/NOTICE
+++ b/main/NOTICE
@@ -172,23 +172,21 @@ ____
As part of the base system this product also includes code from the following
projects which are licensed under the Apache license:
+- OpenSSL
- redland
- StAX
The notices from these projects are following:
+OpenSSL:
+[no notices]
+
redland
This product includes Redland software (http://librdf.org/)
developed at the Institute for Learning and Research Technology,
University of Bristol, UK (http://www.bristol.ac.uk/).
-
StAX
[no notices]
-____
-
-This product includes software developed by the OpenSSL Project
-for use in the OpenSSL Toolkit. (https://www.openssl.org/)
-
$HeadURL$
diff --git a/main/RepositoryFixes.mk b/main/RepositoryFixes.mk
index a82b01820e..45f414bd36 100644
--- a/main/RepositoryFixes.mk
+++ b/main/RepositoryFixes.mk
@@ -146,8 +146,8 @@ gb_Library_FILENAMES := $(patsubst
svt:isvt%,svt:svtool%,$(gb_Library_FILENAMES)
gb_Library_FILENAMES := $(patsubst tl:itl%,tl:itools%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
vbahelper:ivbahelper%,vbahelper:vbahelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
vos3:ivos3%,vos3:ivos%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst
crypto:icrypto%,crypto:libeay32%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst
ssl:issl%,ssl:ssleay32%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst
crypto:icrypto%,crypto:libcrypto%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst
ssl:issl%,ssl:libssl%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
xml2:ixml2%,xml2:libxml2%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
xslt:ixslt%,xslt:libxslt%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
rdf:irdf%,rdf:librdf%,$(gb_Library_FILENAMES))
diff --git a/main/external_deps.lst b/main/external_deps.lst
index 072031667e..237b599761 100644
--- a/main/external_deps.lst
+++ b/main/external_deps.lst
@@ -150,10 +150,17 @@ if (SOLAR_JAVA==TRUE)
URL1 = https://archive.apache.org/dist/commons/lang/source/$(name)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
-if (SYSTEM_OPENSSL!=YES && DISABLE_OPENSSL!=TRUE)
- MD5 = cdc2638f789ecc2db2c91488265686c1
- name = openssl-1.0.2u.tar.gz
- URL1 = https://www.openssl.org/source/old/1.0.2/$(name)
+if (SYSTEM_OPENSSL!=YES)
+ MD5 = c15e53a62711002901d3515ac8b30b86
+ name = openssl-3.0.13.tar.gz
+ URL1 = https://www.openssl.org/source/$(name)
+ URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
+
+# On Windows, we need Strawberry Perl to build OpenSSL 3:
+if (SYSTEM_OPENSSL!=YES && GUI==WNT)
+ MD5 = 93fdfe261588bc82ab3a0bd4f5945b60
+ name = strawberry-perl-5.32.1.1-32bit-portable.zip
+ URL1 = https://strawberryperl.com/download/5.32.1.1/$(name)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_LIBXML != YES)
diff --git a/main/openssl/makefile.mk b/main/openssl/makefile.mk
index 6d8afa27b5..45def9d385 100644
--- a/main/openssl/makefile.mk
+++ b/main/openssl/makefile.mk
@@ -37,15 +37,11 @@ TARGET=openssl
@echo "Using system openssl...."
.ENDIF
-.IF "$(DISABLE_OPENSSL)" == "TRUE"
-@all:
- @echo "openssl disabled...."
-.ENDIF
-OPENSSL_NAME=openssl-1.0.2u
+OPENSSL_NAME=openssl-3.0.13
TARFILE_NAME=$(OPENSSL_NAME)
-TARFILE_MD5=cdc2638f789ecc2db2c91488265686c1
+TARFILE_MD5=c15e53a62711002901d3515ac8b30b86
CONFIGURE_DIR=.
CONFIGURE_ACTION=config
@@ -67,7 +63,7 @@ UNAME=$(shell uname)
.ENDIF
.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
- PATCH_FILES=openssllnx.patch
+ PATCH_FILES=opensslunx.patch
.IF "$(CPU)" == "I"
.IF "$(UNAME)" == "GNU/kFreeBSD"
CONFIGURE_ACTION=Configure debian-kfreebsd-i386 no-dso
no-shared $(NO_ASM)
@@ -117,6 +113,7 @@ UNAME=$(shell uname)
.IF "$(OS)" == "WNT"
.IF "$(COM)"=="GCC"
+
PATCH_FILES=opensslmingw.patch
.IF "$(USE_MINGW)" == "cygwin"
CONFIGURE_ACTION=$(PERL) configure
@@ -128,7 +125,7 @@ OUT2LIB += libcrypto.*
OUT2LIB += libssl.*
OUT2BIN = ssleay32.dll
OUT2BIN += libeay32.dll
-.ELSE
+.ELSE # "$(USE_MINGW)" == "cygwin"
CONFIGURE_ACTION=
BUILD_ACTION=cmd /c "ms\mingw32"
OUT2LIB = out/libcrypto_static.*
@@ -137,47 +134,56 @@ OUT2LIB += out/libcrypto.*
OUT2LIB += out/libssl.*
OUT2BIN = out/ssleay32.dll
OUT2BIN += out/libeay32.dll
-.ENDIF
-.ELSE
+.ENDIF # "$(USE_MINGW)" == "cygwin"
- PATCH_FILES=openssl.patch
- .IF "$(MAKETARGETS)" == ""
- # The env. vars CC and PERL are used by nmake, and
nmake insists on '\'s
- # If WRAPCMD is set it is prepended before the
compiler, don't touch that.
- .IF "$(WRAPCMD)"==""
- CC!:=$(subst,/,\ $(normpath,1 $(CC)))
- .EXPORT : CC
- .ENDIF
- PERL_bak:=$(PERL)
- PERL!:=$(subst,/,\ $(normpath,1 $(PERL)))
- .EXPORT : PERL
- PERL!:=$(PERL_bak)
- .ENDIF
+.ELSE # "$(COM)"=="GCC"
- #CONFIGURE_ACTION=cmd /c $(PERL:s!\!/!) configure
- .IF "$(CPUNAME)"=="INTEL"
- CONFIGURE_ACTION=$(PERL) configure $(NO_ASM)
- CONFIGURE_FLAGS=VC-WIN32
- .IF "$(NASM_PATH)"=="NO_NASM_HOME"
- BUILD_ACTION=cmd /c "ms$(EMQ)\do_ms.bat $(subst,/,\
$(normpath,1 $(PERL)))" && nmake -f ms/ntdll.mak
- .ELSE
- BUILD_ACTION=cmd /c "ms$(EMQ)\do_nasm.bat $(subst,/,\
$(normpath,1 $(PERL)))" && nmake -f ms/ntdll.mak
- .ENDIF
- .ELIF "$(CPUNAME)"=="X86_64"
- CONFIGURE_ACTION=$(PERL) configure $(NO_ASM)
- CONFIGURE_FLAGS=VC-WIN64A
- BUILD_ACTION=cmd /c "ms$(EMQ)\do_win64a.bat $(subst,/,\
$(normpath,1 $(PERL)))" && cmd /c "nmake -f ms/ntdll.mak"
- .ENDIF
+ PATCH_FILES=openssl.patch
- OUT2LIB = out32dll$/ssleay32.lib
- OUT2LIB += out32dll$/libeay32.lib
- OUT2BIN = out32dll$/ssleay32.dll
- OUT2BIN += out32dll$/libeay32.dll
- OUT2INC = inc32$/openssl$/*
+ # Extract Strawberry Perl and use CONFIGURE_ACTION to insert it, and
NASM which it needs, into the PATH.
+ # Also define:
+ # - certain constants absent in the old MSVC we use (INT64_MAX,
INT64_MIN, UINT64_MAX).
+ # - the minimum Windows version to support (_WIN32_WINDOWS=0x0400 for
Windows 95, _WIN32_WINNT=0x0400 for Windows NT 4.0).
+ # - OPENSSL_NO_ASYNC=1 to stop using async functions that require old
Windows versions.
+ STRAWBERRY_PERL_DIR=$(shell cygpath -u
$(SOLARSRC)/openssl/$(INPATH)/misc/build/strawberry-perl)
+ .IF "$(NASM_PATH)"=="NASM_IN_PATH"
+ CONFIGURE_PATH=$(STRAWBERRY_PERL_DIR)/perl/bin:$(PATH)
+ .ELSE
+ NASM_PATH_NIX=$(shell cygpath -u $(NASM_PATH))
+
CONFIGURE_PATH=$(STRAWBERRY_PERL_DIR)/perl/bin:$(NASM_PATH_NIX):$(PATH)
.ENDIF
-.ENDIF
+ CONFIGURE_ACTION=\
+ if test -d "$(STRAWBERRY_PERL_DIR)"; \
+ then echo Found Strawberry Perl; \
+ else mkdir "$(STRAWBERRY_PERL_DIR)" && unzip -d
$(STRAWBERRY_PERL_DIR)
$(SOLARSRC)/../ext_sources/93fdfe261588bc82ab3a0bd4f5945b60-strawberry-perl-5.32.1.1-32bit-portable.zip
; \
+ fi && \
+ PATH="$(CONFIGURE_PATH)" \
+ PERL= \
+ CPPFLAGS="$(SOLARINC) \
+ -DOPENSSL_NO_ASYNC=1 \
+ -DWINVER=0x0400 \
+ -D_WIN32_WINNT=0x0400 \
+ -D_WIN32_WINDOWS=0x0400 \
+ -DINT64_MAX=9223372036854775807i64 \
+ -DINT64_MIN=(-9223372036854775807i64-1) \
+ -DUINT64_MAX=0xffffffffffffffffui64" \
+ RCFLAGS="$(SOLARINC)" \
+ perl configure $(NO_ASM)
+ .IF "$(CPUNAME)"=="INTEL"
+ CONFIGURE_FLAGS=VC-WIN32
+ .ELIF "$(CPUNAME)"=="X86_64"
+ CONFIGURE_FLAGS=VC-WIN64A
+ .ENDIF
+ BUILD_ACTION=LIB="$(ILIB)" nmake
+
+ OUT2BIN = libcrypto-3.dll
+ OUT2BIN += libssl-3.dll
+ OUT2INC = include$/openssl$/*
+
+.ENDIF # "$(COM)"=="GCC"
+
+.ENDIF # "$(OS)" == "WNT"
-#set
INCLUDE=D:\sol_temp\n\msvc7net3\PlatformSDK\include;D:\sol_temp\n\msvc7net3\include\
&& set path=%path%;D:\sol_temp\r\btw\SRC680\perl\bin &&
# --- Targets ------------------------------------------------------
diff --git a/main/openssl/openssl.patch b/main/openssl/openssl.patch
index fb48031e21..c837f1e919 100644
--- a/main/openssl/openssl.patch
+++ b/main/openssl/openssl.patch
@@ -1,166 +1,50 @@
-diff -ur misc/openssl-1.0.2u/Configure misc/build/openssl-1.0.2u/Configure
---- misc/openssl-1.0.2u/Configure 2018-08-14 05:49:04.000000000 -0700
-+++ misc/build/openssl-1.0.2u/Configure 2018-08-26 14:51:25.397910000
-0700
-@@ -477,19 +477,20 @@
- "android-mips","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib
-O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL
BF_PTR:${mips32_asm}:o32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-
- #### *BSD [do see comment about ${BSDthreads} above!]
--"BSD-generic32","gcc:-O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG
RC2_CHAR RC4_INDEX DES_INT
DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"BSD-x86", "gcc:-DL_ENDIAN -O3 -fomit-frame-pointer
-Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des}
${x86_gcc_opts}:${x86_asm}:a.out:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"BSD-x86-elf", "gcc:-DL_ENDIAN -O3 -fomit-frame-pointer
-Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des}
${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"debug-BSD-x86-elf", "gcc:-DL_ENDIAN -O3 -Wall -g::${BSDthreads}:::BN_LLONG
${x86_gcc_des}
${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"BSD-sparcv8", "gcc:-DB_ENDIAN -O3 -mcpu=v8
-Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT
DES_UNROLL:${sparcv8_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"BSD-generic32","$ENV{'FREEBSDCC'}:-O3 -fomit-frame-pointer -Wall
$ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT
DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)",
-+"BSD-x86", "$ENV{'FREEBSDCC'}:-DL_ENDIAN -O3 -fomit-frame-pointer -Wall
$ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG ${x86_gcc_des}
${x86_gcc_opts}:${x86_asm}:a.out:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIBVER)",
-+"BSD-x86-elf", "$ENV{'FREEBSDCC'}:-DL_ENDIAN -O3 -fomit-frame-pointer
-Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG ${x86_gcc_des}
${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIBVER)",
-+"debug-BSD-x86-elf", "$ENV{'FREEBSDCC'}:-DL_ENDIAN -O3 -Wall -g
$ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG ${x86_gcc_des}
${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIBVER)",
-+"BSD-sparcv8", "$ENV{'FREEBSDCC'}:-DB_ENDIAN -O3 -mcpu=v8 -Wall
$ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT
DES_UNROLL:${sparcv8_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)",
-
--"BSD-generic64","gcc:-O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK
DES_INT
DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"BSD-generic64","$ENV{'FREEBSDCC'}:-O3 -Wall
$ENV{'CFLAGS'}::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT
DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)",
- # -DMD32_REG_T=int doesn't actually belong in sparc64 target, it
- # simply *happens* to work around a compiler bug in gcc 3.3.3,
- # triggered by RIPEMD160 code.
--"BSD-sparc64", "gcc:-DB_ENDIAN -O3 -DMD32_REG_T=int
-Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC2
BF_PTR:${sparcv9_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"BSD-ia64", "gcc:-DL_ENDIAN -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG
RC4_CHUNK DES_UNROLL
DES_INT:${ia64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
--"BSD-x86_64", "cc:-DL_ENDIAN -O3 -Wall::${BSDthreads}:::SIXTY_FOUR_BIT_LONG
RC4_CHUNK DES_INT
DES_UNROLL:${x86_64_asm}:elf:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"BSD-sparc64", "$ENV{'FREEBSDCC'}:-DB_ENDIAN -O3 -DMD32_REG_T=int
-Wall $ENV{'CFLAGS'}::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_CHUNK DES_INT
DES_PTR DES_RISC2
BF_PTR:${sparcv9_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)",
-+"BSD-ia64", "$ENV{'FREEBSDCC'}:-DL_ENDIAN -O3 -Wall
$ENV{'CFLAGS'}::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL
DES_INT:${ia64_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)",
-+"BSD-x86_64", "$ENV{'FREEBSDCC'}:-DL_ENDIAN -O3 -Wall
$ENV{'CFLAGS'}::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT
DES_UNROLL:${x86_64_asm}:elf:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)",
-+"BSD-alpha", "$ENV{'FREEBSDCC'}:-DL_ENDIAN -O -Wall
$ENV{'CFLAGS'}::${BSDthreads}:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL
DES_RISC1:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIBVER)",
-
- "bsdi-elf-gcc", "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3
-march=i486 -Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des}
${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-
-@@ -592,9 +593,9 @@
- "debug-VC-WIN64A","cl:-W3 -Gs0 -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32
-DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DUNICODE -D_UNICODE
-D_CRT_SECURE_NO_DEPRECATE:::WIN64A::SIXTY_FOUR_BIT RC4_CHUNK_LL DES_INT
EXPORT_VAR_AS_FN:".eval{my
$asm=$x86_64_asm;$asm=~s/x86_64-gcc\.o/bn_asm.o/;$asm}.":auto:win32",
- # x86 Win32 target defaults to ANSI API, if you want UNICODE, complement
- # 'perl Configure VC-WIN32' with '-DUNICODE -D_UNICODE'
--"VC-WIN32","cl:-W3 -WX -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32
-DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE
-D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN
${x86_gcc_opts}:${x86_asm}:win32n:win32",
-+"VC-WIN32","cl:-W3 -w44129 -WX -Gs0 -GF -Gy -nologo -DOPENSSL_SYSNAME_WIN32
-DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE
-D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN
${x86_gcc_opts}:${x86_asm}:win32n:win32",
- # Unified CE target
--"debug-VC-WIN32","cl:-W3 -WX -Gs0 -GF -Gy -Zi -nologo -DOPENSSL_SYSNAME_WIN32
-DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE
-D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN
${x86_gcc_opts}:${x86_asm}:win32n:win32",
-+"debug-VC-WIN32","cl:-W3 -W44129 -WX -Gs0 -GF -Gy -Zi -nologo
-DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN
-D_CRT_SECURE_NO_DEPRECATE -D_WINSOCK_DEPRECATED_NO_WARNINGS:::WIN32::BN_LLONG
RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}:${x86_asm}:win32n:win32",
- "VC-CE","cl::::WINCE::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN
${x86_gcc_opts}:${no_asm}:win32",
-
- # Borland C++ 4.5
-@@ -2065,10 +2066,12 @@
- if ( $perl =~ m@^/@) {
- &dofile("tools/c_rehash",$perl,'^#!/', '#!%s','^my \$dir;$', 'my
$dir = "' . $openssldir . '";', '^my \$prefix;$', 'my $prefix = "' . $prefix .
'";');
- &dofile("apps/CA.pl",$perl,'^#!/', '#!%s');
-+ &dofile("apps/tsget",$perl,'^#!/', '#!%s');
- } else {
- # No path for Perl known ...
- &dofile("tools/c_rehash",'/usr/local/bin/perl','^#!/', '#!%s','^my
\$dir;$', 'my $dir = "' . $openssldir . '";', '^my \$prefix;$', 'my $prefix =
"' . $prefix . '";');
- &dofile("apps/CA.pl",'/usr/local/bin/perl','^#!/', '#!%s');
-+ &dofile("apps/tsget",'/usr/local/bin/perl',,'^#!/', '#!%s');
- }
- if ($depflags ne $default_depflags && !$make_depend) {
- $warn_make_depend++;
-diff -ur misc/openssl-1.0.2u/config misc/build/openssl-1.0.2u/config
---- misc/openssl-1.0.2u/config 2018-08-14 05:48:56.000000000 -0700
-+++ misc/build/openssl-1.0.2u/config 2018-08-26 14:49:34.431584000 -0700
-@@ -762,14 +762,8 @@
- sparc64-*-*bsd*) OUT="BSD-sparc64" ;;
- ia64-*-*bsd*) OUT="BSD-ia64" ;;
- amd64-*-*bsd*) OUT="BSD-x86_64" ;;
-- *86*-*-*bsd*) # mimic ld behaviour when it's looking for
libc...
-- if [ -L /usr/lib/libc.so ]; then # [Free|Net]BSD
-- libc=/usr/lib/libc.so
-- else # OpenBSD
-- # ld searches for highest libc.so.* and so do we
-- libc=`(ls /usr/lib/libc.so.* /lib/libc.so.* | tail
-1) 2>/dev/null`
-- fi
-- case "`(file -L $libc) 2>/dev/null`" in
-+ *86*-*-*bsd*)
-+ case "`(file -L /bin/sh) 2>/dev/null`" in
- *ELF*) OUT="BSD-x86-elf" ;;
- *) OUT="BSD-x86"; options="$options no-sse2" ;;
- esac ;;
-diff -ur misc/openssl-1.0.2u/ms/do_ms.bat
misc/build/openssl-1.0.2u/ms/do_ms.bat
---- misc/openssl-1.0.2u/ms/do_ms.bat 2018-08-14 05:48:59.000000000 -0700
-+++ misc/build/openssl-1.0.2u/ms/do_ms.bat 2018-08-26 14:49:34.432106000
-0700
-@@ -1,11 +1,11 @@
-
--perl util\mkfiles.pl >MINFO
--perl util\mk1mf.pl no-asm VC-WIN32 >ms\nt.mak
--perl util\mk1mf.pl dll no-asm VC-WIN32 >ms\ntdll.mak
-+%1 util\mkfiles.pl >MINFO
-+%1 util\mk1mf.pl no-asm VC-WIN32 >ms\nt.mak
-+%1 util\mk1mf.pl dll no-asm VC-WIN32 >ms\ntdll.mak
- if x%OSVERSION% == x goto skipce
--perl util\mk1mf.pl no-asm VC-CE >ms\ce.mak
--perl util\mk1mf.pl dll no-asm VC-CE >ms\cedll.mak
-+%1 util\mk1mf.pl no-asm VC-CE >ms\ce.mak
-+%1 util\mk1mf.pl dll no-asm VC-CE >ms\cedll.mak
- :skipce
-
--perl util\mkdef.pl 32 libeay > ms\libeay32.def
--perl util\mkdef.pl 32 ssleay > ms\ssleay32.def
-+%1 util\mkdef.pl 32 libeay > ms\libeay32.def
-+%1 util\mkdef.pl 32 ssleay > ms\ssleay32.def
-diff -ur misc/openssl-1.0.2u/ms/do_win64a.bat
misc/build/openssl-1.0.2u/ms/do_win64a.bat
---- misc/openssl-1.0.2u/ms/do_win64a.bat 2018-08-14 05:48:59.000000000
-0700
-+++ misc/build/openssl-1.0.2u/ms/do_win64a.bat 2018-08-26 14:49:34.432647000
-0700
-@@ -1,19 +1,19 @@
--perl util\mkfiles.pl >MINFO
-+%1 util\mkfiles.pl >MINFO
-
- cmd /c "nasm -f win64 -v" >NUL 2>&1
- if %errorlevel% neq 0 goto ml64
-
--perl ms\uplink-x86_64.pl nasm > ms\uptable.asm
-+%1 ms\uplink-x86_64.pl nasm > ms\uptable.asm
- nasm -f win64 -o ms\uptable.obj ms\uptable.asm
- goto proceed
-
- :ml64
--perl ms\uplink-x86_64.pl masm > ms\uptable.asm
-+%1 ms/uplink-x86_64.pl masm > ms/uptable.asm
- ml64 -c -Foms\uptable.obj ms\uptable.asm
-
- :proceed
--perl util\mk1mf.pl VC-WIN64A >ms\nt.mak
--perl util\mk1mf.pl dll VC-WIN64A >ms\ntdll.mak
-+%1 util\mk1mf.pl VC-WIN64A >ms\nt.mak
-+%1 util\mk1mf.pl dll VC-WIN64A >ms\ntdll.mak
-
--perl util\mkdef.pl 32 libeay > ms\libeay32.def
--perl util\mkdef.pl 32 ssleay > ms\ssleay32.def
-+%1 util\mkdef.pl 32 libeay > ms\libeay32.def
-+%1 util\mkdef.pl 32 ssleay > ms\ssleay32.def
-diff -ur misc/openssl-1.0.2u/util/mk1mf.pl
misc/build/openssl-1.0.2u/util/mk1mf.pl
---- misc/openssl-1.0.2u/util/mk1mf.pl 2018-08-14 05:48:59.000000000 -0700
-+++ misc/build/openssl-1.0.2u/util/mk1mf.pl 2018-08-26 14:49:34.433421000
-0700
-@@ -163,7 +163,7 @@
- $inc_def="outinc";
- $tmp_def="tmp";
-
--$perl="perl" unless defined $perl;
-+$perl="$ENV{PERL}" unless defined $perl;
- $mkdir="-mkdir" unless defined $mkdir;
-
- ($ssl,$crypto)=("ssl","crypto");
-@@ -346,6 +346,11 @@
- s/\s*$//; # was chop, didn't work in mixture of perls for Windows...
-
- ($key,$val)=/^([^=]+)=(.*)/;
-+
-+ # On some Windows machines, $val has linefeeds at the end, which
confuses
-+ # subsequent code in this file. So we strip all whitespace at the end.
-+ $val =~ s/\s+$//;
-+
- if ($key eq "RELATIVE_DIRECTORY")
- {
- if ($lib ne "")
-diff -ur misc/openssl-1.0.2u/util/pl/VC-32.pl
misc/build/openssl-1.0.2u/util/pl/VC-32.pl
---- misc/openssl-1.0.2u/util/pl/VC-32.pl 2018-08-14 05:48:59.000000000
-0700
-+++ misc/build/openssl-1.0.2u/util/pl/VC-32.pl 2018-08-26 14:49:57.553776000
-0700
-@@ -30,7 +30,7 @@
- my $ff = "";
-
- # C compiler stuff
--$cc='cl';
-+$cc=$ENV{'CC'};
- if ($FLAVOR =~ /WIN64/)
+diff --git misc/build/openssl-3.0.13/crypto/bio/bio_sock2.c
misc/build/openssl-3.0.13/crypto/bio/bio_sock2.c
+index 8bdad0c0b6..e52cd4f00e 100644
+--- misc/build/openssl-3.0.13/crypto/bio/bio_sock2.c
++++ misc/build/openssl-3.0.13/crypto/bio/bio_sock2.c
+@@ -270,6 +270,10 @@ int BIO_listen(int sock, const BIO_ADDR *addr, int
options)
+ * Therefore we always have to use setsockopt here.
+ */
+ on = options & BIO_SOCK_V6_ONLY ? 1 : 0;
++/* Windows < XP needs this: */
++# if !defined(IPPROTO_IPV6)
++# define IPPROTO_IPV6 41
++# endif
+ if (setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY,
+ (const void *)&on, sizeof(on)) != 0) {
+ ERR_raise_data(ERR_LIB_SYS, get_last_socket_error(),
+diff --git misc/build/openssl-3.0.13/crypto/init.c
misc/build/openssl-3.0.13/crypto/init.c
+index cacf637c89..0728c0a20d 100644
+--- misc/build/openssl-3.0.13/crypto/init.c
++++ misc/build/openssl-3.0.13/crypto/init.c
+@@ -131,7 +131,7 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_load_crypto_nodelete)
+
+ #if !defined(OPENSSL_USE_NODELETE) \
+ && !defined(OPENSSL_NO_PINSHARED)
+-# if defined(DSO_WIN32) && !defined(_WIN32_WCE)
++# if defined(DSO_WIN32) && !defined(_WIN32_WCE) && _WIN32_WINNT >= 0x0500
+ {
+ HMODULE handle = NULL;
+ BOOL ret;
+@@ -659,7 +659,7 @@ int OPENSSL_atexit(void (*handler)(void))
+ #if !defined(OPENSSL_USE_NODELETE)\
+ && !defined(OPENSSL_NO_PINSHARED)
{
- # Note that we currently don't have /WX on Win64! There is a lot of
+-# if defined(DSO_WIN32) && !defined(_WIN32_WCE)
++# if defined(DSO_WIN32) && !defined(_WIN32_WCE) && _WIN32_WINNT >= 0x0500
+ HMODULE handle = NULL;
+ BOOL ret;
+ union {
+diff --git misc/build/openssl-3.0.13/crypto/threads_win.c
misc/build/openssl-3.0.13/crypto/threads_win.c
+index dbeda74d73..c599e88c59 100644
+--- misc/build/openssl-3.0.13/crypto/threads_win.c
++++ misc/build/openssl-3.0.13/crypto/threads_win.c
+@@ -54,7 +54,7 @@ CRYPTO_RWLOCK *CRYPTO_THREAD_lock_new(void)
+ return NULL;
+ }
+
+-# if !defined(_WIN32_WCE)
++# if !defined(_WIN32_WCE) && _WIN32_WINNT >= 0x0403
+ /* 0x400 is the spin count value suggested in the documentation */
+ if (!InitializeCriticalSectionAndSpinCount(lock, 0x400)) {
+ OPENSSL_free(lock);
diff --git a/main/openssl/openssllnx.patch b/main/openssl/openssllnx.patch
deleted file mode 100644
index 9a20d22c96..0000000000
--- a/main/openssl/openssllnx.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -ur misc/openssl-1.0.2u/Configure misc/build/openssl-1.0.2u/Configure
---- misc/openssl-1.0.2u/Configure 2018-08-14 05:49:04.000000000 -0700
-+++ misc/build/openssl-1.0.2u/Configure 2018-08-26 13:35:54.485021000
-0700
-@@ -493,6 +493,9 @@
-
- "bsdi-elf-gcc", "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3
-march=i486 -Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des}
${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-
-+"debian-kfreebsd-amd64","gcc:-m64 -DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack
-Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK
BF_PTR2 DES_INT
DES_UNROLL:${x86_64_asm}:dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"debian-kfreebsd-i386","gcc:-DL_ENDIAN -DTERMIOS -O3 -Wa,--noexecstack -g
-march=i486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des}
${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+
- "nextstep", "cc:-O -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des}
${x86_gcc_opts}:::",
- "nextstep3.3", "cc:-O3 -Wall:<libc.h>:(unknown):::BN_LLONG
${x86_gcc_des} ${x86_gcc_opts}:::",
-
-diff -ur misc/openssl-1.0.2u/Makefile.org
misc/build/openssl-1.0.2u/Makefile.org
---- misc/openssl-1.0.2u/Makefile.org 2018-08-14 05:48:56.000000000 -0700
-+++ misc/build/openssl-1.0.2u/Makefile.org 2018-08-26 13:35:54.485813000
-0700
-@@ -208,7 +208,7 @@
- # same language for uniform treatment.
- BUILDENV= LC_ALL=C PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)'\
- CC='$(CC)' CFLAG='$(CFLAG)' \
-- AS='$(CC)' ASFLAG='$(CFLAG) -c' \
-+ AS='$(CC)' ASFLAG='$(CFLAG) -c -Wa,--noexecstack' \
- AR='$(AR)' NM='$(NM)' RANLIB='$(RANLIB)' \
- RC='$(RC)' \
- CROSS_COMPILE='$(CROSS_COMPILE)' \
diff --git a/main/openssl/opensslunx.patch b/main/openssl/opensslunx.patch
new file mode 100644
index 0000000000..7177a1c740
--- /dev/null
+++ b/main/openssl/opensslunx.patch
@@ -0,0 +1,10 @@
+--- misc/build/openssl-3.0.13/Configurations/00-base-templates.conf
2024-01-30 15:28:16.000000000 +0200
++++ misc/build/openssl-3.0.13/Configurations/00-base-templates.conf
2024-03-18 02:55:09.593025000 +0200
+@@ -67,6 +67,7 @@
+
+ AR => "ar",
+ ARFLAGS => "qc",
++ ASFLAGS => "-Wa,--noexecstack",
+ CC => "cc",
+ lflags =>
+ sub { $withargs{zlib_lib} ? "-L".$withargs{zlib_lib} : () },
diff --git a/main/openssl/prj/d.lst b/main/openssl/prj/d.lst
index bfd80e44f8..f381599703 100644
--- a/main/openssl/prj/d.lst
+++ b/main/openssl/prj/d.lst
@@ -1,10 +1,6 @@
mkdir: %_DEST%\inc%_EXT%\external
mkdir: %_DEST%\inc%_EXT%\external\openssl
..\%__SRC%\inc\*.h %_DEST%\inc%_EXT%\external\openssl
-..\%__SRC%\lib\ssleay32.lib %_DEST%\lib%_EXT%\ssleay32.lib
-..\%__SRC%\bin\ssleay32.dll %_DEST%\bin%_EXT%\ssleay32.dll
-..\%__SRC%\lib\libeay32.lib %_DEST%\lib%_EXT%\libeay32.lib
-..\%__SRC%\bin\libeay32.dll %_DEST%\bin%_EXT%\libeay32.dll
..\%__SRC%\lib\libcrypto.* %_DEST%\lib%_EXT%\libcrypto.*
..\%__SRC%\lib\libssl.* %_DEST%\lib%_EXT%\libssl.*
-
+..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
diff --git a/main/python/python-2.7.18-msvs9.patch
b/main/python/python-2.7.18-msvs9.patch
index 5a95434b3f..ba6b3d85e3 100644
--- a/main/python/python-2.7.18-msvs9.patch
+++ b/main/python/python-2.7.18-msvs9.patch
@@ -1,7 +1,7 @@
-diff -urp misc/Python-2.7.18/PC/VS9.0/_bsddb.vcproj
misc/build/Python-2.7.18/PC/VS9.0/_bsddb.vcproj
---- misc/Python-2.7.18/PC/VS9.0/_bsddb.vcproj 2017-09-16 12:38:35.000000000
-0500
-+++ misc/build/Python-2.7.18/PC/VS9.0/_bsddb.vcproj 2017-10-21
17:56:40.218589000 -0500
-@@ -56,6 +56,7 @@
+diff --git misc/build/Python-2.7.18/PC/VS9.0/_bsddb.vcproj
misc/build/Python-2.7.18/PC/VS9.0/_bsddb.vcproj
+--- misc/build/Python-2.7.18/PC/VS9.0/_bsddb.vcproj
++++ misc/build/Python-2.7.18/PC/VS9.0/_bsddb.vcproj
+@@ -56,6 +56,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -9,7 +9,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_bsddb.vcproj
misc/build/Python-2.7.18/PC/
AdditionalDependencies="$(bsddbDepLibs)"
BaseAddress="0x1e180000"
/>
-@@ -120,6 +121,7 @@
+@@ -120,6 +121,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -17,7 +17,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_bsddb.vcproj
misc/build/Python-2.7.18/PC/
AdditionalDependencies="$(bsddbDepLibs)"
BaseAddress="0x1e180000"
/>
-@@ -183,6 +185,7 @@
+@@ -183,6 +185,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -25,7 +25,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_bsddb.vcproj
misc/build/Python-2.7.18/PC/
AdditionalDependencies="$(bsddbDepLibs)"
BaseAddress="0x1e180000"
/>
-@@ -248,6 +251,7 @@
+@@ -248,6 +251,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -33,7 +33,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_bsddb.vcproj
misc/build/Python-2.7.18/PC/
AdditionalDependencies="$(bsddbDepLibs)"
BaseAddress="0x1e180000"
/>
-@@ -311,6 +315,7 @@
+@@ -311,6 +315,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -41,7 +41,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_bsddb.vcproj
misc/build/Python-2.7.18/PC/
AdditionalDependencies="$(bsddbDepLibs)"
BaseAddress="0x1e180000"
/>
-@@ -375,6 +380,7 @@
+@@ -375,6 +380,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -49,7 +49,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_bsddb.vcproj
misc/build/Python-2.7.18/PC/
AdditionalDependencies="$(bsddbDepLibs)"
BaseAddress="0x1e180000"
TargetMachine="17"
-@@ -439,6 +445,7 @@
+@@ -439,6 +445,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -57,7 +57,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_bsddb.vcproj
misc/build/Python-2.7.18/PC/
AdditionalDependencies="$(bsddbDepLibs)"
BaseAddress="0x1e180000"
/>
-@@ -503,6 +510,7 @@
+@@ -503,6 +510,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -65,10 +65,10 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_bsddb.vcproj
misc/build/Python-2.7.18/PC/
AdditionalDependencies="$(bsddbDepLibs)"
BaseAddress="0x1e180000"
TargetMachine="17"
-diff -urp misc/Python-2.7.18/PC/VS9.0/_ctypes.vcproj
misc/build/Python-2.7.18/PC/VS9.0/_ctypes.vcproj
---- misc/Python-2.7.18/PC/VS9.0/_ctypes.vcproj 2017-09-16 12:38:35.000000000
-0500
-+++ misc/build/Python-2.7.18/PC/VS9.0/_ctypes.vcproj 2017-10-21
17:56:40.219465000 -0500
-@@ -177,7 +177,7 @@
+diff --git misc/build/Python-2.7.18/PC/VS9.0/_ctypes.vcproj
misc/build/Python-2.7.18/PC/VS9.0/_ctypes.vcproj
+--- misc/build/Python-2.7.18/PC/VS9.0/_ctypes.vcproj
++++ misc/build/Python-2.7.18/PC/VS9.0/_ctypes.vcproj
+@@ -177,7 +177,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -77,7 +77,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_ctypes.vcproj
misc/build/Python-2.7.18/PC
SubSystem="0"
BaseAddress="0x1D1A0000"
/>
-@@ -241,7 +241,7 @@
+@@ -241,7 +241,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -86,7 +86,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_ctypes.vcproj
misc/build/Python-2.7.18/PC
SubSystem="0"
BaseAddress="0x1D1A0000"
/>
-@@ -304,7 +304,7 @@
+@@ -304,7 +304,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -95,7 +95,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_ctypes.vcproj
misc/build/Python-2.7.18/PC
SubSystem="0"
BaseAddress="0x1D1A0000"
/>
-@@ -368,7 +368,7 @@
+@@ -368,7 +368,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -104,7 +104,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_ctypes.vcproj
misc/build/Python-2.7.18/PC
SubSystem="0"
BaseAddress="0x1D1A0000"
TargetMachine="17"
-@@ -432,7 +432,7 @@
+@@ -432,7 +432,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -113,7 +113,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_ctypes.vcproj
misc/build/Python-2.7.18/PC
SubSystem="0"
BaseAddress="0x1D1A0000"
/>
-@@ -496,7 +496,7 @@
+@@ -496,7 +496,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -122,10 +122,10 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_ctypes.vcproj
misc/build/Python-2.7.18/PC
SubSystem="0"
BaseAddress="0x1D1A0000"
TargetMachine="17"
-diff -urp misc/Python-2.7.18/PC/VS9.0/_ctypes_test.vcproj
misc/build/Python-2.7.18/PC/VS9.0/_ctypes_test.vcproj
---- misc/Python-2.7.18/PC/VS9.0/_ctypes_test.vcproj 2017-09-16
12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.18/PC/VS9.0/_ctypes_test.vcproj 2017-10-21
17:56:40.220226000 -0500
-@@ -54,6 +54,7 @@
+diff --git misc/build/Python-2.7.18/PC/VS9.0/_ctypes_test.vcproj
misc/build/Python-2.7.18/PC/VS9.0/_ctypes_test.vcproj
+--- misc/build/Python-2.7.18/PC/VS9.0/_ctypes_test.vcproj
++++ misc/build/Python-2.7.18/PC/VS9.0/_ctypes_test.vcproj
+@@ -54,6 +54,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -133,7 +133,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_ctypes_test.vcproj
misc/build/Python-2.7.
/>
<Tool
Name="VCALinkTool"
-@@ -113,6 +114,7 @@
+@@ -113,6 +114,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -141,7 +141,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_ctypes_test.vcproj
misc/build/Python-2.7.
/>
<Tool
Name="VCALinkTool"
-@@ -172,6 +174,7 @@
+@@ -172,6 +174,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -149,7 +149,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_ctypes_test.vcproj
misc/build/Python-2.7.
/>
<Tool
Name="VCALinkTool"
-@@ -232,6 +235,7 @@
+@@ -232,6 +235,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -157,7 +157,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_ctypes_test.vcproj
misc/build/Python-2.7.
/>
<Tool
Name="VCALinkTool"
-@@ -291,6 +295,7 @@
+@@ -291,6 +295,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -165,7 +165,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_ctypes_test.vcproj
misc/build/Python-2.7.
/>
<Tool
Name="VCALinkTool"
-@@ -352,6 +357,7 @@
+@@ -352,6 +357,7 @@
<Tool
Name="VCLinkerTool"
TargetMachine="17"
@@ -173,7 +173,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_ctypes_test.vcproj
misc/build/Python-2.7.
/>
<Tool
Name="VCALinkTool"
-@@ -411,6 +417,7 @@
+@@ -411,6 +417,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -181,7 +181,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_ctypes_test.vcproj
misc/build/Python-2.7.
/>
<Tool
Name="VCALinkTool"
-@@ -472,6 +479,7 @@
+@@ -472,6 +479,7 @@
<Tool
Name="VCLinkerTool"
TargetMachine="17"
@@ -189,10 +189,10 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_ctypes_test.vcproj
misc/build/Python-2.7.
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.18/PC/VS9.0/_elementtree.vcproj
misc/build/Python-2.7.18/PC/VS9.0/_elementtree.vcproj
---- misc/Python-2.7.18/PC/VS9.0/_elementtree.vcproj 2017-09-16
12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.18/PC/VS9.0/_elementtree.vcproj 2017-10-21
17:56:40.221003000 -0500
-@@ -57,6 +57,7 @@
+diff --git misc/build/Python-2.7.18/PC/VS9.0/_elementtree.vcproj
misc/build/Python-2.7.18/PC/VS9.0/_elementtree.vcproj
+--- misc/build/Python-2.7.18/PC/VS9.0/_elementtree.vcproj
++++ misc/build/Python-2.7.18/PC/VS9.0/_elementtree.vcproj
+@@ -57,6 +57,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1D100000"
@@ -200,7 +200,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_elementtree.vcproj
misc/build/Python-2.7.
/>
<Tool
Name="VCALinkTool"
-@@ -119,6 +120,7 @@
+@@ -119,6 +120,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1D100000"
@@ -208,7 +208,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_elementtree.vcproj
misc/build/Python-2.7.
/>
<Tool
Name="VCALinkTool"
-@@ -181,6 +183,7 @@
+@@ -181,6 +183,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1D100000"
@@ -216,7 +216,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_elementtree.vcproj
misc/build/Python-2.7.
/>
<Tool
Name="VCALinkTool"
-@@ -244,6 +247,7 @@
+@@ -244,6 +247,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1D100000"
@@ -224,7 +224,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_elementtree.vcproj
misc/build/Python-2.7.
/>
<Tool
Name="VCALinkTool"
-@@ -306,6 +310,7 @@
+@@ -306,6 +310,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1D100000"
@@ -232,7 +232,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_elementtree.vcproj
misc/build/Python-2.7.
/>
<Tool
Name="VCALinkTool"
-@@ -370,6 +375,7 @@
+@@ -370,6 +375,7 @@
Name="VCLinkerTool"
BaseAddress="0x1D100000"
TargetMachine="17"
@@ -240,7 +240,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_elementtree.vcproj
misc/build/Python-2.7.
/>
<Tool
Name="VCALinkTool"
-@@ -432,6 +438,7 @@
+@@ -432,6 +438,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1D100000"
@@ -248,7 +248,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_elementtree.vcproj
misc/build/Python-2.7.
/>
<Tool
Name="VCALinkTool"
-@@ -496,6 +503,7 @@
+@@ -496,6 +503,7 @@
Name="VCLinkerTool"
BaseAddress="0x1D100000"
TargetMachine="17"
@@ -256,18 +256,20 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_elementtree.vcproj
misc/build/Python-2.7.
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.18/PC/VS9.0/_hashlib.vcproj
misc/build/Python-2.7.18/PC/VS9.0/_hashlib.vcproj
---- misc/Python-2.7.18/PC/VS9.0/_hashlib.vcproj 2017-09-16
12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.18/PC/VS9.0/_hashlib.vcproj 2017-10-21
17:56:40.222221000 -0500
-@@ -58,6 +58,7 @@
+diff --git misc/build/Python-2.7.18/PC/VS9.0/_hashlib.vcproj
misc/build/Python-2.7.18/PC/VS9.0/_hashlib.vcproj
+--- misc/build/Python-2.7.18/PC/VS9.0/_hashlib.vcproj
++++ misc/build/Python-2.7.18/PC/VS9.0/_hashlib.vcproj
+@@ -57,7 +57,8 @@
+ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib
$(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
+- AdditionalDependencies="ws2_32.lib
$(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
++ AdditionalDependencies="ws2_32.lib
$(opensslDir)\out32\libcrypto.lib $(opensslDir)\out32\libssl.lib"
+ AdditionalOptions="/SAFESEH /NXCOMPAT
/DYNAMICBASE"
/>
<Tool
Name="VCALinkTool"
-@@ -121,6 +122,7 @@
+@@ -121,6 +122,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib
$(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
@@ -275,15 +277,17 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_hashlib.vcproj
misc/build/Python-2.7.18/P
/>
<Tool
Name="VCALinkTool"
-@@ -184,6 +186,7 @@
+@@ -183,7 +185,8 @@
+ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib
$(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
+- AdditionalDependencies="ws2_32.lib
$(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
++ AdditionalDependencies="ws2_32.lib
$(opensslDir)\out32\libcrypto.lib $(opensslDir)\out32\libssl.lib"
+ AdditionalOptions="/SAFESEH /NXCOMPAT
/DYNAMICBASE"
/>
<Tool
Name="VCALinkTool"
-@@ -248,6 +251,7 @@
+@@ -248,6 +251,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib
$(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
@@ -291,15 +295,17 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_hashlib.vcproj
misc/build/Python-2.7.18/P
/>
<Tool
Name="VCALinkTool"
-@@ -311,6 +315,7 @@
+@@ -310,7 +314,8 @@
+ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib
$(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
+- AdditionalDependencies="ws2_32.lib
$(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
++ AdditionalDependencies="ws2_32.lib
$(opensslDir)\out32\libcrypto.lib $(opensslDir)\out32\libssl.lib"
+ AdditionalOptions="/SAFESEH /NXCOMPAT
/DYNAMICBASE"
/>
<Tool
Name="VCALinkTool"
-@@ -376,6 +381,7 @@
+@@ -376,6 +381,7 @@
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib
$(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
TargetMachine="17"
@@ -307,15 +313,17 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_hashlib.vcproj
misc/build/Python-2.7.18/P
/>
<Tool
Name="VCALinkTool"
-@@ -439,6 +445,7 @@
+@@ -438,7 +444,8 @@
+ />
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib
$(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
+- AdditionalDependencies="ws2_32.lib
$(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
++ AdditionalDependencies="ws2_32.lib
$(opensslDir)\out32\libcrypto.lib $(opensslDir)\out32\libssl.lib"
+ AdditionalOptions="/SAFESEH /NXCOMPAT
/DYNAMICBASE"
/>
<Tool
Name="VCALinkTool"
-@@ -504,6 +511,7 @@
+@@ -504,6 +511,7 @@
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib
$(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
TargetMachine="17"
@@ -323,10 +331,10 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_hashlib.vcproj
misc/build/Python-2.7.18/P
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.18/PC/VS9.0/_msi.vcproj
misc/build/Python-2.7.18/PC/VS9.0/_msi.vcproj
---- misc/Python-2.7.18/PC/VS9.0/_msi.vcproj 2017-09-16 12:38:35.000000000
-0500
-+++ misc/build/Python-2.7.18/PC/VS9.0/_msi.vcproj 2017-10-21
17:56:40.223291000 -0500
-@@ -56,6 +56,7 @@
+diff --git misc/build/Python-2.7.18/PC/VS9.0/_msi.vcproj
misc/build/Python-2.7.18/PC/VS9.0/_msi.vcproj
+--- misc/build/Python-2.7.18/PC/VS9.0/_msi.vcproj
++++ misc/build/Python-2.7.18/PC/VS9.0/_msi.vcproj
+@@ -56,6 +56,7 @@
Name="VCLinkerTool"
AdditionalDependencies="fci.lib msi.lib
rpcrt4.lib"
BaseAddress="0x1D160000"
@@ -334,7 +342,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_msi.vcproj
misc/build/Python-2.7.18/PC/VS
/>
<Tool
Name="VCALinkTool"
-@@ -117,6 +118,7 @@
+@@ -117,6 +118,7 @@
Name="VCLinkerTool"
AdditionalDependencies="fci.lib msi.lib
rpcrt4.lib"
BaseAddress="0x1D160000"
@@ -342,7 +350,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_msi.vcproj
misc/build/Python-2.7.18/PC/VS
/>
<Tool
Name="VCALinkTool"
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@
Name="VCLinkerTool"
AdditionalDependencies="fci.lib msi.lib
rpcrt4.lib"
BaseAddress="0x1D160000"
@@ -350,7 +358,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_msi.vcproj
misc/build/Python-2.7.18/PC/VS
/>
<Tool
Name="VCALinkTool"
-@@ -240,6 +243,7 @@
+@@ -240,6 +243,7 @@
Name="VCLinkerTool"
AdditionalDependencies="fci.lib msi.lib
rpcrt4.lib"
BaseAddress="0x1D160000"
@@ -358,7 +366,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_msi.vcproj
misc/build/Python-2.7.18/PC/VS
/>
<Tool
Name="VCALinkTool"
-@@ -301,6 +305,7 @@
+@@ -301,6 +305,7 @@
Name="VCLinkerTool"
AdditionalDependencies="fci.lib msi.lib
rpcrt4.lib"
BaseAddress="0x1D160000"
@@ -366,7 +374,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_msi.vcproj
misc/build/Python-2.7.18/PC/VS
/>
<Tool
Name="VCALinkTool"
-@@ -364,6 +369,7 @@
+@@ -364,6 +369,7 @@
AdditionalDependencies="fci.lib msi.lib
rpcrt4.lib"
BaseAddress="0x1D160000"
TargetMachine="17"
@@ -374,7 +382,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_msi.vcproj
misc/build/Python-2.7.18/PC/VS
/>
<Tool
Name="VCALinkTool"
-@@ -425,6 +431,7 @@
+@@ -425,6 +431,7 @@
Name="VCLinkerTool"
AdditionalDependencies="fci.lib msi.lib
rpcrt4.lib"
BaseAddress="0x1D160000"
@@ -382,7 +390,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_msi.vcproj
misc/build/Python-2.7.18/PC/VS
/>
<Tool
Name="VCALinkTool"
-@@ -488,6 +495,7 @@
+@@ -488,6 +495,7 @@
AdditionalDependencies="fci.lib msi.lib
rpcrt4.lib"
BaseAddress="0x1D160000"
TargetMachine="17"
@@ -390,10 +398,10 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_msi.vcproj
misc/build/Python-2.7.18/PC/VS
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.18/PC/VS9.0/_multiprocessing.vcproj
misc/build/Python-2.7.18/PC/VS9.0/_multiprocessing.vcproj
---- misc/Python-2.7.18/PC/VS9.0/_multiprocessing.vcproj 2017-09-16
12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.18/PC/VS9.0/_multiprocessing.vcproj 2017-10-21
17:56:40.224316000 -0500
-@@ -56,6 +56,7 @@
+diff --git misc/build/Python-2.7.18/PC/VS9.0/_multiprocessing.vcproj
misc/build/Python-2.7.18/PC/VS9.0/_multiprocessing.vcproj
+--- misc/build/Python-2.7.18/PC/VS9.0/_multiprocessing.vcproj
++++ misc/build/Python-2.7.18/PC/VS9.0/_multiprocessing.vcproj
+@@ -56,6 +56,7 @@
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib"
BaseAddress="0x1e1D0000"
@@ -401,7 +409,7 @@ diff -urp
misc/Python-2.7.18/PC/VS9.0/_multiprocessing.vcproj misc/build/Python-
/>
<Tool
Name="VCALinkTool"
-@@ -117,6 +118,7 @@
+@@ -117,6 +118,7 @@
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib"
BaseAddress="0x1e1D0000"
@@ -409,7 +417,7 @@ diff -urp
misc/Python-2.7.18/PC/VS9.0/_multiprocessing.vcproj misc/build/Python-
/>
<Tool
Name="VCALinkTool"
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib"
BaseAddress="0x1e1D0000"
@@ -417,7 +425,7 @@ diff -urp
misc/Python-2.7.18/PC/VS9.0/_multiprocessing.vcproj misc/build/Python-
/>
<Tool
Name="VCALinkTool"
-@@ -240,6 +243,7 @@
+@@ -240,6 +243,7 @@
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib"
BaseAddress="0x1e1D0000"
@@ -425,7 +433,7 @@ diff -urp
misc/Python-2.7.18/PC/VS9.0/_multiprocessing.vcproj misc/build/Python-
/>
<Tool
Name="VCALinkTool"
-@@ -301,6 +305,7 @@
+@@ -301,6 +305,7 @@
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib"
BaseAddress="0x1e1D0000"
@@ -433,7 +441,7 @@ diff -urp
misc/Python-2.7.18/PC/VS9.0/_multiprocessing.vcproj misc/build/Python-
/>
<Tool
Name="VCALinkTool"
-@@ -364,6 +369,7 @@
+@@ -364,6 +369,7 @@
AdditionalDependencies="ws2_32.lib"
BaseAddress="0x1e1D0000"
TargetMachine="17"
@@ -441,7 +449,7 @@ diff -urp
misc/Python-2.7.18/PC/VS9.0/_multiprocessing.vcproj misc/build/Python-
/>
<Tool
Name="VCALinkTool"
-@@ -425,6 +431,7 @@
+@@ -425,6 +431,7 @@
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib"
BaseAddress="0x1e1D0000"
@@ -449,7 +457,7 @@ diff -urp
misc/Python-2.7.18/PC/VS9.0/_multiprocessing.vcproj misc/build/Python-
/>
<Tool
Name="VCALinkTool"
-@@ -488,6 +495,7 @@
+@@ -488,6 +495,7 @@
AdditionalDependencies="ws2_32.lib"
BaseAddress="0x1e1D0000"
TargetMachine="17"
@@ -457,10 +465,10 @@ diff -urp
misc/Python-2.7.18/PC/VS9.0/_multiprocessing.vcproj misc/build/Python-
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.18/PC/VS9.0/_socket.vcproj
misc/build/Python-2.7.18/PC/VS9.0/_socket.vcproj
---- misc/Python-2.7.18/PC/VS9.0/_socket.vcproj 2017-09-16 12:38:35.000000000
-0500
-+++ misc/build/Python-2.7.18/PC/VS9.0/_socket.vcproj 2017-10-21
17:56:40.225407000 -0500
-@@ -56,6 +56,7 @@
+diff --git misc/build/Python-2.7.18/PC/VS9.0/_socket.vcproj
misc/build/Python-2.7.18/PC/VS9.0/_socket.vcproj
+--- misc/build/Python-2.7.18/PC/VS9.0/_socket.vcproj
++++ misc/build/Python-2.7.18/PC/VS9.0/_socket.vcproj
+@@ -56,6 +56,7 @@
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib"
BaseAddress="0x1e1D0000"
@@ -468,7 +476,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_socket.vcproj
misc/build/Python-2.7.18/PC
/>
<Tool
Name="VCALinkTool"
-@@ -117,6 +118,7 @@
+@@ -117,6 +118,7 @@
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib"
BaseAddress="0x1e1D0000"
@@ -476,7 +484,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_socket.vcproj
misc/build/Python-2.7.18/PC
/>
<Tool
Name="VCALinkTool"
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib"
BaseAddress="0x1e1D0000"
@@ -484,7 +492,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_socket.vcproj
misc/build/Python-2.7.18/PC
/>
<Tool
Name="VCALinkTool"
-@@ -240,6 +243,7 @@
+@@ -240,6 +243,7 @@
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib"
BaseAddress="0x1e1D0000"
@@ -492,7 +500,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_socket.vcproj
misc/build/Python-2.7.18/PC
/>
<Tool
Name="VCALinkTool"
-@@ -301,6 +305,7 @@
+@@ -301,6 +305,7 @@
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib"
BaseAddress="0x1e1D0000"
@@ -500,7 +508,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_socket.vcproj
misc/build/Python-2.7.18/PC
/>
<Tool
Name="VCALinkTool"
-@@ -364,6 +369,7 @@
+@@ -364,6 +369,7 @@
AdditionalDependencies="ws2_32.lib"
BaseAddress="0x1e1D0000"
TargetMachine="17"
@@ -508,7 +516,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_socket.vcproj
misc/build/Python-2.7.18/PC
/>
<Tool
Name="VCALinkTool"
-@@ -425,6 +431,7 @@
+@@ -425,6 +431,7 @@
Name="VCLinkerTool"
AdditionalDependencies="ws2_32.lib"
BaseAddress="0x1e1D0000"
@@ -516,7 +524,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_socket.vcproj
misc/build/Python-2.7.18/PC
/>
<Tool
Name="VCALinkTool"
-@@ -488,6 +495,7 @@
+@@ -488,6 +495,7 @@
AdditionalDependencies="ws2_32.lib"
BaseAddress="0x1e1D0000"
TargetMachine="17"
@@ -524,10 +532,10 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_socket.vcproj
misc/build/Python-2.7.18/PC
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.18/PC/VS9.0/_sqlite3.vcproj
misc/build/Python-2.7.18/PC/VS9.0/_sqlite3.vcproj
---- misc/Python-2.7.18/PC/VS9.0/_sqlite3.vcproj 2017-09-16
12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.18/PC/VS9.0/_sqlite3.vcproj 2017-10-21
17:56:40.226403000 -0500
-@@ -57,6 +57,7 @@
+diff --git misc/build/Python-2.7.18/PC/VS9.0/_sqlite3.vcproj
misc/build/Python-2.7.18/PC/VS9.0/_sqlite3.vcproj
+--- misc/build/Python-2.7.18PC/VS9.0/_sqlite3.vcproj
++++ misc/build/Python-2.7.18/PC/VS9.0/_sqlite3.vcproj
+@@ -57,6 +57,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1e180000"
@@ -535,7 +543,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_sqlite3.vcproj
misc/build/Python-2.7.18/P
/>
<Tool
Name="VCALinkTool"
-@@ -119,6 +120,7 @@
+@@ -119,6 +120,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1e180000"
@@ -543,7 +551,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_sqlite3.vcproj
misc/build/Python-2.7.18/P
/>
<Tool
Name="VCALinkTool"
-@@ -181,6 +183,7 @@
+@@ -181,6 +183,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1e180000"
@@ -551,7 +559,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_sqlite3.vcproj
misc/build/Python-2.7.18/P
/>
<Tool
Name="VCALinkTool"
-@@ -244,6 +247,7 @@
+@@ -244,6 +247,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1e180000"
@@ -559,7 +567,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_sqlite3.vcproj
misc/build/Python-2.7.18/P
/>
<Tool
Name="VCALinkTool"
-@@ -306,6 +310,7 @@
+@@ -306,6 +310,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1e180000"
@@ -567,7 +575,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_sqlite3.vcproj
misc/build/Python-2.7.18/P
/>
<Tool
Name="VCALinkTool"
-@@ -370,6 +375,7 @@
+@@ -370,6 +375,7 @@
Name="VCLinkerTool"
BaseAddress="0x1e180000"
TargetMachine="17"
@@ -575,7 +583,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_sqlite3.vcproj
misc/build/Python-2.7.18/P
/>
<Tool
Name="VCALinkTool"
-@@ -432,6 +438,7 @@
+@@ -432,6 +438,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1e180000"
@@ -583,7 +591,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_sqlite3.vcproj
misc/build/Python-2.7.18/P
/>
<Tool
Name="VCALinkTool"
-@@ -496,6 +503,7 @@
+@@ -496,6 +503,7 @@
Name="VCLinkerTool"
BaseAddress="0x1e180000"
TargetMachine="17"
@@ -591,10 +599,10 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_sqlite3.vcproj
misc/build/Python-2.7.18/P
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.18/PC/VS9.0/_ssl.vcproj
misc/build/Python-2.7.18/PC/VS9.0/_ssl.vcproj
---- misc/Python-2.7.18/PC/VS9.0/_ssl.vcproj 2017-09-16 12:38:35.000000000
-0500
-+++ misc/build/Python-2.7.18/PC/VS9.0/_ssl.vcproj 2017-10-21
17:56:40.227504000 -0500
-@@ -43,7 +43,7 @@
+diff --git misc/build/Python-2.7.18/PC/VS9.0/_ssl.vcproj
misc/build/Python-2.7.18/PC/VS9.0/_ssl.vcproj
+--- misc/build/Python-2.7.18/PC/VS9.0/_ssl.vcproj
++++ misc/build/Python-2.7.18/PC/VS9.0/_ssl.vcproj
+@@ -43,7 +43,7 @@
/>
<Tool
Name="VCCLCompilerTool"
@@ -603,17 +611,17 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_ssl.vcproj
misc/build/Python-2.7.18/PC/VS
/>
<Tool
Name="VCManagedResourceCompilerTool"
-@@ -57,7 +57,8 @@
+@@ -57,7 +57,8 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib crypt32.lib
$(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
+ AdditionalOptions="/SAFESEH /NXCOMPAT
/DYNAMICBASE"
-+ AdditionalDependencies="ws2_32.lib crypt32.lib
$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib"
++ AdditionalDependencies="ws2_32.lib crypt32.lib
$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libssl.lib"
/>
<Tool
Name="VCALinkTool"
-@@ -106,7 +107,7 @@
+@@ -106,7 +107,7 @@
/>
<Tool
Name="VCCLCompilerTool"
@@ -622,7 +630,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_ssl.vcproj
misc/build/Python-2.7.18/PC/VS
/>
<Tool
Name="VCManagedResourceCompilerTool"
-@@ -120,7 +121,8 @@
+@@ -120,7 +121,8 @@
/>
<Tool
Name="VCLinkerTool"
@@ -632,7 +640,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_ssl.vcproj
misc/build/Python-2.7.18/PC/VS
/>
<Tool
Name="VCALinkTool"
-@@ -169,7 +171,7 @@
+@@ -169,7 +171,7 @@
/>
<Tool
Name="VCCLCompilerTool"
@@ -641,17 +649,17 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_ssl.vcproj
misc/build/Python-2.7.18/PC/VS
/>
<Tool
Name="VCManagedResourceCompilerTool"
-@@ -183,7 +185,8 @@
+@@ -183,7 +185,8 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib crypt32.lib
$(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
+ AdditionalOptions="/SAFESEH /NXCOMPAT
/DYNAMICBASE"
-+ AdditionalDependencies="ws2_32.lib crypt32.lib
$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib
$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
++ AdditionalDependencies="ws2_32.lib crypt32.lib
$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libcrypto.lib
$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libssl.lib"
/>
<Tool
Name="VCALinkTool"
-@@ -233,7 +236,7 @@
+@@ -233,7 +236,7 @@
/>
<Tool
Name="VCCLCompilerTool"
@@ -660,17 +668,17 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_ssl.vcproj
misc/build/Python-2.7.18/PC/VS
/>
<Tool
Name="VCManagedResourceCompilerTool"
-@@ -247,7 +250,8 @@
+@@ -247,7 +250,8 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib crypt32.lib
$(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib"
-+ AdditionalOptions="/SAFESEH /NXCOMPAT
/DYNAMICBASE"
++ AdditionalOptions="/SAFESEH /NXCOMPAT
/DYNAMICBASE"
+ AdditionalDependencies="ws2_32.lib crypt32.lib
$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib
$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib"
/>
<Tool
Name="VCALinkTool"
-@@ -296,7 +300,7 @@
+@@ -296,7 +300,7 @@
/>
<Tool
Name="VCCLCompilerTool"
@@ -679,20 +687,29 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_ssl.vcproj
misc/build/Python-2.7.18/PC/VS
/>
<Tool
Name="VCManagedResourceCompilerTool"
-@@ -310,7 +314,8 @@
+@@ -310,7 +314,8 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib crypt32.lib
$(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
+ AdditionalOptions="/SAFESEH /NXCOMPAT
/DYNAMICBASE"
-+ AdditionalDependencies="ws2_32.lib crypt32.lib
$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib"
++ AdditionalDependencies="ws2_32.lib crypt32.lib
$(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libssl.lib"
+ />
+ <Tool
+ Name="VCALinkTool"
+@@ -438,7 +443,7 @@
+ />
+ <Tool
+ Name="VCLinkerTool"
+- AdditionalDependencies="ws2_32.lib crypt32.lib
$(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib"
++ AdditionalDependencies="ws2_32.lib crypt32.lib
$(opensslDir)\out32\libcrypto.lib $(opensslDir)\out32\libssl.lib"
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.18/PC/VS9.0/_testcapi.vcproj
misc/build/Python-2.7.18/PC/VS9.0/_testcapi.vcproj
---- misc/Python-2.7.18/PC/VS9.0/_testcapi.vcproj 2017-09-16
12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.18/PC/VS9.0/_testcapi.vcproj 2017-10-21
17:56:40.228516000 -0500
-@@ -55,6 +55,7 @@
+diff --git misc/build/Python-2.7.18/PC/VS9.0/_testcapi.vcproj
misc/build/Python-2.7.18/PC/VS9.0/_testcapi.vcproj
+--- misc/build/Python-2.7.18/PC/VS9.0/_testcapi.vcproj
++++ misc/build/Python-2.7.18/PC/VS9.0/_testcapi.vcproj
+@@ -55,6 +55,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1e1F0000"
@@ -700,7 +717,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_testcapi.vcproj
misc/build/Python-2.7.18/
/>
<Tool
Name="VCALinkTool"
-@@ -115,6 +116,7 @@
+@@ -115,6 +116,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1e1F0000"
@@ -708,7 +725,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_testcapi.vcproj
misc/build/Python-2.7.18/
/>
<Tool
Name="VCALinkTool"
-@@ -175,6 +177,7 @@
+@@ -175,6 +177,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1e1F0000"
@@ -716,7 +733,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_testcapi.vcproj
misc/build/Python-2.7.18/
/>
<Tool
Name="VCALinkTool"
-@@ -236,6 +239,7 @@
+@@ -236,6 +239,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1e1F0000"
@@ -724,7 +741,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_testcapi.vcproj
misc/build/Python-2.7.18/
/>
<Tool
Name="VCALinkTool"
-@@ -296,6 +300,7 @@
+@@ -296,6 +300,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1e1F0000"
@@ -732,7 +749,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_testcapi.vcproj
misc/build/Python-2.7.18/
/>
<Tool
Name="VCALinkTool"
-@@ -358,6 +363,7 @@
+@@ -358,6 +363,7 @@
Name="VCLinkerTool"
BaseAddress="0x1e1F0000"
TargetMachine="17"
@@ -740,7 +757,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_testcapi.vcproj
misc/build/Python-2.7.18/
/>
<Tool
Name="VCALinkTool"
-@@ -418,6 +424,7 @@
+@@ -418,6 +424,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1e1F0000"
@@ -748,7 +765,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_testcapi.vcproj
misc/build/Python-2.7.18/
/>
<Tool
Name="VCALinkTool"
-@@ -480,6 +487,7 @@
+@@ -480,6 +487,7 @@
Name="VCLinkerTool"
BaseAddress="0x1e1F0000"
TargetMachine="17"
@@ -756,10 +773,10 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_testcapi.vcproj
misc/build/Python-2.7.18/
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.18/PC/VS9.0/_tkinter.vcproj
misc/build/Python-2.7.18/PC/VS9.0/_tkinter.vcproj
---- misc/Python-2.7.18/PC/VS9.0/_tkinter.vcproj 2017-09-16
12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.18/PC/VS9.0/_tkinter.vcproj 2017-10-21
17:56:40.229664000 -0500
-@@ -57,6 +57,7 @@
+diff --git misc/build/Python-2.7.18/PC/VS9.0/_tkinter.vcproj
misc/build/Python-2.7.18/PC/VS9.0/_tkinter.vcproj
+--- misc/build/Python-2.7.18PC/VS9.0/_tkinter.vcproj
++++ misc/build/Python-2.7.18/PC/VS9.0/_tkinter.vcproj
+@@ -57,6 +57,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="$(tcltkLibDebug)"
@@ -767,7 +784,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_tkinter.vcproj
misc/build/Python-2.7.18/P
/>
<Tool
Name="VCALinkTool"
-@@ -119,6 +120,7 @@
+@@ -119,6 +120,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="$(tcltk64LibDebug)"
@@ -775,7 +792,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_tkinter.vcproj
misc/build/Python-2.7.18/P
/>
<Tool
Name="VCALinkTool"
-@@ -181,6 +183,7 @@
+@@ -181,6 +183,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="$(tcltkLib)"
@@ -783,7 +800,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_tkinter.vcproj
misc/build/Python-2.7.18/P
/>
<Tool
Name="VCALinkTool"
-@@ -244,6 +247,7 @@
+@@ -244,6 +247,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="$(tcltk64Lib)"
@@ -791,7 +808,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_tkinter.vcproj
misc/build/Python-2.7.18/P
/>
<Tool
Name="VCALinkTool"
-@@ -306,6 +310,7 @@
+@@ -306,6 +310,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="$(tcltkLib)"
@@ -799,7 +816,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_tkinter.vcproj
misc/build/Python-2.7.18/P
/>
<Tool
Name="VCALinkTool"
-@@ -370,6 +375,7 @@
+@@ -370,6 +375,7 @@
Name="VCLinkerTool"
AdditionalDependencies="$(tcltk64Lib)"
TargetMachine="17"
@@ -807,7 +824,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_tkinter.vcproj
misc/build/Python-2.7.18/P
/>
<Tool
Name="VCALinkTool"
-@@ -432,6 +438,7 @@
+@@ -432,6 +438,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="$(tcltkLib)"
@@ -815,7 +832,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_tkinter.vcproj
misc/build/Python-2.7.18/P
/>
<Tool
Name="VCALinkTool"
-@@ -496,6 +503,7 @@
+@@ -496,6 +503,7 @@
Name="VCLinkerTool"
AdditionalDependencies="$(tcltk64Lib)"
TargetMachine="17"
@@ -823,10 +840,10 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/_tkinter.vcproj
misc/build/Python-2.7.18/P
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.18/PC/VS9.0/bdist_wininst.vcproj
misc/build/Python-2.7.18/PC/VS9.0/bdist_wininst.vcproj
---- misc/Python-2.7.18/PC/VS9.0/bdist_wininst.vcproj 2017-09-16
12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.18/PC/VS9.0/bdist_wininst.vcproj 2017-10-21
17:56:40.230806000 -0500
-@@ -81,8 +81,7 @@
+diff --git misc/build/Python-2.7.18/PC/VS9.0/bdist_wininst.vcproj
misc/build/Python-2.7.18/PC/VS9.0/bdist_wininst.vcproj
+--- misc/build/Python-2.7.18/PC/VS9.0/bdist_wininst.vcproj
++++ misc/build/Python-2.7.18/PC/VS9.0/bdist_wininst.vcproj
+@@ -81,8 +81,7 @@
IgnoreDefaultLibraryNames="LIBC"
ProgramDatabaseFile="..\..\lib\distutils\command\wininst-9.0.pdb"
SubSystem="2"
@@ -836,7 +853,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/bdist_wininst.vcproj
misc/build/Python-2.7
TargetMachine="1"
/>
<Tool
-@@ -171,8 +170,7 @@
+@@ -171,8 +170,7 @@
IgnoreDefaultLibraryNames="LIBC"
ProgramDatabaseFile="..\..\lib\distutils\command\wininst-9.0-amd64.pdb"
SubSystem="2"
@@ -846,10 +863,10 @@ diff -urp
misc/Python-2.7.18/PC/VS9.0/bdist_wininst.vcproj misc/build/Python-2.7
TargetMachine="17"
/>
<Tool
-diff -urp misc/Python-2.7.18/PC/VS9.0/bz2.vcproj
misc/build/Python-2.7.18/PC/VS9.0/bz2.vcproj
---- misc/Python-2.7.18/PC/VS9.0/bz2.vcproj 2017-09-16 12:38:35.000000000
-0500
-+++ misc/build/Python-2.7.18/PC/VS9.0/bz2.vcproj 2017-10-21
17:56:40.232092000 -0500
-@@ -57,6 +57,7 @@
+diff --git misc/build/Python-2.7.18/PC/VS9.0/bz2.vcproj
misc/build/Python-2.7.18/PC/VS9.0/bz2.vcproj
+--- misc/build/Python-2.7.18/PC/VS9.0/bz2.vcproj
++++ misc/build/Python-2.7.18/PC/VS9.0/bz2.vcproj
+@@ -57,6 +57,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1D170000"
@@ -857,7 +874,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/bz2.vcproj
misc/build/Python-2.7.18/PC/VS9
/>
<Tool
Name="VCALinkTool"
-@@ -119,6 +120,7 @@
+@@ -119,6 +120,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1D170000"
@@ -865,7 +882,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/bz2.vcproj
misc/build/Python-2.7.18/PC/VS9
/>
<Tool
Name="VCALinkTool"
-@@ -181,6 +183,7 @@
+@@ -181,6 +183,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1D170000"
@@ -873,7 +890,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/bz2.vcproj
misc/build/Python-2.7.18/PC/VS9
/>
<Tool
Name="VCALinkTool"
-@@ -244,6 +247,7 @@
+@@ -244,6 +247,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1D170000"
@@ -881,7 +898,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/bz2.vcproj
misc/build/Python-2.7.18/PC/VS9
/>
<Tool
Name="VCALinkTool"
-@@ -306,6 +310,7 @@
+@@ -306,6 +310,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1D170000"
@@ -889,7 +906,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/bz2.vcproj
misc/build/Python-2.7.18/PC/VS9
/>
<Tool
Name="VCALinkTool"
-@@ -370,6 +375,7 @@
+@@ -370,6 +375,7 @@
Name="VCLinkerTool"
BaseAddress="0x1D170000"
TargetMachine="17"
@@ -897,7 +914,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/bz2.vcproj
misc/build/Python-2.7.18/PC/VS9
/>
<Tool
Name="VCALinkTool"
-@@ -432,6 +438,7 @@
+@@ -432,6 +438,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1D170000"
@@ -905,7 +922,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/bz2.vcproj
misc/build/Python-2.7.18/PC/VS9
/>
<Tool
Name="VCALinkTool"
-@@ -496,6 +503,7 @@
+@@ -496,6 +503,7 @@
Name="VCLinkerTool"
BaseAddress="0x1D170000"
TargetMachine="17"
@@ -913,10 +930,10 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/bz2.vcproj
misc/build/Python-2.7.18/PC/VS9
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.18/PC/VS9.0/kill_python.vcproj
misc/build/Python-2.7.18/PC/VS9.0/kill_python.vcproj
---- misc/Python-2.7.18/PC/VS9.0/kill_python.vcproj 2017-09-16
12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.18/PC/VS9.0/kill_python.vcproj 2017-10-21
17:56:40.233109000 -0500
-@@ -56,6 +56,7 @@
+diff --git misc/build/Python-2.7.18/PC/VS9.0/kill_python.vcproj
misc/build/Python-2.7.18/PC/VS9.0/kill_python.vcproj
+--- misc/build/Python-2.7.18/PC/VS9.0/kill_python.vcproj
++++ misc/build/Python-2.7.18/PC/VS9.0/kill_python.vcproj
+@@ -56,6 +56,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName)_d.exe"
SubSystem="1"
@@ -924,7 +941,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/kill_python.vcproj
misc/build/Python-2.7.1
/>
<Tool
Name="VCALinkTool"
-@@ -117,6 +118,7 @@
+@@ -117,6 +118,7 @@
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName)_d.exe"
SubSystem="1"
@@ -932,7 +949,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/kill_python.vcproj
misc/build/Python-2.7.1
/>
<Tool
Name="VCALinkTool"
-@@ -177,6 +179,7 @@
+@@ -177,6 +179,7 @@
<Tool
Name="VCLinkerTool"
SubSystem="1"
@@ -940,7 +957,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/kill_python.vcproj
misc/build/Python-2.7.1
/>
<Tool
Name="VCALinkTool"
-@@ -238,6 +241,7 @@
+@@ -238,6 +241,7 @@
<Tool
Name="VCLinkerTool"
SubSystem="1"
@@ -948,10 +965,10 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/kill_python.vcproj
misc/build/Python-2.7.1
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.18/PC/VS9.0/make_buildinfo.vcproj
misc/build/Python-2.7.18/PC/VS9.0/make_buildinfo.vcproj
---- misc/Python-2.7.18/PC/VS9.0/make_buildinfo.vcproj 2017-09-16
12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.18/PC/VS9.0/make_buildinfo.vcproj 2017-10-21
17:56:40.233689000 -0500
-@@ -61,6 +61,7 @@
+diff --git misc/build/Python-2.7.18/PC/VS9.0/make_buildinfo.vcproj
misc/build/Python-2.7.18/PC/VS9.0/make_buildinfo.vcproj
+--- misc/build/Python-2.7.18/PC/VS9.0/make_buildinfo.vcproj
++++ misc/build/Python-2.7.18/PC/VS9.0/make_buildinfo.vcproj
+@@ -61,6 +61,7 @@
OutputFile="$(OutDir)/make_buildinfo.exe"
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="1"
@@ -959,7 +976,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/make_buildinfo.vcproj
misc/build/Python-2.
/>
<Tool
Name="VCALinkTool"
-@@ -119,6 +120,7 @@
+@@ -119,6 +120,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -967,10 +984,10 @@ diff -urp
misc/Python-2.7.18/PC/VS9.0/make_buildinfo.vcproj misc/build/Python-2.
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.18/PC/VS9.0/make_versioninfo.vcproj
misc/build/Python-2.7.18/PC/VS9.0/make_versioninfo.vcproj
---- misc/Python-2.7.18/PC/VS9.0/make_versioninfo.vcproj 2017-09-16
12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.18/PC/VS9.0/make_versioninfo.vcproj 2017-10-21
17:56:40.234324000 -0500
-@@ -71,6 +71,7 @@
+diff --git misc/build/Python-2.7.18/PC/VS9.0/make_versioninfo.vcproj
misc/build/Python-2.7.18/PC/VS9.0/make_versioninfo.vcproj
+--- misc/build/Python-2.7.18/PC/VS9.0/make_versioninfo.vcproj
++++ misc/build/Python-2.7.18/PC/VS9.0/make_versioninfo.vcproj
+@@ -71,6 +71,7 @@
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="1"
BaseAddress="0x1d000000"
@@ -978,7 +995,7 @@ diff -urp
misc/Python-2.7.18/PC/VS9.0/make_versioninfo.vcproj misc/build/Python-
/>
<Tool
Name="VCALinkTool"
-@@ -137,6 +138,7 @@
+@@ -137,6 +138,7 @@
<Tool
Name="VCLinkerTool"
OutputFile="$(SolutionDir)make_versioninfo.exe"
@@ -986,7 +1003,7 @@ diff -urp
misc/Python-2.7.18/PC/VS9.0/make_versioninfo.vcproj misc/build/Python-
/>
<Tool
Name="VCALinkTool"
-@@ -214,6 +216,7 @@
+@@ -214,6 +216,7 @@
ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
SubSystem="1"
BaseAddress="0x1d000000"
@@ -994,7 +1011,7 @@ diff -urp
misc/Python-2.7.18/PC/VS9.0/make_versioninfo.vcproj misc/build/Python-
/>
<Tool
Name="VCALinkTool"
-@@ -282,6 +285,7 @@
+@@ -282,6 +285,7 @@
Name="VCLinkerTool"
OutputFile="$(SolutionDir)make_versioninfo_d.exe"
TargetMachine="17"
@@ -1002,10 +1019,10 @@ diff -urp
misc/Python-2.7.18/PC/VS9.0/make_versioninfo.vcproj misc/build/Python-
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.18/PC/VS9.0/pcbuild.sln
misc/build/Python-2.7.18/PC/VS9.0/pcbuild.sln
---- misc/Python-2.7.18/PC/VS9.0/pcbuild.sln 2017-09-16 12:38:35.000000000
-0500
-+++ misc/build/Python-2.7.18/PC/VS9.0/pcbuild.sln 2017-10-21
17:56:40.235608000 -0500
-@@ -38,12 +38,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C9
+diff --git misc/build/Python-2.7.18/PC/VS9.0/pcbuild.sln
misc/build/Python-2.7.18/PC/VS9.0/pcbuild.sln
+--- misc/build/Python-2.7.18/PC/VS9.0/pcbuild.sln
++++ misc/build/Python-2.7.18/PC/VS9.0/pcbuild.sln
+@@ -38,12 +38,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") =
"winsound", "winsound.vcproj
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} =
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
EndProjectSection
EndProject
@@ -1024,7 +1041,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/pcbuild.sln
misc/build/Python-2.7.18/PC/VS
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_ctypes",
"_ctypes.vcproj", "{0E9791DB-593A-465F-98BC-681011311618}"
ProjectSection(ProjectDependencies) = postProject
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} =
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
-@@ -69,12 +69,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C9
+@@ -69,12 +69,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") =
"_socket", "_socket.vcproj",
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} =
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
EndProjectSection
EndProject
@@ -1043,7 +1060,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/pcbuild.sln
misc/build/Python-2.7.18/PC/VS
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,16 +87,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C9
+@@ -87,16 +87,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") =
"_testcapi", "_testcapi.vcpr
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26} =
{CF7AC3D1-E2DF-41D2-BEA6-1E2556CDEA26}
EndProjectSection
EndProject
@@ -1070,7 +1087,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/pcbuild.sln
misc/build/Python-2.7.18/PC/VS
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}
-@@ -114,17 +114,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C9
+@@ -114,17 +114,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") =
"pyexpat", "pyexpat.vcproj",
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdist_wininst",
"bdist_wininst.vcproj", "{EB1C19C1-1F18-421E-9735-CAEE69DC6A3C}"
EndProject
@@ -1099,10 +1116,10 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/pcbuild.sln
misc/build/Python-2.7.18/PC/VS
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 -urp misc/Python-2.7.18/PC/VS9.0/pyexpat.vcproj
misc/build/Python-2.7.18/PC/VS9.0/pyexpat.vcproj
---- misc/Python-2.7.18/PC/VS9.0/pyexpat.vcproj 2017-09-16 12:38:35.000000000
-0500
-+++ misc/build/Python-2.7.18/PC/VS9.0/pyexpat.vcproj 2017-10-21
17:56:40.236395000 -0500
-@@ -56,6 +56,7 @@
+diff --git misc/build/Python-2.7.18/PC/VS9.0/pyexpat.vcproj
misc/build/Python-2.7.18/PC/VS9.0/pyexpat.vcproj
+--- misc/build/Python-2.7.18/PC/VS9.0/pyexpat.vcproj
++++ misc/build/Python-2.7.18/PC/VS9.0/pyexpat.vcproj
+@@ -56,6 +56,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -1110,7 +1127,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/pyexpat.vcproj
misc/build/Python-2.7.18/PC
/>
<Tool
Name="VCALinkTool"
-@@ -117,6 +118,7 @@
+@@ -117,6 +118,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -1118,7 +1135,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/pyexpat.vcproj
misc/build/Python-2.7.18/PC
/>
<Tool
Name="VCALinkTool"
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -1126,7 +1143,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/pyexpat.vcproj
misc/build/Python-2.7.18/PC
/>
<Tool
Name="VCALinkTool"
-@@ -240,6 +243,7 @@
+@@ -240,6 +243,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -1134,7 +1151,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/pyexpat.vcproj
misc/build/Python-2.7.18/PC
/>
<Tool
Name="VCALinkTool"
-@@ -301,6 +305,7 @@
+@@ -301,6 +305,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -1142,7 +1159,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/pyexpat.vcproj
misc/build/Python-2.7.18/PC
/>
<Tool
Name="VCALinkTool"
-@@ -364,6 +369,7 @@
+@@ -364,6 +369,7 @@
<Tool
Name="VCLinkerTool"
TargetMachine="17"
@@ -1150,7 +1167,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/pyexpat.vcproj
misc/build/Python-2.7.18/PC
/>
<Tool
Name="VCALinkTool"
-@@ -425,6 +431,7 @@
+@@ -425,6 +431,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -1158,7 +1175,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/pyexpat.vcproj
misc/build/Python-2.7.18/PC
/>
<Tool
Name="VCALinkTool"
-@@ -488,6 +495,7 @@
+@@ -488,6 +495,7 @@
<Tool
Name="VCLinkerTool"
TargetMachine="17"
@@ -1166,10 +1183,10 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/pyexpat.vcproj
misc/build/Python-2.7.18/PC
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.18/PC/VS9.0/python.vcproj
misc/build/Python-2.7.18/PC/VS9.0/python.vcproj
---- misc/Python-2.7.18/PC/VS9.0/python.vcproj 2017-09-16 12:38:35.000000000
-0500
-+++ misc/build/Python-2.7.18/PC/VS9.0/python.vcproj 2017-10-21
17:56:40.237211000 -0500
-@@ -66,6 +66,7 @@
+diff --git misc/build/Python-2.7.18/PC/VS9.0/python.vcproj
misc/build/Python-2.7.18/PC/VS9.0/python.vcproj
+--- misc/build/Python-2.7.18/PC/VS9.0/python.vcproj
++++ misc/build/Python-2.7.18/PC/VS9.0/python.vcproj
+@@ -66,6 +66,7 @@
SubSystem="1"
StackReserveSize="2000000"
BaseAddress="0x1d000000"
@@ -1177,7 +1194,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/python.vcproj
misc/build/Python-2.7.18/PC/
/>
<Tool
Name="VCALinkTool"
-@@ -139,6 +140,7 @@
+@@ -139,6 +140,7 @@
SubSystem="1"
StackReserveSize="2000000"
BaseAddress="0x1d000000"
@@ -1185,7 +1202,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/python.vcproj
misc/build/Python-2.7.18/PC/
/>
<Tool
Name="VCALinkTool"
-@@ -213,6 +215,7 @@
+@@ -213,6 +215,7 @@
SubSystem="1"
StackReserveSize="2000000"
BaseAddress="0x1d000000"
@@ -1193,7 +1210,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/python.vcproj
misc/build/Python-2.7.18/PC/
/>
<Tool
Name="VCALinkTool"
-@@ -288,6 +291,7 @@
+@@ -288,6 +291,7 @@
SubSystem="1"
StackReserveSize="2100000"
BaseAddress="0x1d000000"
@@ -1201,7 +1218,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/python.vcproj
misc/build/Python-2.7.18/PC/
/>
<Tool
Name="VCALinkTool"
-@@ -361,6 +365,7 @@
+@@ -361,6 +365,7 @@
StackReserveSize="2000000"
BaseAddress="0x1d000000"
ImportLibrary=""
@@ -1209,7 +1226,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/python.vcproj
misc/build/Python-2.7.18/PC/
/>
<Tool
Name="VCALinkTool"
-@@ -436,6 +441,7 @@
+@@ -436,6 +441,7 @@
BaseAddress="0x1d000000"
ImportLibrary=""
TargetMachine="17"
@@ -1217,7 +1234,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/python.vcproj
misc/build/Python-2.7.18/PC/
/>
<Tool
Name="VCALinkTool"
-@@ -509,6 +515,7 @@
+@@ -509,6 +515,7 @@
StackReserveSize="2000000"
BaseAddress="0x1d000000"
ImportLibrary=""
@@ -1225,7 +1242,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/python.vcproj
misc/build/Python-2.7.18/PC/
/>
<Tool
Name="VCALinkTool"
-@@ -584,6 +591,7 @@
+@@ -584,6 +591,7 @@
BaseAddress="0x1d000000"
ImportLibrary=""
TargetMachine="17"
@@ -1233,10 +1250,10 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/python.vcproj
misc/build/Python-2.7.18/PC/
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.18/PC/VS9.0/pythoncore.vcproj
misc/build/Python-2.7.18/PC/VS9.0/pythoncore.vcproj
---- misc/Python-2.7.18/PC/VS9.0/pythoncore.vcproj 2017-09-16
12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.18/PC/VS9.0/pythoncore.vcproj 2017-10-21
17:56:40.238551000 -0500
-@@ -69,6 +69,7 @@
+diff --git misc/build/Python-2.7.18/PC/VS9.0/pythoncore.vcproj
misc/build/Python-2.7.18/PC/VS9.0/pythoncore.vcproj
+--- misc/build/Python-2.7.18/PC/VS9.0/pythoncore.vcproj
++++ misc/build/Python-2.7.18/PC/VS9.0/pythoncore.vcproj
+@@ -69,6 +69,7 @@
ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
BaseAddress="0x1e000000"
ImportLibrary="$(OutDir)$(PyDllName).lib"
@@ -1244,7 +1261,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/pythoncore.vcproj
misc/build/Python-2.7.18
/>
<Tool
Name="VCALinkTool"
-@@ -144,6 +145,7 @@
+@@ -144,6 +145,7 @@
ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
BaseAddress="0x1e000000"
ImportLibrary="$(OutDir)$(PyDllName).lib"
@@ -1252,7 +1269,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/pythoncore.vcproj
misc/build/Python-2.7.18
/>
<Tool
Name="VCALinkTool"
-@@ -222,6 +224,7 @@
+@@ -222,6 +224,7 @@
ProgramDatabaseFile="$(OutDir)$(PyDllName)_d.pdb"
BaseAddress="0x1e000000"
ImportLibrary="$(OutDir)$(PyDllName)_d.lib"
@@ -1260,7 +1277,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/pythoncore.vcproj
misc/build/Python-2.7.18
/>
<Tool
Name="VCALinkTool"
-@@ -300,6 +303,7 @@
+@@ -300,6 +303,7 @@
ProgramDatabaseFile="$(OutDir)$(PyDllName)_d.pdb"
BaseAddress="0x1e000000"
ImportLibrary="$(OutDir)$(PyDllName)_d.lib"
@@ -1268,7 +1285,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/pythoncore.vcproj
misc/build/Python-2.7.18
/>
<Tool
Name="VCALinkTool"
-@@ -374,6 +378,7 @@
+@@ -374,6 +378,7 @@
ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
BaseAddress="0x1e000000"
ImportLibrary="$(OutDirPGI)$(PyDllName).lib"
@@ -1276,7 +1293,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/pythoncore.vcproj
misc/build/Python-2.7.18
/>
<Tool
Name="VCALinkTool"
-@@ -450,6 +455,7 @@
+@@ -450,6 +455,7 @@
BaseAddress="0x1e000000"
ImportLibrary="$(OutDirPGI)$(PyDllName).lib"
TargetMachine="17"
@@ -1284,7 +1301,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/pythoncore.vcproj
misc/build/Python-2.7.18
/>
<Tool
Name="VCALinkTool"
-@@ -524,6 +530,7 @@
+@@ -524,6 +530,7 @@
ProgramDatabaseFile="$(OutDir)$(PyDllName).pdb"
BaseAddress="0x1e000000"
ImportLibrary="$(OutDirPGI)$(PyDllName).lib"
@@ -1292,7 +1309,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/pythoncore.vcproj
misc/build/Python-2.7.18
/>
<Tool
Name="VCALinkTool"
-@@ -600,6 +607,7 @@
+@@ -600,6 +607,7 @@
BaseAddress="0x1e000000"
ImportLibrary="$(OutDirPGI)$(PyDllName).lib"
TargetMachine="17"
@@ -1300,10 +1317,10 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/pythoncore.vcproj
misc/build/Python-2.7.18
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.18/PC/VS9.0/pythonw.vcproj
misc/build/Python-2.7.18/PC/VS9.0/pythonw.vcproj
---- misc/Python-2.7.18/PC/VS9.0/pythonw.vcproj 2017-09-16 12:38:35.000000000
-0500
-+++ misc/build/Python-2.7.18/PC/VS9.0/pythonw.vcproj 2017-10-21
17:56:40.239382000 -0500
-@@ -66,6 +66,7 @@
+diff --git misc/build/Python-2.7.18/PC/VS9.0/pythonw.vcproj
misc/build/Python-2.7.18/PC/VS9.0/pythonw.vcproj
+--- misc/build/Python-2.7.18/PC/VS9.0/pythonw.vcproj
++++ misc/build/Python-2.7.18/PC/VS9.0/pythonw.vcproj
+@@ -66,6 +66,7 @@
StackReserveSize="2000000"
BaseAddress="0x1d000000"
TargetMachine="1"
@@ -1311,7 +1328,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/pythonw.vcproj
misc/build/Python-2.7.18/PC
/>
<Tool
Name="VCALinkTool"
-@@ -137,6 +138,7 @@
+@@ -137,6 +138,7 @@
OutputFile="$(OutDir)\pythonw_d.exe"
StackReserveSize="2000000"
BaseAddress="0x1d000000"
@@ -1319,7 +1336,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/pythonw.vcproj
misc/build/Python-2.7.18/PC
/>
<Tool
Name="VCALinkTool"
-@@ -208,6 +210,7 @@
+@@ -208,6 +210,7 @@
StackReserveSize="2000000"
BaseAddress="0x1d000000"
TargetMachine="1"
@@ -1327,7 +1344,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/pythonw.vcproj
misc/build/Python-2.7.18/PC
/>
<Tool
Name="VCALinkTool"
-@@ -279,6 +282,7 @@
+@@ -279,6 +282,7 @@
OutputFile="$(OutDir)\pythonw.exe"
StackReserveSize="2000000"
BaseAddress="0x1d000000"
@@ -1335,7 +1352,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/pythonw.vcproj
misc/build/Python-2.7.18/PC
/>
<Tool
Name="VCALinkTool"
-@@ -351,6 +355,7 @@
+@@ -351,6 +355,7 @@
BaseAddress="0x1d000000"
ImportLibrary=""
TargetMachine="1"
@@ -1343,7 +1360,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/pythonw.vcproj
misc/build/Python-2.7.18/PC
/>
<Tool
Name="VCALinkTool"
-@@ -424,6 +429,7 @@
+@@ -424,6 +429,7 @@
BaseAddress="0x1d000000"
ImportLibrary=""
TargetMachine="17"
@@ -1351,7 +1368,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/pythonw.vcproj
misc/build/Python-2.7.18/PC
/>
<Tool
Name="VCALinkTool"
-@@ -496,6 +502,7 @@
+@@ -496,6 +502,7 @@
BaseAddress="0x1d000000"
ImportLibrary=""
TargetMachine="1"
@@ -1359,7 +1376,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/pythonw.vcproj
misc/build/Python-2.7.18/PC
/>
<Tool
Name="VCALinkTool"
-@@ -569,6 +576,7 @@
+@@ -569,6 +576,7 @@
BaseAddress="0x1d000000"
ImportLibrary=""
TargetMachine="17"
@@ -1367,10 +1384,10 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/pythonw.vcproj
misc/build/Python-2.7.18/PC
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.18/PC/VS9.0/select.vcproj
misc/build/Python-2.7.18/PC/VS9.0/select.vcproj
---- misc/Python-2.7.18/PC/VS9.0/select.vcproj 2017-09-16 12:38:35.000000000
-0500
-+++ misc/build/Python-2.7.18/PC/VS9.0/select.vcproj 2017-10-21
17:56:40.240210000 -0500
-@@ -57,6 +57,7 @@
+diff --git misc/build/Python-2.7.18/PC/VS9.0/select.vcproj
misc/build/Python-2.7.18/PC/VS9.0/select.vcproj
+--- misc/build/Python-2.7.18/PC/VS9.0/select.vcproj
++++ misc/build/Python-2.7.18/PC/VS9.0/select.vcproj
+@@ -57,6 +57,7 @@
AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000"
@@ -1378,7 +1395,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/select.vcproj
misc/build/Python-2.7.18/PC/
/>
<Tool
Name="VCALinkTool"
-@@ -119,6 +120,7 @@
+@@ -119,6 +120,7 @@
AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000"
@@ -1386,7 +1403,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/select.vcproj
misc/build/Python-2.7.18/PC/
/>
<Tool
Name="VCALinkTool"
-@@ -181,6 +183,7 @@
+@@ -181,6 +183,7 @@
AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000"
@@ -1394,7 +1411,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/select.vcproj
misc/build/Python-2.7.18/PC/
/>
<Tool
Name="VCALinkTool"
-@@ -244,6 +247,7 @@
+@@ -244,6 +247,7 @@
AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000"
@@ -1402,7 +1419,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/select.vcproj
misc/build/Python-2.7.18/PC/
/>
<Tool
Name="VCALinkTool"
-@@ -306,6 +310,7 @@
+@@ -306,6 +310,7 @@
AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000"
@@ -1410,7 +1427,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/select.vcproj
misc/build/Python-2.7.18/PC/
/>
<Tool
Name="VCALinkTool"
-@@ -370,6 +375,7 @@
+@@ -370,6 +375,7 @@
IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000"
TargetMachine="17"
@@ -1418,7 +1435,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/select.vcproj
misc/build/Python-2.7.18/PC/
/>
<Tool
Name="VCALinkTool"
-@@ -432,6 +438,7 @@
+@@ -432,6 +438,7 @@
AdditionalDependencies="ws2_32.lib"
IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000"
@@ -1426,7 +1443,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/select.vcproj
misc/build/Python-2.7.18/PC/
/>
<Tool
Name="VCALinkTool"
-@@ -496,6 +503,7 @@
+@@ -496,6 +503,7 @@
IgnoreDefaultLibraryNames="libc"
BaseAddress="0x1D110000"
TargetMachine="17"
@@ -1434,10 +1451,10 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/select.vcproj
misc/build/Python-2.7.18/PC/
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.18/PC/VS9.0/sqlite3.vcproj
misc/build/Python-2.7.18/PC/VS9.0/sqlite3.vcproj
---- misc/Python-2.7.18/PC/VS9.0/sqlite3.vcproj 2017-09-16 12:38:35.000000000
-0500
-+++ misc/build/Python-2.7.18/PC/VS9.0/sqlite3.vcproj 2017-10-21
17:56:40.241775000 -0500
-@@ -56,6 +56,7 @@
+diff --git misc/build/Python-2.7.18/PC/VS9.0/sqlite3.vcproj
misc/build/Python-2.7.18/PC/VS9.0/sqlite3.vcproj
+--- misc/build/Python-2.7.18/PC/VS9.0/sqlite3.vcproj
++++ misc/build/Python-2.7.18/PC/VS9.0/sqlite3.vcproj
+@@ -56,6 +56,7 @@
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName)_d.dll"
@@ -1445,7 +1462,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/sqlite3.vcproj
misc/build/Python-2.7.18/PC
/>
<Tool
Name="VCALinkTool"
-@@ -117,6 +118,7 @@
+@@ -117,6 +118,7 @@
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName)_d.dll"
@@ -1453,7 +1470,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/sqlite3.vcproj
misc/build/Python-2.7.18/PC
/>
<Tool
Name="VCALinkTool"
-@@ -178,6 +180,7 @@
+@@ -178,6 +180,7 @@
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).dll"
@@ -1461,7 +1478,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/sqlite3.vcproj
misc/build/Python-2.7.18/PC
/>
<Tool
Name="VCALinkTool"
-@@ -240,6 +243,7 @@
+@@ -240,6 +243,7 @@
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).dll"
@@ -1469,7 +1486,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/sqlite3.vcproj
misc/build/Python-2.7.18/PC
/>
<Tool
Name="VCALinkTool"
-@@ -301,6 +305,7 @@
+@@ -301,6 +305,7 @@
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).dll"
@@ -1477,7 +1494,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/sqlite3.vcproj
misc/build/Python-2.7.18/PC
/>
<Tool
Name="VCALinkTool"
-@@ -362,6 +367,7 @@
+@@ -362,6 +367,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -1485,7 +1502,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/sqlite3.vcproj
misc/build/Python-2.7.18/PC
/>
<Tool
Name="VCALinkTool"
-@@ -423,6 +429,7 @@
+@@ -423,6 +429,7 @@
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName).dll"
@@ -1493,7 +1510,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/sqlite3.vcproj
misc/build/Python-2.7.18/PC
/>
<Tool
Name="VCALinkTool"
-@@ -484,6 +491,7 @@
+@@ -484,6 +491,7 @@
/>
<Tool
Name="VCLinkerTool"
@@ -1501,10 +1518,10 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/sqlite3.vcproj
misc/build/Python-2.7.18/PC
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.18/PC/VS9.0/unicodedata.vcproj
misc/build/Python-2.7.18/PC/VS9.0/unicodedata.vcproj
---- misc/Python-2.7.18/PC/VS9.0/unicodedata.vcproj 2017-09-16
12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.18/PC/VS9.0/unicodedata.vcproj 2017-10-21
17:56:40.242820000 -0500
-@@ -55,6 +55,7 @@
+diff --git misc/build/Python-2.7.18/PC/VS9.0/unicodedata.vcproj
misc/build/Python-2.7.18/PC/VS9.0/unicodedata.vcproj
+--- misc/build/Python-2.7.18/PC/VS9.0/unicodedata.vcproj
++++ misc/build/Python-2.7.18/PC/VS9.0/unicodedata.vcproj
+@@ -55,6 +55,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1D120000"
@@ -1512,7 +1529,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/unicodedata.vcproj
misc/build/Python-2.7.1
/>
<Tool
Name="VCALinkTool"
-@@ -115,6 +116,7 @@
+@@ -115,6 +116,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1D120000"
@@ -1520,7 +1537,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/unicodedata.vcproj
misc/build/Python-2.7.1
/>
<Tool
Name="VCALinkTool"
-@@ -175,6 +177,7 @@
+@@ -175,6 +177,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1D120000"
@@ -1528,7 +1545,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/unicodedata.vcproj
misc/build/Python-2.7.1
/>
<Tool
Name="VCALinkTool"
-@@ -236,6 +239,7 @@
+@@ -236,6 +239,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1D120000"
@@ -1536,7 +1553,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/unicodedata.vcproj
misc/build/Python-2.7.1
/>
<Tool
Name="VCALinkTool"
-@@ -296,6 +300,7 @@
+@@ -296,6 +300,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1D120000"
@@ -1544,7 +1561,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/unicodedata.vcproj
misc/build/Python-2.7.1
/>
<Tool
Name="VCALinkTool"
-@@ -358,6 +363,7 @@
+@@ -358,6 +363,7 @@
Name="VCLinkerTool"
BaseAddress="0x1D120000"
TargetMachine="17"
@@ -1552,7 +1569,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/unicodedata.vcproj
misc/build/Python-2.7.1
/>
<Tool
Name="VCALinkTool"
-@@ -418,6 +424,7 @@
+@@ -418,6 +424,7 @@
<Tool
Name="VCLinkerTool"
BaseAddress="0x1D120000"
@@ -1560,7 +1577,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/unicodedata.vcproj
misc/build/Python-2.7.1
/>
<Tool
Name="VCALinkTool"
-@@ -480,6 +487,7 @@
+@@ -480,6 +487,7 @@
Name="VCLinkerTool"
BaseAddress="0x1D120000"
TargetMachine="17"
@@ -1568,10 +1585,10 @@ diff -urp
misc/Python-2.7.18/PC/VS9.0/unicodedata.vcproj misc/build/Python-2.7.1
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.18/PC/VS9.0/w9xpopen.vcproj
misc/build/Python-2.7.18/PC/VS9.0/w9xpopen.vcproj
---- misc/Python-2.7.18/PC/VS9.0/w9xpopen.vcproj 2017-09-16
12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.18/PC/VS9.0/w9xpopen.vcproj 2017-10-21
17:56:40.243805000 -0500
-@@ -59,6 +59,7 @@
+diff --git misc/build/Python-2.7.18/PC/VS9.0/w9xpopen.vcproj
misc/build/Python-2.7.18/PC/VS9.0/w9xpopen.vcproj
+--- misc/build/Python-2.7.18/PC/VS9.0/w9xpopen.vcproj
++++ misc/build/Python-2.7.18/PC/VS9.0/w9xpopen.vcproj
+@@ -59,6 +59,7 @@
<Tool
Name="VCLinkerTool"
SubSystem="1"
@@ -1579,7 +1596,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/w9xpopen.vcproj
misc/build/Python-2.7.18/P
/>
<Tool
Name="VCALinkTool"
-@@ -124,6 +125,7 @@
+@@ -124,6 +125,7 @@
<Tool
Name="VCLinkerTool"
SubSystem="1"
@@ -1587,7 +1604,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/w9xpopen.vcproj
misc/build/Python-2.7.18/P
/>
<Tool
Name="VCALinkTool"
-@@ -191,6 +193,7 @@
+@@ -191,6 +193,7 @@
Name="VCLinkerTool"
GenerateDebugInformation="false"
SubSystem="1"
@@ -1595,7 +1612,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/w9xpopen.vcproj
misc/build/Python-2.7.18/P
/>
<Tool
Name="VCALinkTool"
-@@ -259,6 +262,7 @@
+@@ -259,6 +262,7 @@
Name="VCLinkerTool"
GenerateDebugInformation="false"
SubSystem="1"
@@ -1603,7 +1620,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/w9xpopen.vcproj
misc/build/Python-2.7.18/P
/>
<Tool
Name="VCALinkTool"
-@@ -327,6 +331,7 @@
+@@ -327,6 +331,7 @@
GenerateDebugInformation="false"
SubSystem="1"
ImportLibrary=""
@@ -1611,7 +1628,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/w9xpopen.vcproj
misc/build/Python-2.7.18/P
/>
<Tool
Name="VCALinkTool"
-@@ -397,6 +402,7 @@
+@@ -397,6 +402,7 @@
SubSystem="1"
ImportLibrary=""
TargetMachine="17"
@@ -1619,7 +1636,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/w9xpopen.vcproj
misc/build/Python-2.7.18/P
/>
<Tool
Name="VCALinkTool"
-@@ -465,6 +471,7 @@
+@@ -465,6 +471,7 @@
GenerateDebugInformation="false"
SubSystem="1"
ImportLibrary=""
@@ -1627,7 +1644,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/w9xpopen.vcproj
misc/build/Python-2.7.18/P
/>
<Tool
Name="VCALinkTool"
-@@ -535,6 +542,7 @@
+@@ -535,6 +542,7 @@
SubSystem="1"
ImportLibrary=""
TargetMachine="17"
@@ -1635,10 +1652,10 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/w9xpopen.vcproj
misc/build/Python-2.7.18/P
/>
<Tool
Name="VCALinkTool"
-diff -urp misc/Python-2.7.18/PC/VS9.0/winsound.vcproj
misc/build/Python-2.7.18/PC/VS9.0/winsound.vcproj
---- misc/Python-2.7.18/PC/VS9.0/winsound.vcproj 2017-09-16
12:38:35.000000000 -0500
-+++ misc/build/Python-2.7.18/PC/VS9.0/winsound.vcproj 2017-10-21
17:56:40.244677000 -0500
-@@ -55,6 +55,7 @@
+diff --git misc/build/Python-2.7.18/PC/VS9.0/winsound.vcproj
misc/build/Python-2.7.18/PC/VS9.0/winsound.vcproj
+--- misc/build/Python-2.7.18/PC/VS9.0/winsound.vcproj
++++ misc/build/Python-2.7.18/PC/VS9.0/winsound.vcproj
+@@ -55,6 +55,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="winmm.lib"
@@ -1646,7 +1663,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/winsound.vcproj
misc/build/Python-2.7.18/P
/>
<Tool
Name="VCALinkTool"
-@@ -115,6 +116,7 @@
+@@ -115,6 +116,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="winmm.lib"
@@ -1654,7 +1671,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/winsound.vcproj
misc/build/Python-2.7.18/P
/>
<Tool
Name="VCALinkTool"
-@@ -175,6 +177,7 @@
+@@ -175,6 +177,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="winmm.lib"
@@ -1662,7 +1679,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/winsound.vcproj
misc/build/Python-2.7.18/P
/>
<Tool
Name="VCALinkTool"
-@@ -236,6 +239,7 @@
+@@ -236,6 +239,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="winmm.lib"
@@ -1670,7 +1687,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/winsound.vcproj
misc/build/Python-2.7.18/P
/>
<Tool
Name="VCALinkTool"
-@@ -296,6 +300,7 @@
+@@ -296,6 +300,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="winmm.lib"
@@ -1678,7 +1695,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/winsound.vcproj
misc/build/Python-2.7.18/P
/>
<Tool
Name="VCALinkTool"
-@@ -358,6 +363,7 @@
+@@ -358,6 +363,7 @@
Name="VCLinkerTool"
AdditionalDependencies="winmm.lib"
TargetMachine="17"
@@ -1686,7 +1703,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/winsound.vcproj
misc/build/Python-2.7.18/P
/>
<Tool
Name="VCALinkTool"
-@@ -418,6 +424,7 @@
+@@ -418,6 +424,7 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="winmm.lib"
@@ -1694,7 +1711,7 @@ diff -urp misc/Python-2.7.18/PC/VS9.0/winsound.vcproj
misc/build/Python-2.7.18/P
/>
<Tool
Name="VCALinkTool"
-@@ -480,6 +487,7 @@
+@@ -480,6 +487,7 @@
Name="VCLinkerTool"
AdditionalDependencies="winmm.lib"
TargetMachine="17"
diff --git a/main/scp2/source/ooo/file_library_ooo.scp
b/main/scp2/source/ooo/file_library_ooo.scp
index ae84b0d958..fb82de45e6 100644
--- a/main/scp2/source/ooo/file_library_ooo.scp
+++ b/main/scp2/source/ooo/file_library_ooo.scp
@@ -1775,7 +1775,7 @@ File gid_File_Lib_Openssl
Styles = (PACKED);
Dir = SCP2_OOO_BIN_DIR;
#ifdef WNT
- Name = "ssleay32.dll";
+ Name = "libssl-3.dll";
#else
Name = "libssl.so";
#endif
@@ -1788,7 +1788,7 @@ File gid_File_Lib_Crypto
Styles = (PACKED);
Dir = SCP2_OOO_BIN_DIR;
#ifdef WNT
- Name = "libeay32.dll";
+ Name = "libcrypto-3.dll";
#else
Name = "libcrypto.so";
#endif
