Fossil SCM
Update referenced OpenSSL version.
Commit
a9e3db1f707d4998d836571302be0fe62138c3df
Parent
f4c6e49a43d07bb…
5 files changed
+2
-2
+1
-1
+1
-1
+1
-1
+1
-1
+2
-2
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -617,11 +617,11 @@ | ||
| 617 | 617 | #### The directories where the OpenSSL include and library files are located. |
| 618 | 618 | # The recommended usage here is to use the Sysinternals junction tool |
| 619 | 619 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 620 | 620 | # Fossil source code directory and the target OpenSSL source directory. |
| 621 | 621 | # |
| 622 | -OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2f | |
| 622 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2g | |
| 623 | 623 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 624 | 624 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 625 | 625 | |
| 626 | 626 | #### Either the directory where the Tcl library is installed or the Tcl |
| 627 | 627 | # source code directory resides (depending on the value of the macro |
| @@ -1406,11 +1406,11 @@ | ||
| 1406 | 1406 | !ifndef FOSSIL_ENABLE_WINXP |
| 1407 | 1407 | FOSSIL_ENABLE_WINXP = 0 |
| 1408 | 1408 | !endif |
| 1409 | 1409 | |
| 1410 | 1410 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 1411 | -SSLDIR = $(B)\compat\openssl-1.0.2f | |
| 1411 | +SSLDIR = $(B)\compat\openssl-1.0.2g | |
| 1412 | 1412 | SSLINCDIR = $(SSLDIR)\inc32 |
| 1413 | 1413 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1414 | 1414 | SSLLIBDIR = $(SSLDIR)\out32dll |
| 1415 | 1415 | !else |
| 1416 | 1416 | SSLLIBDIR = $(SSLDIR)\out32 |
| 1417 | 1417 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -617,11 +617,11 @@ | |
| 617 | #### The directories where the OpenSSL include and library files are located. |
| 618 | # The recommended usage here is to use the Sysinternals junction tool |
| 619 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 620 | # Fossil source code directory and the target OpenSSL source directory. |
| 621 | # |
| 622 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2f |
| 623 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 624 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 625 | |
| 626 | #### Either the directory where the Tcl library is installed or the Tcl |
| 627 | # source code directory resides (depending on the value of the macro |
| @@ -1406,11 +1406,11 @@ | |
| 1406 | !ifndef FOSSIL_ENABLE_WINXP |
| 1407 | FOSSIL_ENABLE_WINXP = 0 |
| 1408 | !endif |
| 1409 | |
| 1410 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 1411 | SSLDIR = $(B)\compat\openssl-1.0.2f |
| 1412 | SSLINCDIR = $(SSLDIR)\inc32 |
| 1413 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1414 | SSLLIBDIR = $(SSLDIR)\out32dll |
| 1415 | !else |
| 1416 | SSLLIBDIR = $(SSLDIR)\out32 |
| 1417 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -617,11 +617,11 @@ | |
| 617 | #### The directories where the OpenSSL include and library files are located. |
| 618 | # The recommended usage here is to use the Sysinternals junction tool |
| 619 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 620 | # Fossil source code directory and the target OpenSSL source directory. |
| 621 | # |
| 622 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2g |
| 623 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 624 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 625 | |
| 626 | #### Either the directory where the Tcl library is installed or the Tcl |
| 627 | # source code directory resides (depending on the value of the macro |
| @@ -1406,11 +1406,11 @@ | |
| 1406 | !ifndef FOSSIL_ENABLE_WINXP |
| 1407 | FOSSIL_ENABLE_WINXP = 0 |
| 1408 | !endif |
| 1409 | |
| 1410 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 1411 | SSLDIR = $(B)\compat\openssl-1.0.2g |
| 1412 | SSLINCDIR = $(SSLDIR)\inc32 |
| 1413 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1414 | SSLLIBDIR = $(SSLDIR)\out32dll |
| 1415 | !else |
| 1416 | SSLLIBDIR = $(SSLDIR)\out32 |
| 1417 |
+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.2f | |
| 163 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2g | |
| 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.2f |
| 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.2g |
| 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.2f | |
| 163 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2g | |
| 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.2f |
| 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.2g |
| 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.2f | |
| 98 | +SSLDIR = $(B)\compat\openssl-1.0.2g | |
| 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.2f |
| 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.2g |
| 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 | ||
| @@ -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.2f</b>"), then make sure that some recent | |
| 146 | +"<b>compat/openssl-1.0.2g</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.2f</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.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 |