Fossil SCM
Update referenced openSSL version (1.0.2)
Commit
16a4f60b24fc7eba10604c40de520b9d0827de88
Parent
5330d107b25626e…
5 files changed
+2
-2
+1
-1
+1
-1
+1
-1
+1
-1
+2
-2
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -585,11 +585,11 @@ | ||
| 585 | 585 | #### The directories where the OpenSSL include and library files are located. |
| 586 | 586 | # The recommended usage here is to use the Sysinternals junction tool |
| 587 | 587 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 588 | 588 | # Fossil source code directory and the target OpenSSL source directory. |
| 589 | 589 | # |
| 590 | -OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.1l | |
| 590 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2 | |
| 591 | 591 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 592 | 592 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 593 | 593 | |
| 594 | 594 | #### Either the directory where the Tcl library is installed or the Tcl |
| 595 | 595 | # source code directory resides (depending on the value of the macro |
| @@ -1318,11 +1318,11 @@ | ||
| 1318 | 1318 | |
| 1319 | 1319 | # Uncomment to enable Tcl support |
| 1320 | 1320 | # FOSSIL_ENABLE_TCL = 1 |
| 1321 | 1321 | |
| 1322 | 1322 | !ifdef FOSSIL_ENABLE_SSL |
| 1323 | -SSLDIR = $(B)\compat\openssl-1.0.1l | |
| 1323 | +SSLDIR = $(B)\compat\openssl-1.0.2 | |
| 1324 | 1324 | SSLINCDIR = $(SSLDIR)\inc32 |
| 1325 | 1325 | SSLLIBDIR = $(SSLDIR)\out32 |
| 1326 | 1326 | SSLLFLAGS = /nologo /opt:ref /debug |
| 1327 | 1327 | SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib |
| 1328 | 1328 | !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64" |
| 1329 | 1329 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -585,11 +585,11 @@ | |
| 585 | #### The directories where the OpenSSL include and library files are located. |
| 586 | # The recommended usage here is to use the Sysinternals junction tool |
| 587 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 588 | # Fossil source code directory and the target OpenSSL source directory. |
| 589 | # |
| 590 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.1l |
| 591 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 592 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 593 | |
| 594 | #### Either the directory where the Tcl library is installed or the Tcl |
| 595 | # source code directory resides (depending on the value of the macro |
| @@ -1318,11 +1318,11 @@ | |
| 1318 | |
| 1319 | # Uncomment to enable Tcl support |
| 1320 | # FOSSIL_ENABLE_TCL = 1 |
| 1321 | |
| 1322 | !ifdef FOSSIL_ENABLE_SSL |
| 1323 | SSLDIR = $(B)\compat\openssl-1.0.1l |
| 1324 | SSLINCDIR = $(SSLDIR)\inc32 |
| 1325 | SSLLIBDIR = $(SSLDIR)\out32 |
| 1326 | SSLLFLAGS = /nologo /opt:ref /debug |
| 1327 | SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib |
| 1328 | !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64" |
| 1329 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -585,11 +585,11 @@ | |
| 585 | #### The directories where the OpenSSL include and library files are located. |
| 586 | # The recommended usage here is to use the Sysinternals junction tool |
| 587 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 588 | # Fossil source code directory and the target OpenSSL source directory. |
| 589 | # |
| 590 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2 |
| 591 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 592 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 593 | |
| 594 | #### Either the directory where the Tcl library is installed or the Tcl |
| 595 | # source code directory resides (depending on the value of the macro |
| @@ -1318,11 +1318,11 @@ | |
| 1318 | |
| 1319 | # Uncomment to enable Tcl support |
| 1320 | # FOSSIL_ENABLE_TCL = 1 |
| 1321 | |
| 1322 | !ifdef FOSSIL_ENABLE_SSL |
| 1323 | SSLDIR = $(B)\compat\openssl-1.0.2 |
| 1324 | SSLINCDIR = $(SSLDIR)\inc32 |
| 1325 | SSLLIBDIR = $(SSLDIR)\out32 |
| 1326 | SSLLFLAGS = /nologo /opt:ref /debug |
| 1327 | SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib |
| 1328 | !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64" |
| 1329 |
+1
-1
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -146,11 +146,11 @@ | ||
| 146 | 146 | #### The directories where the OpenSSL include and library files are located. |
| 147 | 147 | # The recommended usage here is to use the Sysinternals junction tool |
| 148 | 148 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 149 | 149 | # Fossil source code directory and the target OpenSSL source directory. |
| 150 | 150 | # |
| 151 | -OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.1l | |
| 151 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2 | |
| 152 | 152 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 153 | 153 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 154 | 154 | |
| 155 | 155 | #### Either the directory where the Tcl library is installed or the Tcl |
| 156 | 156 | # source code directory resides (depending on the value of the macro |
| 157 | 157 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -146,11 +146,11 @@ | |
| 146 | #### The directories where the OpenSSL include and library files are located. |
| 147 | # The recommended usage here is to use the Sysinternals junction tool |
| 148 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 149 | # Fossil source code directory and the target OpenSSL source directory. |
| 150 | # |
| 151 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.1l |
| 152 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 153 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 154 | |
| 155 | #### Either the directory where the Tcl library is installed or the Tcl |
| 156 | # source code directory resides (depending on the value of the macro |
| 157 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -146,11 +146,11 @@ | |
| 146 | #### The directories where the OpenSSL include and library files are located. |
| 147 | # The recommended usage here is to use the Sysinternals junction tool |
| 148 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 149 | # Fossil source code directory and the target OpenSSL source directory. |
| 150 | # |
| 151 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2 |
| 152 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 153 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 154 | |
| 155 | #### Either the directory where the Tcl library is installed or the Tcl |
| 156 | # source code directory resides (depending on the value of the macro |
| 157 |
+1
-1
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -146,11 +146,11 @@ | ||
| 146 | 146 | #### The directories where the OpenSSL include and library files are located. |
| 147 | 147 | # The recommended usage here is to use the Sysinternals junction tool |
| 148 | 148 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 149 | 149 | # Fossil source code directory and the target OpenSSL source directory. |
| 150 | 150 | # |
| 151 | -OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.1l | |
| 151 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2 | |
| 152 | 152 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 153 | 153 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 154 | 154 | |
| 155 | 155 | #### Either the directory where the Tcl library is installed or the Tcl |
| 156 | 156 | # source code directory resides (depending on the value of the macro |
| 157 | 157 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -146,11 +146,11 @@ | |
| 146 | #### The directories where the OpenSSL include and library files are located. |
| 147 | # The recommended usage here is to use the Sysinternals junction tool |
| 148 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 149 | # Fossil source code directory and the target OpenSSL source directory. |
| 150 | # |
| 151 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.1l |
| 152 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 153 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 154 | |
| 155 | #### Either the directory where the Tcl library is installed or the Tcl |
| 156 | # source code directory resides (depending on the value of the macro |
| 157 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -146,11 +146,11 @@ | |
| 146 | #### The directories where the OpenSSL include and library files are located. |
| 147 | # The recommended usage here is to use the Sysinternals junction tool |
| 148 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 149 | # Fossil source code directory and the target OpenSSL source directory. |
| 150 | # |
| 151 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2 |
| 152 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 153 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 154 | |
| 155 | #### Either the directory where the Tcl library is installed or the Tcl |
| 156 | # source code directory resides (depending on the value of the macro |
| 157 |
+1
-1
| --- win/Makefile.msc | ||
| +++ win/Makefile.msc | ||
| @@ -55,11 +55,11 @@ | ||
| 55 | 55 | |
| 56 | 56 | # Uncomment to enable Tcl support |
| 57 | 57 | # FOSSIL_ENABLE_TCL = 1 |
| 58 | 58 | |
| 59 | 59 | !ifdef FOSSIL_ENABLE_SSL |
| 60 | -SSLDIR = $(B)\compat\openssl-1.0.1l | |
| 60 | +SSLDIR = $(B)\compat\openssl-1.0.2 | |
| 61 | 61 | SSLINCDIR = $(SSLDIR)\inc32 |
| 62 | 62 | SSLLIBDIR = $(SSLDIR)\out32 |
| 63 | 63 | SSLLFLAGS = /nologo /opt:ref /debug |
| 64 | 64 | SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib |
| 65 | 65 | !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64" |
| 66 | 66 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -55,11 +55,11 @@ | |
| 55 | |
| 56 | # Uncomment to enable Tcl support |
| 57 | # FOSSIL_ENABLE_TCL = 1 |
| 58 | |
| 59 | !ifdef FOSSIL_ENABLE_SSL |
| 60 | SSLDIR = $(B)\compat\openssl-1.0.1l |
| 61 | SSLINCDIR = $(SSLDIR)\inc32 |
| 62 | SSLLIBDIR = $(SSLDIR)\out32 |
| 63 | SSLLFLAGS = /nologo /opt:ref /debug |
| 64 | SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib |
| 65 | !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64" |
| 66 |
| --- win/Makefile.msc | |
| +++ win/Makefile.msc | |
| @@ -55,11 +55,11 @@ | |
| 55 | |
| 56 | # Uncomment to enable Tcl support |
| 57 | # FOSSIL_ENABLE_TCL = 1 |
| 58 | |
| 59 | !ifdef FOSSIL_ENABLE_SSL |
| 60 | SSLDIR = $(B)\compat\openssl-1.0.2 |
| 61 | SSLINCDIR = $(SSLDIR)\inc32 |
| 62 | SSLLIBDIR = $(SSLDIR)\out32 |
| 63 | SSLLFLAGS = /nologo /opt:ref /debug |
| 64 | SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib |
| 65 | !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64" |
| 66 |
+1
-1
| --- www/build.wiki | ||
| +++ www/build.wiki | ||
| @@ -122,11 +122,11 @@ | ||
| 122 | 122 | the optional <a href="https://www.openssl.org/">OpenSSL</a> support, |
| 123 | 123 | first <a href="https://www.openssl.org/source/">download the official |
| 124 | 124 | source code for OpenSSL</a> and extract it to an appropriately named |
| 125 | 125 | "<b>openssl-X.Y.ZA</b>" subdirectory within the local |
| 126 | 126 | [/tree?ci=trunk&name=compat | compat] directory (e.g. |
| 127 | -"<b>compat/openssl-1.0.1l</b>"), then make sure that some recent | |
| 127 | +"<b>compat/openssl-1.0.2</b>"), then make sure that some recent | |
| 128 | 128 | <a href="http://www.perl.org/">Perl</a> binaries are installed locally, |
| 129 | 129 | and finally run one of the following commands: |
| 130 | 130 | <blockquote><pre> |
| 131 | 131 | nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin |
| 132 | 132 | </pre></blockquote> |
| 133 | 133 |
| --- www/build.wiki | |
| +++ www/build.wiki | |
| @@ -122,11 +122,11 @@ | |
| 122 | the optional <a href="https://www.openssl.org/">OpenSSL</a> support, |
| 123 | first <a href="https://www.openssl.org/source/">download the official |
| 124 | source code for OpenSSL</a> and extract it to an appropriately named |
| 125 | "<b>openssl-X.Y.ZA</b>" subdirectory within the local |
| 126 | [/tree?ci=trunk&name=compat | compat] directory (e.g. |
| 127 | "<b>compat/openssl-1.0.1l</b>"), then make sure that some recent |
| 128 | <a href="http://www.perl.org/">Perl</a> binaries are installed locally, |
| 129 | and finally run one of the following commands: |
| 130 | <blockquote><pre> |
| 131 | nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin |
| 132 | </pre></blockquote> |
| 133 |
| --- www/build.wiki | |
| +++ www/build.wiki | |
| @@ -122,11 +122,11 @@ | |
| 122 | the optional <a href="https://www.openssl.org/">OpenSSL</a> support, |
| 123 | first <a href="https://www.openssl.org/source/">download the official |
| 124 | source code for OpenSSL</a> and extract it to an appropriately named |
| 125 | "<b>openssl-X.Y.ZA</b>" subdirectory within the local |
| 126 | [/tree?ci=trunk&name=compat | compat] directory (e.g. |
| 127 | "<b>compat/openssl-1.0.2</b>"), then make sure that some recent |
| 128 | <a href="http://www.perl.org/">Perl</a> binaries are installed locally, |
| 129 | and finally run one of the following commands: |
| 130 | <blockquote><pre> |
| 131 | nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin |
| 132 | </pre></blockquote> |
| 133 |