Fossil SCM
Update referenced OpenSSL version.
Commit
0626182eb38a866b0d0cb30c2770bd68e5537437
Parent
851485657643dc2…
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.2a | |
| 602 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2b | |
| 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 |
| @@ -1339,11 +1339,11 @@ | ||
| 1339 | 1339 | |
| 1340 | 1340 | # Uncomment to enable Tcl support |
| 1341 | 1341 | # FOSSIL_ENABLE_TCL = 1 |
| 1342 | 1342 | |
| 1343 | 1343 | !ifdef FOSSIL_ENABLE_SSL |
| 1344 | -SSLDIR = $(B)\compat\openssl-1.0.2a | |
| 1344 | +SSLDIR = $(B)\compat\openssl-1.0.2b | |
| 1345 | 1345 | SSLINCDIR = $(SSLDIR)\inc32 |
| 1346 | 1346 | SSLLIBDIR = $(SSLDIR)\out32 |
| 1347 | 1347 | SSLLFLAGS = /nologo /opt:ref /debug |
| 1348 | 1348 | SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib |
| 1349 | 1349 | !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64" |
| 1350 | 1350 |
| --- 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.2a |
| 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 |
| @@ -1339,11 +1339,11 @@ | |
| 1339 | |
| 1340 | # Uncomment to enable Tcl support |
| 1341 | # FOSSIL_ENABLE_TCL = 1 |
| 1342 | |
| 1343 | !ifdef FOSSIL_ENABLE_SSL |
| 1344 | SSLDIR = $(B)\compat\openssl-1.0.2a |
| 1345 | SSLINCDIR = $(SSLDIR)\inc32 |
| 1346 | SSLLIBDIR = $(SSLDIR)\out32 |
| 1347 | SSLLFLAGS = /nologo /opt:ref /debug |
| 1348 | SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib |
| 1349 | !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64" |
| 1350 |
| --- 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.2b |
| 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 |
| @@ -1339,11 +1339,11 @@ | |
| 1339 | |
| 1340 | # Uncomment to enable Tcl support |
| 1341 | # FOSSIL_ENABLE_TCL = 1 |
| 1342 | |
| 1343 | !ifdef FOSSIL_ENABLE_SSL |
| 1344 | SSLDIR = $(B)\compat\openssl-1.0.2b |
| 1345 | SSLINCDIR = $(SSLDIR)\inc32 |
| 1346 | SSLLIBDIR = $(SSLDIR)\out32 |
| 1347 | SSLLFLAGS = /nologo /opt:ref /debug |
| 1348 | SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib |
| 1349 | !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64" |
| 1350 |
+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.2a | |
| 155 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2b | |
| 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.2a |
| 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.2b |
| 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.2a | |
| 155 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2b | |
| 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.2a |
| 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.2b |
| 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 | ||
| @@ -58,11 +58,11 @@ | ||
| 58 | 58 | |
| 59 | 59 | # Uncomment to enable Tcl support |
| 60 | 60 | # FOSSIL_ENABLE_TCL = 1 |
| 61 | 61 | |
| 62 | 62 | !ifdef FOSSIL_ENABLE_SSL |
| 63 | -SSLDIR = $(B)\compat\openssl-1.0.2a | |
| 63 | +SSLDIR = $(B)\compat\openssl-1.0.2b | |
| 64 | 64 | SSLINCDIR = $(SSLDIR)\inc32 |
| 65 | 65 | SSLLIBDIR = $(SSLDIR)\out32 |
| 66 | 66 | SSLLFLAGS = /nologo /opt:ref /debug |
| 67 | 67 | SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib |
| 68 | 68 | !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64" |
| 69 | 69 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -58,11 +58,11 @@ | |
| 58 | |
| 59 | # Uncomment to enable Tcl support |
| 60 | # FOSSIL_ENABLE_TCL = 1 |
| 61 | |
| 62 | !ifdef FOSSIL_ENABLE_SSL |
| 63 | SSLDIR = $(B)\compat\openssl-1.0.2a |
| 64 | SSLINCDIR = $(SSLDIR)\inc32 |
| 65 | SSLLIBDIR = $(SSLDIR)\out32 |
| 66 | SSLLFLAGS = /nologo /opt:ref /debug |
| 67 | SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib |
| 68 | !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64" |
| 69 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -58,11 +58,11 @@ | |
| 58 | |
| 59 | # Uncomment to enable Tcl support |
| 60 | # FOSSIL_ENABLE_TCL = 1 |
| 61 | |
| 62 | !ifdef FOSSIL_ENABLE_SSL |
| 63 | SSLDIR = $(B)\compat\openssl-1.0.2b |
| 64 | SSLINCDIR = $(SSLDIR)\inc32 |
| 65 | SSLLIBDIR = $(SSLDIR)\out32 |
| 66 | SSLLFLAGS = /nologo /opt:ref /debug |
| 67 | SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib |
| 68 | !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64" |
| 69 |
+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.2a</b>"), then make sure that some recent | |
| 140 | +"<b>compat/openssl-1.0.2b</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.2a</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.2b</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 |