Fossil SCM
Update referenced OpenSSL version.
Commit
539925123083102a460e28dcd840909373413ec5
Parent
a13ef5e6a6bf0d5…
5 files changed
+2
-2
+1
-1
+1
-1
+1
-1
+1
-1
+2
-2
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -646,11 +646,11 @@ | ||
| 646 | 646 | #### The directories where the OpenSSL include and library files are located. |
| 647 | 647 | # The recommended usage here is to use the Sysinternals junction tool |
| 648 | 648 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 649 | 649 | # Fossil source code directory and the target OpenSSL source directory. |
| 650 | 650 | # |
| 651 | -OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2g | |
| 651 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2h | |
| 652 | 652 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 653 | 653 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 654 | 654 | |
| 655 | 655 | #### Either the directory where the Tcl library is installed or the Tcl |
| 656 | 656 | # source code directory resides (depending on the value of the macro |
| @@ -1460,11 +1460,11 @@ | ||
| 1460 | 1460 | !ifndef USE_SEE |
| 1461 | 1461 | USE_SEE = 0 |
| 1462 | 1462 | !endif |
| 1463 | 1463 | |
| 1464 | 1464 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 1465 | -SSLDIR = $(B)\compat\openssl-1.0.2g | |
| 1465 | +SSLDIR = $(B)\compat\openssl-1.0.2h | |
| 1466 | 1466 | SSLINCDIR = $(SSLDIR)\inc32 |
| 1467 | 1467 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1468 | 1468 | SSLLIBDIR = $(SSLDIR)\out32dll |
| 1469 | 1469 | !else |
| 1470 | 1470 | SSLLIBDIR = $(SSLDIR)\out32 |
| 1471 | 1471 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -646,11 +646,11 @@ | |
| 646 | #### The directories where the OpenSSL include and library files are located. |
| 647 | # The recommended usage here is to use the Sysinternals junction tool |
| 648 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 649 | # Fossil source code directory and the target OpenSSL source directory. |
| 650 | # |
| 651 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2g |
| 652 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 653 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 654 | |
| 655 | #### Either the directory where the Tcl library is installed or the Tcl |
| 656 | # source code directory resides (depending on the value of the macro |
| @@ -1460,11 +1460,11 @@ | |
| 1460 | !ifndef USE_SEE |
| 1461 | USE_SEE = 0 |
| 1462 | !endif |
| 1463 | |
| 1464 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 1465 | SSLDIR = $(B)\compat\openssl-1.0.2g |
| 1466 | SSLINCDIR = $(SSLDIR)\inc32 |
| 1467 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1468 | SSLLIBDIR = $(SSLDIR)\out32dll |
| 1469 | !else |
| 1470 | SSLLIBDIR = $(SSLDIR)\out32 |
| 1471 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -646,11 +646,11 @@ | |
| 646 | #### The directories where the OpenSSL include and library files are located. |
| 647 | # The recommended usage here is to use the Sysinternals junction tool |
| 648 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 649 | # Fossil source code directory and the target OpenSSL source directory. |
| 650 | # |
| 651 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2h |
| 652 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 653 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 654 | |
| 655 | #### Either the directory where the Tcl library is installed or the Tcl |
| 656 | # source code directory resides (depending on the value of the macro |
| @@ -1460,11 +1460,11 @@ | |
| 1460 | !ifndef USE_SEE |
| 1461 | USE_SEE = 0 |
| 1462 | !endif |
| 1463 | |
| 1464 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 1465 | SSLDIR = $(B)\compat\openssl-1.0.2h |
| 1466 | SSLINCDIR = $(SSLDIR)\inc32 |
| 1467 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1468 | SSLLIBDIR = $(SSLDIR)\out32dll |
| 1469 | !else |
| 1470 | SSLLIBDIR = $(SSLDIR)\out32 |
| 1471 |
+1
-1
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -162,11 +162,11 @@ | ||
| 162 | 162 | #### The directories where the OpenSSL include and library files are located. |
| 163 | 163 | # The recommended usage here is to use the Sysinternals junction tool |
| 164 | 164 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 165 | 165 | # Fossil source code directory and the target OpenSSL source directory. |
| 166 | 166 | # |
| 167 | -OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2g | |
| 167 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2h | |
| 168 | 168 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 169 | 169 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 170 | 170 | |
| 171 | 171 | #### Either the directory where the Tcl library is installed or the Tcl |
| 172 | 172 | # source code directory resides (depending on the value of the macro |
| 173 | 173 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -162,11 +162,11 @@ | |
| 162 | #### The directories where the OpenSSL include and library files are located. |
| 163 | # The recommended usage here is to use the Sysinternals junction tool |
| 164 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 165 | # Fossil source code directory and the target OpenSSL source directory. |
| 166 | # |
| 167 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2g |
| 168 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 169 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 170 | |
| 171 | #### Either the directory where the Tcl library is installed or the Tcl |
| 172 | # source code directory resides (depending on the value of the macro |
| 173 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -162,11 +162,11 @@ | |
| 162 | #### The directories where the OpenSSL include and library files are located. |
| 163 | # The recommended usage here is to use the Sysinternals junction tool |
| 164 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 165 | # Fossil source code directory and the target OpenSSL source directory. |
| 166 | # |
| 167 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2h |
| 168 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 169 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 170 | |
| 171 | #### Either the directory where the Tcl library is installed or the Tcl |
| 172 | # source code directory resides (depending on the value of the macro |
| 173 |
+1
-1
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -162,11 +162,11 @@ | ||
| 162 | 162 | #### The directories where the OpenSSL include and library files are located. |
| 163 | 163 | # The recommended usage here is to use the Sysinternals junction tool |
| 164 | 164 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 165 | 165 | # Fossil source code directory and the target OpenSSL source directory. |
| 166 | 166 | # |
| 167 | -OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2g | |
| 167 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2h | |
| 168 | 168 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 169 | 169 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 170 | 170 | |
| 171 | 171 | #### Either the directory where the Tcl library is installed or the Tcl |
| 172 | 172 | # source code directory resides (depending on the value of the macro |
| 173 | 173 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -162,11 +162,11 @@ | |
| 162 | #### The directories where the OpenSSL include and library files are located. |
| 163 | # The recommended usage here is to use the Sysinternals junction tool |
| 164 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 165 | # Fossil source code directory and the target OpenSSL source directory. |
| 166 | # |
| 167 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2g |
| 168 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 169 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 170 | |
| 171 | #### Either the directory where the Tcl library is installed or the Tcl |
| 172 | # source code directory resides (depending on the value of the macro |
| 173 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -162,11 +162,11 @@ | |
| 162 | #### The directories where the OpenSSL include and library files are located. |
| 163 | # The recommended usage here is to use the Sysinternals junction tool |
| 164 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 165 | # Fossil source code directory and the target OpenSSL source directory. |
| 166 | # |
| 167 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2h |
| 168 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 169 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 170 | |
| 171 | #### Either the directory where the Tcl library is installed or the Tcl |
| 172 | # source code directory resides (depending on the value of the macro |
| 173 |
+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.2g | |
| 103 | +SSLDIR = $(B)\compat\openssl-1.0.2h | |
| 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.2g |
| 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.2h |
| 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 | ||
| @@ -141,11 +141,11 @@ | ||
| 141 | 141 | the optional <a href="https://www.openssl.org/">OpenSSL</a> support, |
| 142 | 142 | first <a href="https://www.openssl.org/source/">download the official |
| 143 | 143 | source code for OpenSSL</a> and extract it to an appropriately named |
| 144 | 144 | "<b>openssl-X.Y.ZA</b>" subdirectory within the local |
| 145 | 145 | [/tree?ci=trunk&name=compat | compat] directory (e.g. |
| 146 | -"<b>compat/openssl-1.0.2g</b>"), then make sure that some recent | |
| 146 | +"<b>compat/openssl-1.0.2h</b>"), then make sure that some recent | |
| 147 | 147 | <a href="http://www.perl.org/">Perl</a> binaries are installed locally, |
| 148 | 148 | and finally run one of the following commands: |
| 149 | 149 | <blockquote><pre> |
| 150 | 150 | nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin |
| 151 | 151 | </pre></blockquote> |
| 152 | 152 |
| --- www/build.wiki | |
| +++ www/build.wiki | |
| @@ -141,11 +141,11 @@ | |
| 141 | the optional <a href="https://www.openssl.org/">OpenSSL</a> support, |
| 142 | first <a href="https://www.openssl.org/source/">download the official |
| 143 | source code for OpenSSL</a> and extract it to an appropriately named |
| 144 | "<b>openssl-X.Y.ZA</b>" subdirectory within the local |
| 145 | [/tree?ci=trunk&name=compat | compat] directory (e.g. |
| 146 | "<b>compat/openssl-1.0.2g</b>"), then make sure that some recent |
| 147 | <a href="http://www.perl.org/">Perl</a> binaries are installed locally, |
| 148 | and finally run one of the following commands: |
| 149 | <blockquote><pre> |
| 150 | nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin |
| 151 | </pre></blockquote> |
| 152 |
| --- www/build.wiki | |
| +++ www/build.wiki | |
| @@ -141,11 +141,11 @@ | |
| 141 | the optional <a href="https://www.openssl.org/">OpenSSL</a> support, |
| 142 | first <a href="https://www.openssl.org/source/">download the official |
| 143 | source code for OpenSSL</a> and extract it to an appropriately named |
| 144 | "<b>openssl-X.Y.ZA</b>" subdirectory within the local |
| 145 | [/tree?ci=trunk&name=compat | compat] directory (e.g. |
| 146 | "<b>compat/openssl-1.0.2h</b>"), then make sure that some recent |
| 147 | <a href="http://www.perl.org/">Perl</a> binaries are installed locally, |
| 148 | and finally run one of the following commands: |
| 149 | <blockquote><pre> |
| 150 | nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin |
| 151 | </pre></blockquote> |
| 152 |