Fossil SCM
Update referenced OpenSSL version.
Commit
16b7a0ebc3b2e83f185849acb8effa4f5fad8e4c
Parent
d8c917eebad1e94…
5 files changed
+1
-1
+1
-1
+1
-1
+1
-1
+1
-1
+1
-1
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -663,11 +663,11 @@ | ||
| 663 | 663 | #### The directories where the OpenSSL include and library files are located. |
| 664 | 664 | # The recommended usage here is to use the Sysinternals junction tool |
| 665 | 665 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 666 | 666 | # Fossil source code directory and the target OpenSSL source directory. |
| 667 | 667 | # |
| 668 | -OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2h | |
| 668 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2i | |
| 669 | 669 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 670 | 670 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 671 | 671 | |
| 672 | 672 | #### Either the directory where the Tcl library is installed or the Tcl |
| 673 | 673 | # source code directory resides (depending on the value of the macro |
| 674 | 674 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -663,11 +663,11 @@ | |
| 663 | #### The directories where the OpenSSL include and library files are located. |
| 664 | # The recommended usage here is to use the Sysinternals junction tool |
| 665 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 666 | # Fossil source code directory and the target OpenSSL source directory. |
| 667 | # |
| 668 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2h |
| 669 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 670 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 671 | |
| 672 | #### Either the directory where the Tcl library is installed or the Tcl |
| 673 | # source code directory resides (depending on the value of the macro |
| 674 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -663,11 +663,11 @@ | |
| 663 | #### The directories where the OpenSSL include and library files are located. |
| 664 | # The recommended usage here is to use the Sysinternals junction tool |
| 665 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 666 | # Fossil source code directory and the target OpenSSL source directory. |
| 667 | # |
| 668 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2i |
| 669 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 670 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 671 | |
| 672 | #### Either the directory where the Tcl library is installed or the Tcl |
| 673 | # source code directory resides (depending on the value of the macro |
| 674 |
+1
-1
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -170,11 +170,11 @@ | ||
| 170 | 170 | #### The directories where the OpenSSL include and library files are located. |
| 171 | 171 | # The recommended usage here is to use the Sysinternals junction tool |
| 172 | 172 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 173 | 173 | # Fossil source code directory and the target OpenSSL source directory. |
| 174 | 174 | # |
| 175 | -OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2h | |
| 175 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2i | |
| 176 | 176 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 177 | 177 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 178 | 178 | |
| 179 | 179 | #### Either the directory where the Tcl library is installed or the Tcl |
| 180 | 180 | # source code directory resides (depending on the value of the macro |
| 181 | 181 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -170,11 +170,11 @@ | |
| 170 | #### The directories where the OpenSSL include and library files are located. |
| 171 | # The recommended usage here is to use the Sysinternals junction tool |
| 172 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 173 | # Fossil source code directory and the target OpenSSL source directory. |
| 174 | # |
| 175 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2h |
| 176 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 177 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 178 | |
| 179 | #### Either the directory where the Tcl library is installed or the Tcl |
| 180 | # source code directory resides (depending on the value of the macro |
| 181 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -170,11 +170,11 @@ | |
| 170 | #### The directories where the OpenSSL include and library files are located. |
| 171 | # The recommended usage here is to use the Sysinternals junction tool |
| 172 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 173 | # Fossil source code directory and the target OpenSSL source directory. |
| 174 | # |
| 175 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2i |
| 176 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 177 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 178 | |
| 179 | #### Either the directory where the Tcl library is installed or the Tcl |
| 180 | # source code directory resides (depending on the value of the macro |
| 181 |
+1
-1
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -170,11 +170,11 @@ | ||
| 170 | 170 | #### The directories where the OpenSSL include and library files are located. |
| 171 | 171 | # The recommended usage here is to use the Sysinternals junction tool |
| 172 | 172 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 173 | 173 | # Fossil source code directory and the target OpenSSL source directory. |
| 174 | 174 | # |
| 175 | -OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2h | |
| 175 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2i | |
| 176 | 176 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 177 | 177 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 178 | 178 | |
| 179 | 179 | #### Either the directory where the Tcl library is installed or the Tcl |
| 180 | 180 | # source code directory resides (depending on the value of the macro |
| 181 | 181 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -170,11 +170,11 @@ | |
| 170 | #### The directories where the OpenSSL include and library files are located. |
| 171 | # The recommended usage here is to use the Sysinternals junction tool |
| 172 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 173 | # Fossil source code directory and the target OpenSSL source directory. |
| 174 | # |
| 175 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2h |
| 176 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 177 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 178 | |
| 179 | #### Either the directory where the Tcl library is installed or the Tcl |
| 180 | # source code directory resides (depending on the value of the macro |
| 181 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -170,11 +170,11 @@ | |
| 170 | #### The directories where the OpenSSL include and library files are located. |
| 171 | # The recommended usage here is to use the Sysinternals junction tool |
| 172 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 173 | # Fossil source code directory and the target OpenSSL source directory. |
| 174 | # |
| 175 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2i |
| 176 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 177 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 178 | |
| 179 | #### Either the directory where the Tcl library is installed or the Tcl |
| 180 | # source code directory resides (depending on the value of the macro |
| 181 |
+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.2h | |
| 103 | +SSLDIR = $(B)\compat\openssl-1.0.2i | |
| 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.2h |
| 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.2i |
| 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.2h</b>"), then make sure that some recent | |
| 146 | +"<b>compat/openssl-1.0.2i</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.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 |
| --- 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.2i</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 |