Fossil SCM
Update referenced OpenSSL version.
Commit
f60f9cddbab15b098afee07e5cb7d74496ce298c
Parent
c9a20b617480dce…
5 files changed
+3
-3
+2
-2
+2
-2
+1
-1
+1
-1
+3
-3
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -505,12 +505,12 @@ | ||
| 505 | 505 | #### The directories where the OpenSSL include and library files are located. |
| 506 | 506 | # The recommended usage here is to use the Sysinternals junction tool |
| 507 | 507 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 508 | 508 | # Fossil source code directory and the target OpenSSL source directory. |
| 509 | 509 | # |
| 510 | -OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1i/include | |
| 511 | -OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1i | |
| 510 | +OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1j/include | |
| 511 | +OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1j | |
| 512 | 512 | |
| 513 | 513 | #### Either the directory where the Tcl library is installed or the Tcl |
| 514 | 514 | # source code directory resides (depending on the value of the macro |
| 515 | 515 | # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, |
| 516 | 516 | # this directory must have "include" and "lib" sub-directories. If |
| @@ -1200,11 +1200,11 @@ | ||
| 1200 | 1200 | |
| 1201 | 1201 | # Uncomment to enable Tcl support |
| 1202 | 1202 | # FOSSIL_ENABLE_TCL = 1 |
| 1203 | 1203 | |
| 1204 | 1204 | !ifdef FOSSIL_ENABLE_SSL |
| 1205 | -SSLDIR = $(B)\compat\openssl-1.0.1i | |
| 1205 | +SSLDIR = $(B)\compat\openssl-1.0.1j | |
| 1206 | 1206 | SSLINCDIR = $(SSLDIR)\inc32 |
| 1207 | 1207 | SSLLIBDIR = $(SSLDIR)\out32 |
| 1208 | 1208 | SSLLFLAGS = /nologo /opt:ref /debug |
| 1209 | 1209 | SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib |
| 1210 | 1210 | !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64" |
| 1211 | 1211 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -505,12 +505,12 @@ | |
| 505 | #### The directories where the OpenSSL include and library files are located. |
| 506 | # The recommended usage here is to use the Sysinternals junction tool |
| 507 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 508 | # Fossil source code directory and the target OpenSSL source directory. |
| 509 | # |
| 510 | OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1i/include |
| 511 | OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1i |
| 512 | |
| 513 | #### Either the directory where the Tcl library is installed or the Tcl |
| 514 | # source code directory resides (depending on the value of the macro |
| 515 | # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, |
| 516 | # this directory must have "include" and "lib" sub-directories. If |
| @@ -1200,11 +1200,11 @@ | |
| 1200 | |
| 1201 | # Uncomment to enable Tcl support |
| 1202 | # FOSSIL_ENABLE_TCL = 1 |
| 1203 | |
| 1204 | !ifdef FOSSIL_ENABLE_SSL |
| 1205 | SSLDIR = $(B)\compat\openssl-1.0.1i |
| 1206 | SSLINCDIR = $(SSLDIR)\inc32 |
| 1207 | SSLLIBDIR = $(SSLDIR)\out32 |
| 1208 | SSLLFLAGS = /nologo /opt:ref /debug |
| 1209 | SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib |
| 1210 | !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64" |
| 1211 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -505,12 +505,12 @@ | |
| 505 | #### The directories where the OpenSSL include and library files are located. |
| 506 | # The recommended usage here is to use the Sysinternals junction tool |
| 507 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 508 | # Fossil source code directory and the target OpenSSL source directory. |
| 509 | # |
| 510 | OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1j/include |
| 511 | OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1j |
| 512 | |
| 513 | #### Either the directory where the Tcl library is installed or the Tcl |
| 514 | # source code directory resides (depending on the value of the macro |
| 515 | # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, |
| 516 | # this directory must have "include" and "lib" sub-directories. If |
| @@ -1200,11 +1200,11 @@ | |
| 1200 | |
| 1201 | # Uncomment to enable Tcl support |
| 1202 | # FOSSIL_ENABLE_TCL = 1 |
| 1203 | |
| 1204 | !ifdef FOSSIL_ENABLE_SSL |
| 1205 | SSLDIR = $(B)\compat\openssl-1.0.1j |
| 1206 | SSLINCDIR = $(SSLDIR)\inc32 |
| 1207 | SSLLIBDIR = $(SSLDIR)\out32 |
| 1208 | SSLLFLAGS = /nologo /opt:ref /debug |
| 1209 | SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib |
| 1210 | !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64" |
| 1211 |
+2
-2
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -113,12 +113,12 @@ | ||
| 113 | 113 | #### The directories where the OpenSSL include and library files are located. |
| 114 | 114 | # The recommended usage here is to use the Sysinternals junction tool |
| 115 | 115 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 116 | 116 | # Fossil source code directory and the target OpenSSL source directory. |
| 117 | 117 | # |
| 118 | -OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1i/include | |
| 119 | -OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1i | |
| 118 | +OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1j/include | |
| 119 | +OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1j | |
| 120 | 120 | |
| 121 | 121 | #### Either the directory where the Tcl library is installed or the Tcl |
| 122 | 122 | # source code directory resides (depending on the value of the macro |
| 123 | 123 | # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, |
| 124 | 124 | # this directory must have "include" and "lib" sub-directories. If |
| 125 | 125 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -113,12 +113,12 @@ | |
| 113 | #### The directories where the OpenSSL include and library files are located. |
| 114 | # The recommended usage here is to use the Sysinternals junction tool |
| 115 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 116 | # Fossil source code directory and the target OpenSSL source directory. |
| 117 | # |
| 118 | OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1i/include |
| 119 | OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1i |
| 120 | |
| 121 | #### Either the directory where the Tcl library is installed or the Tcl |
| 122 | # source code directory resides (depending on the value of the macro |
| 123 | # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, |
| 124 | # this directory must have "include" and "lib" sub-directories. If |
| 125 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -113,12 +113,12 @@ | |
| 113 | #### The directories where the OpenSSL include and library files are located. |
| 114 | # The recommended usage here is to use the Sysinternals junction tool |
| 115 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 116 | # Fossil source code directory and the target OpenSSL source directory. |
| 117 | # |
| 118 | OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1j/include |
| 119 | OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1j |
| 120 | |
| 121 | #### Either the directory where the Tcl library is installed or the Tcl |
| 122 | # source code directory resides (depending on the value of the macro |
| 123 | # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, |
| 124 | # this directory must have "include" and "lib" sub-directories. If |
| 125 |
+2
-2
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -113,12 +113,12 @@ | ||
| 113 | 113 | #### The directories where the OpenSSL include and library files are located. |
| 114 | 114 | # The recommended usage here is to use the Sysinternals junction tool |
| 115 | 115 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 116 | 116 | # Fossil source code directory and the target OpenSSL source directory. |
| 117 | 117 | # |
| 118 | -OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1i/include | |
| 119 | -OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1i | |
| 118 | +OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1j/include | |
| 119 | +OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1j | |
| 120 | 120 | |
| 121 | 121 | #### Either the directory where the Tcl library is installed or the Tcl |
| 122 | 122 | # source code directory resides (depending on the value of the macro |
| 123 | 123 | # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, |
| 124 | 124 | # this directory must have "include" and "lib" sub-directories. If |
| 125 | 125 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -113,12 +113,12 @@ | |
| 113 | #### The directories where the OpenSSL include and library files are located. |
| 114 | # The recommended usage here is to use the Sysinternals junction tool |
| 115 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 116 | # Fossil source code directory and the target OpenSSL source directory. |
| 117 | # |
| 118 | OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1i/include |
| 119 | OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1i |
| 120 | |
| 121 | #### Either the directory where the Tcl library is installed or the Tcl |
| 122 | # source code directory resides (depending on the value of the macro |
| 123 | # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, |
| 124 | # this directory must have "include" and "lib" sub-directories. If |
| 125 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -113,12 +113,12 @@ | |
| 113 | #### The directories where the OpenSSL include and library files are located. |
| 114 | # The recommended usage here is to use the Sysinternals junction tool |
| 115 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 116 | # Fossil source code directory and the target OpenSSL source directory. |
| 117 | # |
| 118 | OPENSSLINCDIR = $(SRCDIR)/../compat/openssl-1.0.1j/include |
| 119 | OPENSSLLIBDIR = $(SRCDIR)/../compat/openssl-1.0.1j |
| 120 | |
| 121 | #### Either the directory where the Tcl library is installed or the Tcl |
| 122 | # source code directory resides (depending on the value of the macro |
| 123 | # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, |
| 124 | # this directory must have "include" and "lib" sub-directories. If |
| 125 |
+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.1i | |
| 60 | +SSLDIR = $(B)\compat\openssl-1.0.1j | |
| 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.1i |
| 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.1j |
| 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.1i</b>"), then make sure that some recent | |
| 127 | +"<b>compat/openssl-1.0.1j</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.1i</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.1j</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 |