Fossil SCM
Update to openssl 1.0.2r
Commit
a41666656375a1d73d50b30050b6076078cddc1b0a9da0b722e7bf58f6def8cd
Parent
e2751b18af7fdae…
5 files changed
+2
-2
+1
-1
+1
-1
+1
-1
+1
-1
+2
-2
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -711,11 +711,11 @@ | ||
| 711 | 711 | #### The directories where the OpenSSL include and library files are located. |
| 712 | 712 | # The recommended usage here is to use the Sysinternals junction tool |
| 713 | 713 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 714 | 714 | # Fossil source code directory and the target OpenSSL source directory. |
| 715 | 715 | # |
| 716 | -OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2q | |
| 716 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2r | |
| 717 | 717 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 718 | 718 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 719 | 719 | |
| 720 | 720 | #### Either the directory where the Tcl library is installed or the Tcl |
| 721 | 721 | # source code directory resides (depending on the value of the macro |
| @@ -1567,11 +1567,11 @@ | ||
| 1567 | 1567 | !ifndef USE_SEE |
| 1568 | 1568 | USE_SEE = 0 |
| 1569 | 1569 | !endif |
| 1570 | 1570 | |
| 1571 | 1571 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 1572 | -SSLDIR = $(B)\compat\openssl-1.0.2q | |
| 1572 | +SSLDIR = $(B)\compat\openssl-1.0.2r | |
| 1573 | 1573 | SSLINCDIR = $(SSLDIR)\inc32 |
| 1574 | 1574 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1575 | 1575 | SSLLIBDIR = $(SSLDIR)\out32dll |
| 1576 | 1576 | !else |
| 1577 | 1577 | SSLLIBDIR = $(SSLDIR)\out32 |
| 1578 | 1578 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -711,11 +711,11 @@ | |
| 711 | #### The directories where the OpenSSL include and library files are located. |
| 712 | # The recommended usage here is to use the Sysinternals junction tool |
| 713 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 714 | # Fossil source code directory and the target OpenSSL source directory. |
| 715 | # |
| 716 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2q |
| 717 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 718 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 719 | |
| 720 | #### Either the directory where the Tcl library is installed or the Tcl |
| 721 | # source code directory resides (depending on the value of the macro |
| @@ -1567,11 +1567,11 @@ | |
| 1567 | !ifndef USE_SEE |
| 1568 | USE_SEE = 0 |
| 1569 | !endif |
| 1570 | |
| 1571 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 1572 | SSLDIR = $(B)\compat\openssl-1.0.2q |
| 1573 | SSLINCDIR = $(SSLDIR)\inc32 |
| 1574 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1575 | SSLLIBDIR = $(SSLDIR)\out32dll |
| 1576 | !else |
| 1577 | SSLLIBDIR = $(SSLDIR)\out32 |
| 1578 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -711,11 +711,11 @@ | |
| 711 | #### The directories where the OpenSSL include and library files are located. |
| 712 | # The recommended usage here is to use the Sysinternals junction tool |
| 713 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 714 | # Fossil source code directory and the target OpenSSL source directory. |
| 715 | # |
| 716 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2r |
| 717 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 718 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 719 | |
| 720 | #### Either the directory where the Tcl library is installed or the Tcl |
| 721 | # source code directory resides (depending on the value of the macro |
| @@ -1567,11 +1567,11 @@ | |
| 1567 | !ifndef USE_SEE |
| 1568 | USE_SEE = 0 |
| 1569 | !endif |
| 1570 | |
| 1571 | !if $(FOSSIL_ENABLE_SSL)!=0 |
| 1572 | SSLDIR = $(B)\compat\openssl-1.0.2r |
| 1573 | SSLINCDIR = $(SSLDIR)\inc32 |
| 1574 | !if $(FOSSIL_DYNAMIC_BUILD)!=0 |
| 1575 | SSLLIBDIR = $(SSLDIR)\out32dll |
| 1576 | !else |
| 1577 | SSLLIBDIR = $(SSLDIR)\out32 |
| 1578 |
+1
-1
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -174,11 +174,11 @@ | ||
| 174 | 174 | #### The directories where the OpenSSL include and library files are located. |
| 175 | 175 | # The recommended usage here is to use the Sysinternals junction tool |
| 176 | 176 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 177 | 177 | # Fossil source code directory and the target OpenSSL source directory. |
| 178 | 178 | # |
| 179 | -OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2q | |
| 179 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2r | |
| 180 | 180 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 181 | 181 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 182 | 182 | |
| 183 | 183 | #### Either the directory where the Tcl library is installed or the Tcl |
| 184 | 184 | # source code directory resides (depending on the value of the macro |
| 185 | 185 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -174,11 +174,11 @@ | |
| 174 | #### The directories where the OpenSSL include and library files are located. |
| 175 | # The recommended usage here is to use the Sysinternals junction tool |
| 176 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 177 | # Fossil source code directory and the target OpenSSL source directory. |
| 178 | # |
| 179 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2q |
| 180 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 181 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 182 | |
| 183 | #### Either the directory where the Tcl library is installed or the Tcl |
| 184 | # source code directory resides (depending on the value of the macro |
| 185 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -174,11 +174,11 @@ | |
| 174 | #### The directories where the OpenSSL include and library files are located. |
| 175 | # The recommended usage here is to use the Sysinternals junction tool |
| 176 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 177 | # Fossil source code directory and the target OpenSSL source directory. |
| 178 | # |
| 179 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2r |
| 180 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 181 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 182 | |
| 183 | #### Either the directory where the Tcl library is installed or the Tcl |
| 184 | # source code directory resides (depending on the value of the macro |
| 185 |
+1
-1
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -174,11 +174,11 @@ | ||
| 174 | 174 | #### The directories where the OpenSSL include and library files are located. |
| 175 | 175 | # The recommended usage here is to use the Sysinternals junction tool |
| 176 | 176 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 177 | 177 | # Fossil source code directory and the target OpenSSL source directory. |
| 178 | 178 | # |
| 179 | -OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2q | |
| 179 | +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2r | |
| 180 | 180 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 181 | 181 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 182 | 182 | |
| 183 | 183 | #### Either the directory where the Tcl library is installed or the Tcl |
| 184 | 184 | # source code directory resides (depending on the value of the macro |
| 185 | 185 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -174,11 +174,11 @@ | |
| 174 | #### The directories where the OpenSSL include and library files are located. |
| 175 | # The recommended usage here is to use the Sysinternals junction tool |
| 176 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 177 | # Fossil source code directory and the target OpenSSL source directory. |
| 178 | # |
| 179 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2q |
| 180 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 181 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 182 | |
| 183 | #### Either the directory where the Tcl library is installed or the Tcl |
| 184 | # source code directory resides (depending on the value of the macro |
| 185 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -174,11 +174,11 @@ | |
| 174 | #### The directories where the OpenSSL include and library files are located. |
| 175 | # The recommended usage here is to use the Sysinternals junction tool |
| 176 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 177 | # Fossil source code directory and the target OpenSSL source directory. |
| 178 | # |
| 179 | OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2r |
| 180 | OPENSSLINCDIR = $(OPENSSLDIR)/include |
| 181 | OPENSSLLIBDIR = $(OPENSSLDIR) |
| 182 | |
| 183 | #### Either the directory where the Tcl library is installed or the Tcl |
| 184 | # source code directory resides (depending on the value of the macro |
| 185 |
+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.2q | |
| 103 | +SSLDIR = $(B)\compat\openssl-1.0.2r | |
| 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.2q |
| 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.2r |
| 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 | ||
| @@ -157,11 +157,11 @@ | ||
| 157 | 157 | the optional <a href="https://www.openssl.org/">OpenSSL</a> support, |
| 158 | 158 | first <a href="https://www.openssl.org/source/">download the official |
| 159 | 159 | source code for OpenSSL</a> and extract it to an appropriately named |
| 160 | 160 | "<b>openssl-X.Y.ZA</b>" subdirectory within the local |
| 161 | 161 | [/tree?ci=trunk&name=compat | compat] directory (e.g. |
| 162 | -"<b>compat/openssl-1.0.2q</b>"), then make sure that some recent | |
| 162 | +"<b>compat/openssl-1.0.2r</b>"), then make sure that some recent | |
| 163 | 163 | <a href="http://www.perl.org/">Perl</a> binaries are installed locally, |
| 164 | 164 | and finally run one of the following commands: |
| 165 | 165 | <blockquote><pre> |
| 166 | 166 | nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin |
| 167 | 167 | </pre></blockquote> |
| 168 | 168 |
| --- www/build.wiki | |
| +++ www/build.wiki | |
| @@ -157,11 +157,11 @@ | |
| 157 | the optional <a href="https://www.openssl.org/">OpenSSL</a> support, |
| 158 | first <a href="https://www.openssl.org/source/">download the official |
| 159 | source code for OpenSSL</a> and extract it to an appropriately named |
| 160 | "<b>openssl-X.Y.ZA</b>" subdirectory within the local |
| 161 | [/tree?ci=trunk&name=compat | compat] directory (e.g. |
| 162 | "<b>compat/openssl-1.0.2q</b>"), then make sure that some recent |
| 163 | <a href="http://www.perl.org/">Perl</a> binaries are installed locally, |
| 164 | and finally run one of the following commands: |
| 165 | <blockquote><pre> |
| 166 | nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin |
| 167 | </pre></blockquote> |
| 168 |
| --- www/build.wiki | |
| +++ www/build.wiki | |
| @@ -157,11 +157,11 @@ | |
| 157 | the optional <a href="https://www.openssl.org/">OpenSSL</a> support, |
| 158 | first <a href="https://www.openssl.org/source/">download the official |
| 159 | source code for OpenSSL</a> and extract it to an appropriately named |
| 160 | "<b>openssl-X.Y.ZA</b>" subdirectory within the local |
| 161 | [/tree?ci=trunk&name=compat | compat] directory (e.g. |
| 162 | "<b>compat/openssl-1.0.2r</b>"), then make sure that some recent |
| 163 | <a href="http://www.perl.org/">Perl</a> binaries are installed locally, |
| 164 | and finally run one of the following commands: |
| 165 | <blockquote><pre> |
| 166 | nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin |
| 167 | </pre></blockquote> |
| 168 |