Fossil SCM
Update openssl version
Commit
531a517b8eb17bd2fdb15fa5f668e3b64f07f0367a9b3962400a4c208b92ddfc
Parent
e765f90ee7551d0…
5 files changed
+2
-2
+1
-1
+1
-1
+1
-1
+1
-1
+2
-2
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -701,11 +701,11 @@ | ||
| 701 | 701 | #### The directories where the OpenSSL include and library files are located. |
| 702 | 702 | # The recommended usage here is to use the Sysinternals junction tool |
| 703 | 703 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 704 | 704 | # Fossil source code directory and the target OpenSSL source directory. |
| 705 | 705 | # |
| 706 | -OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2n | |
| 706 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2o | |
| 707 | 707 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 708 | 708 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 709 | 709 | |
| 710 | 710 | #### Either the directory where the Tcl library is installed or the Tcl |
| 711 | 711 | # source code directory resides (depending on the value of the macro |
| @@ -1553,11 +1553,11 @@ | ||
| 1553 | 1553 | !ifndef USE_SEE |
| 1554 | 1554 | USE_SEE = 0 |
| 1555 | 1555 | !endif |
| 1556 | 1556 | |
| 1557 | 1557 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 1558 | -SSLDIR = $(B)\compat\openssl-1.0.2n | |
| 1558 | +SSLDIR = $(B)\compat\openssl-1.0.2o | |
| 1559 | 1559 | SSLINCDIR = $(SSLDIR)\inc32 |
| 1560 | 1560 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1561 | 1561 | SSLLIBDIR = $(SSLDIR)\out32dll |
| 1562 | 1562 | !else |
| 1563 | 1563 | SSLLIBDIR = $(SSLDIR)\out32 |
| 1564 | 1564 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -701,11 +701,11 @@ | |
| 701 | #### The directories where the OpenSSL include and library files are located. |
| 702 | # The recommended usage here is to use the Sysinternals junction tool |
| 703 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 704 | # Fossil source code directory and the target OpenSSL source directory. |
| 705 | # |
| 706 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2n |
| 707 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 708 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 709 | |
| 710 | #### Either the directory where the Tcl library is installed or the Tcl |
| 711 | # source code directory resides (depending on the value of the macro |
| @@ -1553,11 +1553,11 @@ | |
| 1553 | !ifndef USE_SEE |
| 1554 | USE_SEE = 0 |
| 1555 | !endif |
| 1556 | |
| 1557 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 1558 | SSLDIR = $(B)\compat\openssl-1.0.2n |
| 1559 | SSLINCDIR = $(SSLDIR)\inc32 |
| 1560 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1561 | SSLLIBDIR = $(SSLDIR)\out32dll |
| 1562 | !else |
| 1563 | SSLLIBDIR = $(SSLDIR)\out32 |
| 1564 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -701,11 +701,11 @@ | |
| 701 | #### The directories where the OpenSSL include and library files are located. |
| 702 | # The recommended usage here is to use the Sysinternals junction tool |
| 703 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 704 | # Fossil source code directory and the target OpenSSL source directory. |
| 705 | # |
| 706 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2o |
| 707 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 708 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 709 | |
| 710 | #### Either the directory where the Tcl library is installed or the Tcl |
| 711 | # source code directory resides (depending on the value of the macro |
| @@ -1553,11 +1553,11 @@ | |
| 1553 | !ifndef USE_SEE |
| 1554 | USE_SEE = 0 |
| 1555 | !endif |
| 1556 | |
| 1557 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 1558 | SSLDIR = $(B)\compat\openssl-1.0.2o |
| 1559 | SSLINCDIR = $(SSLDIR)\inc32 |
| 1560 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1561 | SSLLIBDIR = $(SSLDIR)\out32dll |
| 1562 | !else |
| 1563 | SSLLIBDIR = $(SSLDIR)\out32 |
| 1564 |
+1
-1
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -174,11 +174,11 @@ | ||
| 174 | 174 | #### The directories where the OpenSSL include and library files are located. |
| 175 | 175 | # The recommended usage here is to use the Sysinternals junction tool |
| 176 | 176 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 177 | 177 | # Fossil source code directory and the target OpenSSL source directory. |
| 178 | 178 | # |
| 179 | -OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2n | |
| 179 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2o | |
| 180 | 180 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 181 | 181 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 182 | 182 | |
| 183 | 183 | #### Either the directory where the Tcl library is installed or the Tcl |
| 184 | 184 | # source code directory resides (depending on the value of the macro |
| 185 | 185 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -174,11 +174,11 @@ | |
| 174 | #### The directories where the OpenSSL include and library files are located. |
| 175 | # The recommended usage here is to use the Sysinternals junction tool |
| 176 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 177 | # Fossil source code directory and the target OpenSSL source directory. |
| 178 | # |
| 179 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2n |
| 180 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 181 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 182 | |
| 183 | #### Either the directory where the Tcl library is installed or the Tcl |
| 184 | # source code directory resides (depending on the value of the macro |
| 185 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -174,11 +174,11 @@ | |
| 174 | #### The directories where the OpenSSL include and library files are located. |
| 175 | # The recommended usage here is to use the Sysinternals junction tool |
| 176 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 177 | # Fossil source code directory and the target OpenSSL source directory. |
| 178 | # |
| 179 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2o |
| 180 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 181 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 182 | |
| 183 | #### Either the directory where the Tcl library is installed or the Tcl |
| 184 | # source code directory resides (depending on the value of the macro |
| 185 |
+1
-1
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -174,11 +174,11 @@ | ||
| 174 | 174 | #### The directories where the OpenSSL include and library files are located. |
| 175 | 175 | # The recommended usage here is to use the Sysinternals junction tool |
| 176 | 176 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 177 | 177 | # Fossil source code directory and the target OpenSSL source directory. |
| 178 | 178 | # |
| 179 | -OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2n | |
| 179 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2o | |
| 180 | 180 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 181 | 181 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 182 | 182 | |
| 183 | 183 | #### Either the directory where the Tcl library is installed or the Tcl |
| 184 | 184 | # source code directory resides (depending on the value of the macro |
| 185 | 185 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -174,11 +174,11 @@ | |
| 174 | #### The directories where the OpenSSL include and library files are located. |
| 175 | # The recommended usage here is to use the Sysinternals junction tool |
| 176 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 177 | # Fossil source code directory and the target OpenSSL source directory. |
| 178 | # |
| 179 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2n |
| 180 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 181 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 182 | |
| 183 | #### Either the directory where the Tcl library is installed or the Tcl |
| 184 | # source code directory resides (depending on the value of the macro |
| 185 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -174,11 +174,11 @@ | |
| 174 | #### The directories where the OpenSSL include and library files are located. |
| 175 | # The recommended usage here is to use the Sysinternals junction tool |
| 176 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 177 | # Fossil source code directory and the target OpenSSL source directory. |
| 178 | # |
| 179 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2o |
| 180 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 181 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 182 | |
| 183 | #### Either the directory where the Tcl library is installed or the Tcl |
| 184 | # source code directory resides (depending on the value of the macro |
| 185 |
+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.2n | |
| 103 | +SSLDIR = $(B)\compat\openssl-1.0.2o | |
| 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.2n |
| 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.2o |
| 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.2n</b>"), then make sure that some recent | |
| 141 | +"<b>compat/openssl-1.0.2o</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.2n</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.2o</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 |