Fossil SCM
Update referenced OpenSSL version.
Commit
a591a2530577706a14fe28637bf4cc446b2f031f
Parent
b9447b0ec60ab60…
5 files changed
+2
-2
+1
-1
+1
-1
+1
-1
+1
-1
+2
-2
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -597,11 +597,11 @@ | ||
| 597 | 597 | #### The directories where the OpenSSL include and library files are located. |
| 598 | 598 | # The recommended usage here is to use the Sysinternals junction tool |
| 599 | 599 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 600 | 600 | # Fossil source code directory and the target OpenSSL source directory. |
| 601 | 601 | # |
| 602 | -OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2c | |
| 602 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2d | |
| 603 | 603 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 604 | 604 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 605 | 605 | |
| 606 | 606 | #### Either the directory where the Tcl library is installed or the Tcl |
| 607 | 607 | # source code directory resides (depending on the value of the macro |
| @@ -1373,11 +1373,11 @@ | ||
| 1373 | 1373 | !ifndef FOSSIL_ENABLE_WINXP |
| 1374 | 1374 | FOSSIL_ENABLE_WINXP = 0 |
| 1375 | 1375 | !endif |
| 1376 | 1376 | |
| 1377 | 1377 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 1378 | -SSLDIR = $(B)\compat\openssl-1.0.2c | |
| 1378 | +SSLDIR = $(B)\compat\openssl-1.0.2d | |
| 1379 | 1379 | SSLINCDIR = $(SSLDIR)\inc32 |
| 1380 | 1380 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1381 | 1381 | SSLLIBDIR = $(SSLDIR)\out32dll |
| 1382 | 1382 | !else |
| 1383 | 1383 | SSLLIBDIR = $(SSLDIR)\out32 |
| 1384 | 1384 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -597,11 +597,11 @@ | |
| 597 | #### The directories where the OpenSSL include and library files are located. |
| 598 | # The recommended usage here is to use the Sysinternals junction tool |
| 599 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 600 | # Fossil source code directory and the target OpenSSL source directory. |
| 601 | # |
| 602 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2c |
| 603 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 604 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 605 | |
| 606 | #### Either the directory where the Tcl library is installed or the Tcl |
| 607 | # source code directory resides (depending on the value of the macro |
| @@ -1373,11 +1373,11 @@ | |
| 1373 | !ifndef FOSSIL_ENABLE_WINXP |
| 1374 | FOSSIL_ENABLE_WINXP = 0 |
| 1375 | !endif |
| 1376 | |
| 1377 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 1378 | SSLDIR = $(B)\compat\openssl-1.0.2c |
| 1379 | SSLINCDIR = $(SSLDIR)\inc32 |
| 1380 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1381 | SSLLIBDIR = $(SSLDIR)\out32dll |
| 1382 | !else |
| 1383 | SSLLIBDIR = $(SSLDIR)\out32 |
| 1384 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -597,11 +597,11 @@ | |
| 597 | #### The directories where the OpenSSL include and library files are located. |
| 598 | # The recommended usage here is to use the Sysinternals junction tool |
| 599 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 600 | # Fossil source code directory and the target OpenSSL source directory. |
| 601 | # |
| 602 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2d |
| 603 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 604 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 605 | |
| 606 | #### Either the directory where the Tcl library is installed or the Tcl |
| 607 | # source code directory resides (depending on the value of the macro |
| @@ -1373,11 +1373,11 @@ | |
| 1373 | !ifndef FOSSIL_ENABLE_WINXP |
| 1374 | FOSSIL_ENABLE_WINXP = 0 |
| 1375 | !endif |
| 1376 | |
| 1377 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 1378 | SSLDIR = $(B)\compat\openssl-1.0.2d |
| 1379 | SSLINCDIR = $(SSLDIR)\inc32 |
| 1380 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1381 | SSLLIBDIR = $(SSLDIR)\out32dll |
| 1382 | !else |
| 1383 | SSLLIBDIR = $(SSLDIR)\out32 |
| 1384 |
+1
-1
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -150,11 +150,11 @@ | ||
| 150 | 150 | #### The directories where the OpenSSL include and library files are located. |
| 151 | 151 | # The recommended usage here is to use the Sysinternals junction tool |
| 152 | 152 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 153 | 153 | # Fossil source code directory and the target OpenSSL source directory. |
| 154 | 154 | # |
| 155 | -OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2c | |
| 155 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2d | |
| 156 | 156 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 157 | 157 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 158 | 158 | |
| 159 | 159 | #### Either the directory where the Tcl library is installed or the Tcl |
| 160 | 160 | # source code directory resides (depending on the value of the macro |
| 161 | 161 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -150,11 +150,11 @@ | |
| 150 | #### The directories where the OpenSSL include and library files are located. |
| 151 | # The recommended usage here is to use the Sysinternals junction tool |
| 152 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 153 | # Fossil source code directory and the target OpenSSL source directory. |
| 154 | # |
| 155 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2c |
| 156 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 157 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 158 | |
| 159 | #### Either the directory where the Tcl library is installed or the Tcl |
| 160 | # source code directory resides (depending on the value of the macro |
| 161 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -150,11 +150,11 @@ | |
| 150 | #### The directories where the OpenSSL include and library files are located. |
| 151 | # The recommended usage here is to use the Sysinternals junction tool |
| 152 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 153 | # Fossil source code directory and the target OpenSSL source directory. |
| 154 | # |
| 155 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2d |
| 156 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 157 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 158 | |
| 159 | #### Either the directory where the Tcl library is installed or the Tcl |
| 160 | # source code directory resides (depending on the value of the macro |
| 161 |
+1
-1
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -150,11 +150,11 @@ | ||
| 150 | 150 | #### The directories where the OpenSSL include and library files are located. |
| 151 | 151 | # The recommended usage here is to use the Sysinternals junction tool |
| 152 | 152 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 153 | 153 | # Fossil source code directory and the target OpenSSL source directory. |
| 154 | 154 | # |
| 155 | -OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2c | |
| 155 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2d | |
| 156 | 156 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 157 | 157 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 158 | 158 | |
| 159 | 159 | #### Either the directory where the Tcl library is installed or the Tcl |
| 160 | 160 | # source code directory resides (depending on the value of the macro |
| 161 | 161 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -150,11 +150,11 @@ | |
| 150 | #### The directories where the OpenSSL include and library files are located. |
| 151 | # The recommended usage here is to use the Sysinternals junction tool |
| 152 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 153 | # Fossil source code directory and the target OpenSSL source directory. |
| 154 | # |
| 155 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2c |
| 156 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 157 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 158 | |
| 159 | #### Either the directory where the Tcl library is installed or the Tcl |
| 160 | # source code directory resides (depending on the value of the macro |
| 161 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -150,11 +150,11 @@ | |
| 150 | #### The directories where the OpenSSL include and library files are located. |
| 151 | # The recommended usage here is to use the Sysinternals junction tool |
| 152 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 153 | # Fossil source code directory and the target OpenSSL source directory. |
| 154 | # |
| 155 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2d |
| 156 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 157 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 158 | |
| 159 | #### Either the directory where the Tcl library is installed or the Tcl |
| 160 | # source code directory resides (depending on the value of the macro |
| 161 |
+1
-1
| --- win/Makefile.msc | ||
| +++ win/Makefile.msc | ||
| @@ -88,11 +88,11 @@ | ||
| 88 | 88 | !ifndef FOSSIL_ENABLE_WINXP |
| 89 | 89 | FOSSIL_ENABLE_WINXP = 0 |
| 90 | 90 | !endif |
| 91 | 91 | |
| 92 | 92 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 93 | -SSLDIR = $(B)\compat\openssl-1.0.2c | |
| 93 | +SSLDIR = $(B)\compat\openssl-1.0.2d | |
| 94 | 94 | SSLINCDIR = $(SSLDIR)\inc32 |
| 95 | 95 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 96 | 96 | SSLLIBDIR = $(SSLDIR)\out32dll |
| 97 | 97 | !else |
| 98 | 98 | SSLLIBDIR = $(SSLDIR)\out32 |
| 99 | 99 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -88,11 +88,11 @@ | |
| 88 | !ifndef FOSSIL_ENABLE_WINXP |
| 89 | FOSSIL_ENABLE_WINXP = 0 |
| 90 | !endif |
| 91 | |
| 92 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 93 | SSLDIR = $(B)\compat\openssl-1.0.2c |
| 94 | SSLINCDIR = $(SSLDIR)\inc32 |
| 95 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 96 | SSLLIBDIR = $(SSLDIR)\out32dll |
| 97 | !else |
| 98 | SSLLIBDIR = $(SSLDIR)\out32 |
| 99 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -88,11 +88,11 @@ | |
| 88 | !ifndef FOSSIL_ENABLE_WINXP |
| 89 | FOSSIL_ENABLE_WINXP = 0 |
| 90 | !endif |
| 91 | |
| 92 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 93 | SSLDIR = $(B)\compat\openssl-1.0.2d |
| 94 | SSLINCDIR = $(SSLDIR)\inc32 |
| 95 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 96 | SSLLIBDIR = $(SSLDIR)\out32dll |
| 97 | !else |
| 98 | SSLLIBDIR = $(SSLDIR)\out32 |
| 99 |
+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.2c</b>"), then make sure that some recent | |
| 140 | +"<b>compat/openssl-1.0.2d</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.2c</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.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 |