Fossil SCM
Update OpenSSL to version 1.1.1f
Commit
72026ed39dbe7f17ba9f17d1bb80a9038efb8e55fad777d0297555508b5bbc0b
Parent
23d17bd24830052…
5 files changed
+2
-2
+1
-1
+1
-1
+1
-1
+1
-1
+2
-2
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -713,11 +713,11 @@ | ||
| 713 | 713 | #### The directories where the OpenSSL include and library files are located. |
| 714 | 714 | # The recommended usage here is to use the Sysinternals junction tool |
| 715 | 715 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 716 | 716 | # Fossil source code directory and the target OpenSSL source directory. |
| 717 | 717 | # |
| 718 | -OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1e | |
| 718 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1f | |
| 719 | 719 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 720 | 720 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 721 | 721 | |
| 722 | 722 | #### Either the directory where the Tcl library is installed or the Tcl |
| 723 | 723 | # source code directory resides (depending on the value of the macro |
| @@ -1570,11 +1570,11 @@ | ||
| 1570 | 1570 | !ifndef USE_SEE |
| 1571 | 1571 | USE_SEE = 0 |
| 1572 | 1572 | !endif |
| 1573 | 1573 | |
| 1574 | 1574 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 1575 | -SSLDIR = $(B)\compat\openssl-1.1.1e | |
| 1575 | +SSLDIR = $(B)\compat\openssl-1.1.1f | |
| 1576 | 1576 | SSLINCDIR = $(SSLDIR)\include |
| 1577 | 1577 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1578 | 1578 | SSLLIBDIR = $(SSLDIR) |
| 1579 | 1579 | !else |
| 1580 | 1580 | SSLLIBDIR = $(SSLDIR) |
| 1581 | 1581 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -713,11 +713,11 @@ | |
| 713 | #### The directories where the OpenSSL include and library files are located. |
| 714 | # The recommended usage here is to use the Sysinternals junction tool |
| 715 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 716 | # Fossil source code directory and the target OpenSSL source directory. |
| 717 | # |
| 718 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1e |
| 719 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 720 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 721 | |
| 722 | #### Either the directory where the Tcl library is installed or the Tcl |
| 723 | # source code directory resides (depending on the value of the macro |
| @@ -1570,11 +1570,11 @@ | |
| 1570 | !ifndef USE_SEE |
| 1571 | USE_SEE = 0 |
| 1572 | !endif |
| 1573 | |
| 1574 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 1575 | SSLDIR = $(B)\compat\openssl-1.1.1e |
| 1576 | SSLINCDIR = $(SSLDIR)\include |
| 1577 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1578 | SSLLIBDIR = $(SSLDIR) |
| 1579 | !else |
| 1580 | SSLLIBDIR = $(SSLDIR) |
| 1581 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -713,11 +713,11 @@ | |
| 713 | #### The directories where the OpenSSL include and library files are located. |
| 714 | # The recommended usage here is to use the Sysinternals junction tool |
| 715 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 716 | # Fossil source code directory and the target OpenSSL source directory. |
| 717 | # |
| 718 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1f |
| 719 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 720 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 721 | |
| 722 | #### Either the directory where the Tcl library is installed or the Tcl |
| 723 | # source code directory resides (depending on the value of the macro |
| @@ -1570,11 +1570,11 @@ | |
| 1570 | !ifndef USE_SEE |
| 1571 | USE_SEE = 0 |
| 1572 | !endif |
| 1573 | |
| 1574 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 1575 | SSLDIR = $(B)\compat\openssl-1.1.1f |
| 1576 | SSLINCDIR = $(SSLDIR)\include |
| 1577 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1578 | SSLLIBDIR = $(SSLDIR) |
| 1579 | !else |
| 1580 | SSLLIBDIR = $(SSLDIR) |
| 1581 |
+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.1.1e | |
| 179 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1f | |
| 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.1.1e |
| 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.1.1f |
| 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.1.1e | |
| 179 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1f | |
| 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.1.1e |
| 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.1.1f |
| 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.1.1e | |
| 103 | +SSLDIR = $(B)\compat\openssl-1.1.1f | |
| 104 | 104 | SSLINCDIR = $(SSLDIR)\include |
| 105 | 105 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 106 | 106 | SSLLIBDIR = $(SSLDIR) |
| 107 | 107 | !else |
| 108 | 108 | SSLLIBDIR = $(SSLDIR) |
| 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.1.1e |
| 104 | SSLINCDIR = $(SSLDIR)\include |
| 105 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 106 | SSLLIBDIR = $(SSLDIR) |
| 107 | !else |
| 108 | SSLLIBDIR = $(SSLDIR) |
| 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.1.1f |
| 104 | SSLINCDIR = $(SSLDIR)\include |
| 105 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 106 | SSLLIBDIR = $(SSLDIR) |
| 107 | !else |
| 108 | SSLLIBDIR = $(SSLDIR) |
| 109 |
+1
-1
| --- www/build.wiki | ||
| +++ www/build.wiki | ||
| @@ -161,11 +161,11 @@ | ||
| 161 | 161 | the optional <a href="https://www.openssl.org/">OpenSSL</a> support, |
| 162 | 162 | first <a href="https://www.openssl.org/source/">download the official |
| 163 | 163 | source code for OpenSSL</a> and extract it to an appropriately named |
| 164 | 164 | "<b>openssl-X.Y.ZA</b>" subdirectory within the local |
| 165 | 165 | [/tree?ci=trunk&name=compat | compat] directory (e.g. |
| 166 | -"<b>compat/openssl-1.1.1e</b>"), then make sure that some recent | |
| 166 | +"<b>compat/openssl-1.1.1f</b>"), then make sure that some recent | |
| 167 | 167 | <a href="http://www.perl.org/">Perl</a> binaries are installed locally, |
| 168 | 168 | and finally run one of the following commands: |
| 169 | 169 | <blockquote><pre> |
| 170 | 170 | nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin |
| 171 | 171 | </pre></blockquote> |
| 172 | 172 |
| --- www/build.wiki | |
| +++ www/build.wiki | |
| @@ -161,11 +161,11 @@ | |
| 161 | the optional <a href="https://www.openssl.org/">OpenSSL</a> support, |
| 162 | first <a href="https://www.openssl.org/source/">download the official |
| 163 | source code for OpenSSL</a> and extract it to an appropriately named |
| 164 | "<b>openssl-X.Y.ZA</b>" subdirectory within the local |
| 165 | [/tree?ci=trunk&name=compat | compat] directory (e.g. |
| 166 | "<b>compat/openssl-1.1.1e</b>"), then make sure that some recent |
| 167 | <a href="http://www.perl.org/">Perl</a> binaries are installed locally, |
| 168 | and finally run one of the following commands: |
| 169 | <blockquote><pre> |
| 170 | nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin |
| 171 | </pre></blockquote> |
| 172 |
| --- www/build.wiki | |
| +++ www/build.wiki | |
| @@ -161,11 +161,11 @@ | |
| 161 | the optional <a href="https://www.openssl.org/">OpenSSL</a> support, |
| 162 | first <a href="https://www.openssl.org/source/">download the official |
| 163 | source code for OpenSSL</a> and extract it to an appropriately named |
| 164 | "<b>openssl-X.Y.ZA</b>" subdirectory within the local |
| 165 | [/tree?ci=trunk&name=compat | compat] directory (e.g. |
| 166 | "<b>compat/openssl-1.1.1f</b>"), then make sure that some recent |
| 167 | <a href="http://www.perl.org/">Perl</a> binaries are installed locally, |
| 168 | and finally run one of the following commands: |
| 169 | <blockquote><pre> |
| 170 | nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin |
| 171 | </pre></blockquote> |
| 172 |