Fossil SCM
Upgrade to openssl 1.0.2m
Commit
5310f2ba88534f31d67f2cf2f47f3eadd02f8bc477d5db7613bfe27fa7a5098f
Parent
23c8937d70552f2…
5 files changed
+2
-2
+1
-1
+1
-1
+1
-1
+1
-1
+2
-2
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -677,11 +677,11 @@ | ||
| 677 | 677 | #### The directories where the OpenSSL include and library files are located. |
| 678 | 678 | # The recommended usage here is to use the Sysinternals junction tool |
| 679 | 679 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 680 | 680 | # Fossil source code directory and the target OpenSSL source directory. |
| 681 | 681 | # |
| 682 | -OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2l | |
| 682 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2m | |
| 683 | 683 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 684 | 684 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 685 | 685 | |
| 686 | 686 | #### Either the directory where the Tcl library is installed or the Tcl |
| 687 | 687 | # source code directory resides (depending on the value of the macro |
| @@ -1508,11 +1508,11 @@ | ||
| 1508 | 1508 | !ifndef USE_SEE |
| 1509 | 1509 | USE_SEE = 0 |
| 1510 | 1510 | !endif |
| 1511 | 1511 | |
| 1512 | 1512 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 1513 | -SSLDIR = $(B)\compat\openssl-1.0.2l | |
| 1513 | +SSLDIR = $(B)\compat\openssl-1.0.2m | |
| 1514 | 1514 | SSLINCDIR = $(SSLDIR)\inc32 |
| 1515 | 1515 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1516 | 1516 | SSLLIBDIR = $(SSLDIR)\out32dll |
| 1517 | 1517 | !else |
| 1518 | 1518 | SSLLIBDIR = $(SSLDIR)\out32 |
| 1519 | 1519 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -677,11 +677,11 @@ | |
| 677 | #### The directories where the OpenSSL include and library files are located. |
| 678 | # The recommended usage here is to use the Sysinternals junction tool |
| 679 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 680 | # Fossil source code directory and the target OpenSSL source directory. |
| 681 | # |
| 682 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2l |
| 683 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 684 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 685 | |
| 686 | #### Either the directory where the Tcl library is installed or the Tcl |
| 687 | # source code directory resides (depending on the value of the macro |
| @@ -1508,11 +1508,11 @@ | |
| 1508 | !ifndef USE_SEE |
| 1509 | USE_SEE = 0 |
| 1510 | !endif |
| 1511 | |
| 1512 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 1513 | SSLDIR = $(B)\compat\openssl-1.0.2l |
| 1514 | SSLINCDIR = $(SSLDIR)\inc32 |
| 1515 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1516 | SSLLIBDIR = $(SSLDIR)\out32dll |
| 1517 | !else |
| 1518 | SSLLIBDIR = $(SSLDIR)\out32 |
| 1519 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -677,11 +677,11 @@ | |
| 677 | #### The directories where the OpenSSL include and library files are located. |
| 678 | # The recommended usage here is to use the Sysinternals junction tool |
| 679 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 680 | # Fossil source code directory and the target OpenSSL source directory. |
| 681 | # |
| 682 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2m |
| 683 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 684 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 685 | |
| 686 | #### Either the directory where the Tcl library is installed or the Tcl |
| 687 | # source code directory resides (depending on the value of the macro |
| @@ -1508,11 +1508,11 @@ | |
| 1508 | !ifndef USE_SEE |
| 1509 | USE_SEE = 0 |
| 1510 | !endif |
| 1511 | |
| 1512 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 1513 | SSLDIR = $(B)\compat\openssl-1.0.2m |
| 1514 | SSLINCDIR = $(SSLDIR)\inc32 |
| 1515 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1516 | SSLLIBDIR = $(SSLDIR)\out32dll |
| 1517 | !else |
| 1518 | SSLLIBDIR = $(SSLDIR)\out32 |
| 1519 |
+1
-1
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -170,11 +170,11 @@ | ||
| 170 | 170 | #### The directories where the OpenSSL include and library files are located. |
| 171 | 171 | # The recommended usage here is to use the Sysinternals junction tool |
| 172 | 172 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 173 | 173 | # Fossil source code directory and the target OpenSSL source directory. |
| 174 | 174 | # |
| 175 | -OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2l | |
| 175 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2m | |
| 176 | 176 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 177 | 177 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 178 | 178 | |
| 179 | 179 | #### Either the directory where the Tcl library is installed or the Tcl |
| 180 | 180 | # source code directory resides (depending on the value of the macro |
| 181 | 181 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -170,11 +170,11 @@ | |
| 170 | #### The directories where the OpenSSL include and library files are located. |
| 171 | # The recommended usage here is to use the Sysinternals junction tool |
| 172 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 173 | # Fossil source code directory and the target OpenSSL source directory. |
| 174 | # |
| 175 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2l |
| 176 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 177 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 178 | |
| 179 | #### Either the directory where the Tcl library is installed or the Tcl |
| 180 | # source code directory resides (depending on the value of the macro |
| 181 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -170,11 +170,11 @@ | |
| 170 | #### The directories where the OpenSSL include and library files are located. |
| 171 | # The recommended usage here is to use the Sysinternals junction tool |
| 172 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 173 | # Fossil source code directory and the target OpenSSL source directory. |
| 174 | # |
| 175 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2m |
| 176 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 177 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 178 | |
| 179 | #### Either the directory where the Tcl library is installed or the Tcl |
| 180 | # source code directory resides (depending on the value of the macro |
| 181 |
+1
-1
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -170,11 +170,11 @@ | ||
| 170 | 170 | #### The directories where the OpenSSL include and library files are located. |
| 171 | 171 | # The recommended usage here is to use the Sysinternals junction tool |
| 172 | 172 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 173 | 173 | # Fossil source code directory and the target OpenSSL source directory. |
| 174 | 174 | # |
| 175 | -OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2l | |
| 175 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2m | |
| 176 | 176 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 177 | 177 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 178 | 178 | |
| 179 | 179 | #### Either the directory where the Tcl library is installed or the Tcl |
| 180 | 180 | # source code directory resides (depending on the value of the macro |
| 181 | 181 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -170,11 +170,11 @@ | |
| 170 | #### The directories where the OpenSSL include and library files are located. |
| 171 | # The recommended usage here is to use the Sysinternals junction tool |
| 172 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 173 | # Fossil source code directory and the target OpenSSL source directory. |
| 174 | # |
| 175 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2l |
| 176 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 177 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 178 | |
| 179 | #### Either the directory where the Tcl library is installed or the Tcl |
| 180 | # source code directory resides (depending on the value of the macro |
| 181 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -170,11 +170,11 @@ | |
| 170 | #### The directories where the OpenSSL include and library files are located. |
| 171 | # The recommended usage here is to use the Sysinternals junction tool |
| 172 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 173 | # Fossil source code directory and the target OpenSSL source directory. |
| 174 | # |
| 175 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2m |
| 176 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 177 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 178 | |
| 179 | #### Either the directory where the Tcl library is installed or the Tcl |
| 180 | # source code directory resides (depending on the value of the macro |
| 181 |
+1
-1
| --- win/Makefile.msc | ||
| +++ win/Makefile.msc | ||
| @@ -98,11 +98,11 @@ | ||
| 98 | 98 | !ifndef USE_SEE |
| 99 | 99 | USE_SEE = 0 |
| 100 | 100 | !endif |
| 101 | 101 | |
| 102 | 102 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 103 | -SSLDIR = $(B)\compat\openssl-1.0.2l | |
| 103 | +SSLDIR = $(B)\compat\openssl-1.0.2m | |
| 104 | 104 | SSLINCDIR = $(SSLDIR)\inc32 |
| 105 | 105 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 106 | 106 | SSLLIBDIR = $(SSLDIR)\out32dll |
| 107 | 107 | !else |
| 108 | 108 | SSLLIBDIR = $(SSLDIR)\out32 |
| 109 | 109 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -98,11 +98,11 @@ | |
| 98 | !ifndef USE_SEE |
| 99 | USE_SEE = 0 |
| 100 | !endif |
| 101 | |
| 102 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 103 | SSLDIR = $(B)\compat\openssl-1.0.2l |
| 104 | SSLINCDIR = $(SSLDIR)\inc32 |
| 105 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 106 | SSLLIBDIR = $(SSLDIR)\out32dll |
| 107 | !else |
| 108 | SSLLIBDIR = $(SSLDIR)\out32 |
| 109 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -98,11 +98,11 @@ | |
| 98 | !ifndef USE_SEE |
| 99 | USE_SEE = 0 |
| 100 | !endif |
| 101 | |
| 102 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 103 | SSLDIR = $(B)\compat\openssl-1.0.2m |
| 104 | SSLINCDIR = $(SSLDIR)\inc32 |
| 105 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 106 | SSLLIBDIR = $(SSLDIR)\out32dll |
| 107 | !else |
| 108 | SSLLIBDIR = $(SSLDIR)\out32 |
| 109 |
+1
-1
| --- www/build.wiki | ||
| +++ www/build.wiki | ||
| @@ -136,11 +136,11 @@ | ||
| 136 | 136 | the optional <a href="https://www.openssl.org/">OpenSSL</a> support, |
| 137 | 137 | first <a href="https://www.openssl.org/source/">download the official |
| 138 | 138 | source code for OpenSSL</a> and extract it to an appropriately named |
| 139 | 139 | "<b>openssl-X.Y.ZA</b>" subdirectory within the local |
| 140 | 140 | [/tree?ci=trunk&name=compat | compat] directory (e.g. |
| 141 | -"<b>compat/openssl-1.0.2l</b>"), then make sure that some recent | |
| 141 | +"<b>compat/openssl-1.0.2m</b>"), then make sure that some recent | |
| 142 | 142 | <a href="http://www.perl.org/">Perl</a> binaries are installed locally, |
| 143 | 143 | and finally run one of the following commands: |
| 144 | 144 | <blockquote><pre> |
| 145 | 145 | nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin |
| 146 | 146 | </pre></blockquote> |
| 147 | 147 |
| --- www/build.wiki | |
| +++ www/build.wiki | |
| @@ -136,11 +136,11 @@ | |
| 136 | the optional <a href="https://www.openssl.org/">OpenSSL</a> support, |
| 137 | first <a href="https://www.openssl.org/source/">download the official |
| 138 | source code for OpenSSL</a> and extract it to an appropriately named |
| 139 | "<b>openssl-X.Y.ZA</b>" subdirectory within the local |
| 140 | [/tree?ci=trunk&name=compat | compat] directory (e.g. |
| 141 | "<b>compat/openssl-1.0.2l</b>"), then make sure that some recent |
| 142 | <a href="http://www.perl.org/">Perl</a> binaries are installed locally, |
| 143 | and finally run one of the following commands: |
| 144 | <blockquote><pre> |
| 145 | nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin |
| 146 | </pre></blockquote> |
| 147 |
| --- www/build.wiki | |
| +++ www/build.wiki | |
| @@ -136,11 +136,11 @@ | |
| 136 | the optional <a href="https://www.openssl.org/">OpenSSL</a> support, |
| 137 | first <a href="https://www.openssl.org/source/">download the official |
| 138 | source code for OpenSSL</a> and extract it to an appropriately named |
| 139 | "<b>openssl-X.Y.ZA</b>" subdirectory within the local |
| 140 | [/tree?ci=trunk&name=compat | compat] directory (e.g. |
| 141 | "<b>compat/openssl-1.0.2m</b>"), then make sure that some recent |
| 142 | <a href="http://www.perl.org/">Perl</a> binaries are installed locally, |
| 143 | and finally run one of the following commands: |
| 144 | <blockquote><pre> |
| 145 | nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin |
| 146 | </pre></blockquote> |
| 147 |