Fossil SCM
Update OpenSSL to version 1.0.2e
Commit
1376aa440b5911b681d5e9224ddb8b6e91369c5e
Parent
5032c50d1425290…
5 files changed
+2
-2
+1
-1
+1
-1
+1
-1
+1
-1
+2
-2
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -607,11 +607,11 @@ | ||
| 607 | 607 | #### The directories where the OpenSSL include and library files are located. |
| 608 | 608 | # The recommended usage here is to use the Sysinternals junction tool |
| 609 | 609 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 610 | 610 | # Fossil source code directory and the target OpenSSL source directory. |
| 611 | 611 | # |
| 612 | -OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2d | |
| 612 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2e | |
| 613 | 613 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 614 | 614 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 615 | 615 | |
| 616 | 616 | #### Either the directory where the Tcl library is installed or the Tcl |
| 617 | 617 | # source code directory resides (depending on the value of the macro |
| @@ -1396,11 +1396,11 @@ | ||
| 1396 | 1396 | !ifndef FOSSIL_ENABLE_WINXP |
| 1397 | 1397 | FOSSIL_ENABLE_WINXP = 0 |
| 1398 | 1398 | !endif |
| 1399 | 1399 | |
| 1400 | 1400 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 1401 | -SSLDIR = $(B)\compat\openssl-1.0.2d | |
| 1401 | +SSLDIR = $(B)\compat\openssl-1.0.2e | |
| 1402 | 1402 | SSLINCDIR = $(SSLDIR)\inc32 |
| 1403 | 1403 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1404 | 1404 | SSLLIBDIR = $(SSLDIR)\out32dll |
| 1405 | 1405 | !else |
| 1406 | 1406 | SSLLIBDIR = $(SSLDIR)\out32 |
| 1407 | 1407 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -607,11 +607,11 @@ | |
| 607 | #### The directories where the OpenSSL include and library files are located. |
| 608 | # The recommended usage here is to use the Sysinternals junction tool |
| 609 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 610 | # Fossil source code directory and the target OpenSSL source directory. |
| 611 | # |
| 612 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2d |
| 613 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 614 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 615 | |
| 616 | #### Either the directory where the Tcl library is installed or the Tcl |
| 617 | # source code directory resides (depending on the value of the macro |
| @@ -1396,11 +1396,11 @@ | |
| 1396 | !ifndef FOSSIL_ENABLE_WINXP |
| 1397 | FOSSIL_ENABLE_WINXP = 0 |
| 1398 | !endif |
| 1399 | |
| 1400 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 1401 | SSLDIR = $(B)\compat\openssl-1.0.2d |
| 1402 | SSLINCDIR = $(SSLDIR)\inc32 |
| 1403 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1404 | SSLLIBDIR = $(SSLDIR)\out32dll |
| 1405 | !else |
| 1406 | SSLLIBDIR = $(SSLDIR)\out32 |
| 1407 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -607,11 +607,11 @@ | |
| 607 | #### The directories where the OpenSSL include and library files are located. |
| 608 | # The recommended usage here is to use the Sysinternals junction tool |
| 609 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 610 | # Fossil source code directory and the target OpenSSL source directory. |
| 611 | # |
| 612 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2e |
| 613 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 614 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 615 | |
| 616 | #### Either the directory where the Tcl library is installed or the Tcl |
| 617 | # source code directory resides (depending on the value of the macro |
| @@ -1396,11 +1396,11 @@ | |
| 1396 | !ifndef FOSSIL_ENABLE_WINXP |
| 1397 | FOSSIL_ENABLE_WINXP = 0 |
| 1398 | !endif |
| 1399 | |
| 1400 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 1401 | SSLDIR = $(B)\compat\openssl-1.0.2e |
| 1402 | SSLINCDIR = $(SSLDIR)\inc32 |
| 1403 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1404 | SSLLIBDIR = $(SSLDIR)\out32dll |
| 1405 | !else |
| 1406 | SSLLIBDIR = $(SSLDIR)\out32 |
| 1407 |
+1
-1
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -158,11 +158,11 @@ | ||
| 158 | 158 | #### The directories where the OpenSSL include and library files are located. |
| 159 | 159 | # The recommended usage here is to use the Sysinternals junction tool |
| 160 | 160 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 161 | 161 | # Fossil source code directory and the target OpenSSL source directory. |
| 162 | 162 | # |
| 163 | -OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2d | |
| 163 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2e | |
| 164 | 164 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 165 | 165 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 166 | 166 | |
| 167 | 167 | #### Either the directory where the Tcl library is installed or the Tcl |
| 168 | 168 | # source code directory resides (depending on the value of the macro |
| 169 | 169 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -158,11 +158,11 @@ | |
| 158 | #### The directories where the OpenSSL include and library files are located. |
| 159 | # The recommended usage here is to use the Sysinternals junction tool |
| 160 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 161 | # Fossil source code directory and the target OpenSSL source directory. |
| 162 | # |
| 163 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2d |
| 164 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 165 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 166 | |
| 167 | #### Either the directory where the Tcl library is installed or the Tcl |
| 168 | # source code directory resides (depending on the value of the macro |
| 169 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -158,11 +158,11 @@ | |
| 158 | #### The directories where the OpenSSL include and library files are located. |
| 159 | # The recommended usage here is to use the Sysinternals junction tool |
| 160 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 161 | # Fossil source code directory and the target OpenSSL source directory. |
| 162 | # |
| 163 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2e |
| 164 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 165 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 166 | |
| 167 | #### Either the directory where the Tcl library is installed or the Tcl |
| 168 | # source code directory resides (depending on the value of the macro |
| 169 |
+1
-1
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -158,11 +158,11 @@ | ||
| 158 | 158 | #### The directories where the OpenSSL include and library files are located. |
| 159 | 159 | # The recommended usage here is to use the Sysinternals junction tool |
| 160 | 160 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 161 | 161 | # Fossil source code directory and the target OpenSSL source directory. |
| 162 | 162 | # |
| 163 | -OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2d | |
| 163 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2e | |
| 164 | 164 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 165 | 165 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 166 | 166 | |
| 167 | 167 | #### Either the directory where the Tcl library is installed or the Tcl |
| 168 | 168 | # source code directory resides (depending on the value of the macro |
| 169 | 169 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -158,11 +158,11 @@ | |
| 158 | #### The directories where the OpenSSL include and library files are located. |
| 159 | # The recommended usage here is to use the Sysinternals junction tool |
| 160 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 161 | # Fossil source code directory and the target OpenSSL source directory. |
| 162 | # |
| 163 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2d |
| 164 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 165 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 166 | |
| 167 | #### Either the directory where the Tcl library is installed or the Tcl |
| 168 | # source code directory resides (depending on the value of the macro |
| 169 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -158,11 +158,11 @@ | |
| 158 | #### The directories where the OpenSSL include and library files are located. |
| 159 | # The recommended usage here is to use the Sysinternals junction tool |
| 160 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 161 | # Fossil source code directory and the target OpenSSL source directory. |
| 162 | # |
| 163 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2e |
| 164 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 165 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 166 | |
| 167 | #### Either the directory where the Tcl library is installed or the Tcl |
| 168 | # source code directory resides (depending on the value of the macro |
| 169 |
+1
-1
| --- win/Makefile.msc | ||
| +++ win/Makefile.msc | ||
| @@ -93,11 +93,11 @@ | ||
| 93 | 93 | !ifndef FOSSIL_ENABLE_WINXP |
| 94 | 94 | FOSSIL_ENABLE_WINXP = 0 |
| 95 | 95 | !endif |
| 96 | 96 | |
| 97 | 97 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 98 | -SSLDIR = $(B)\compat\openssl-1.0.2d | |
| 98 | +SSLDIR = $(B)\compat\openssl-1.0.2e | |
| 99 | 99 | SSLINCDIR = $(SSLDIR)\inc32 |
| 100 | 100 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 101 | 101 | SSLLIBDIR = $(SSLDIR)\out32dll |
| 102 | 102 | !else |
| 103 | 103 | SSLLIBDIR = $(SSLDIR)\out32 |
| 104 | 104 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -93,11 +93,11 @@ | |
| 93 | !ifndef FOSSIL_ENABLE_WINXP |
| 94 | FOSSIL_ENABLE_WINXP = 0 |
| 95 | !endif |
| 96 | |
| 97 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 98 | SSLDIR = $(B)\compat\openssl-1.0.2d |
| 99 | SSLINCDIR = $(SSLDIR)\inc32 |
| 100 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 101 | SSLLIBDIR = $(SSLDIR)\out32dll |
| 102 | !else |
| 103 | SSLLIBDIR = $(SSLDIR)\out32 |
| 104 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -93,11 +93,11 @@ | |
| 93 | !ifndef FOSSIL_ENABLE_WINXP |
| 94 | FOSSIL_ENABLE_WINXP = 0 |
| 95 | !endif |
| 96 | |
| 97 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 98 | SSLDIR = $(B)\compat\openssl-1.0.2e |
| 99 | SSLINCDIR = $(SSLDIR)\inc32 |
| 100 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 101 | SSLLIBDIR = $(SSLDIR)\out32dll |
| 102 | !else |
| 103 | SSLLIBDIR = $(SSLDIR)\out32 |
| 104 |
+1
-1
| --- www/build.wiki | ||
| +++ www/build.wiki | ||
| @@ -135,11 +135,11 @@ | ||
| 135 | 135 | the optional <a href="https://www.openssl.org/">OpenSSL</a> support, |
| 136 | 136 | first <a href="https://www.openssl.org/source/">download the official |
| 137 | 137 | source code for OpenSSL</a> and extract it to an appropriately named |
| 138 | 138 | "<b>openssl-X.Y.ZA</b>" subdirectory within the local |
| 139 | 139 | [/tree?ci=trunk&name=compat | compat] directory (e.g. |
| 140 | -"<b>compat/openssl-1.0.2d</b>"), then make sure that some recent | |
| 140 | +"<b>compat/openssl-1.0.2e</b>"), then make sure that some recent | |
| 141 | 141 | <a href="http://www.perl.org/">Perl</a> binaries are installed locally, |
| 142 | 142 | and finally run one of the following commands: |
| 143 | 143 | <blockquote><pre> |
| 144 | 144 | nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin |
| 145 | 145 | </pre></blockquote> |
| 146 | 146 |
| --- www/build.wiki | |
| +++ www/build.wiki | |
| @@ -135,11 +135,11 @@ | |
| 135 | the optional <a href="https://www.openssl.org/">OpenSSL</a> support, |
| 136 | first <a href="https://www.openssl.org/source/">download the official |
| 137 | source code for OpenSSL</a> and extract it to an appropriately named |
| 138 | "<b>openssl-X.Y.ZA</b>" subdirectory within the local |
| 139 | [/tree?ci=trunk&name=compat | compat] directory (e.g. |
| 140 | "<b>compat/openssl-1.0.2d</b>"), then make sure that some recent |
| 141 | <a href="http://www.perl.org/">Perl</a> binaries are installed locally, |
| 142 | and finally run one of the following commands: |
| 143 | <blockquote><pre> |
| 144 | nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin |
| 145 | </pre></blockquote> |
| 146 |
| --- www/build.wiki | |
| +++ www/build.wiki | |
| @@ -135,11 +135,11 @@ | |
| 135 | the optional <a href="https://www.openssl.org/">OpenSSL</a> support, |
| 136 | first <a href="https://www.openssl.org/source/">download the official |
| 137 | source code for OpenSSL</a> and extract it to an appropriately named |
| 138 | "<b>openssl-X.Y.ZA</b>" subdirectory within the local |
| 139 | [/tree?ci=trunk&name=compat | compat] directory (e.g. |
| 140 | "<b>compat/openssl-1.0.2e</b>"), then make sure that some recent |
| 141 | <a href="http://www.perl.org/">Perl</a> binaries are installed locally, |
| 142 | and finally run one of the following commands: |
| 143 | <blockquote><pre> |
| 144 | nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin |
| 145 | </pre></blockquote> |
| 146 |