Fossil

Check-in [531a517b]

Overview
Comment: Update openssl version Tarball | ZIP archive | SQL archive family | ancestors | descendants | both | trunk files | file ages | folders 531a517b8eb17bd2fdb15fa5f668e3b64f07f0367a9b3962400a4c208b92ddfc jan.nijtmans 2018-03-28 08:01:00
Context
 2018-03-28 18:38 Update the built-in SQLite to the first 3.23.0 beta. check-in: d470fc70 user: drh tags: trunk 08:06 Merge trunk check-in: d9573d87 user: jan.nijtmans tags: openssl-1.1 08:01 Update openssl version check-in: 531a517b user: jan.nijtmans tags: trunk 2018-03-26 13:21 Fix a pledge() problem with the status command. check-in: e765f90e user: drh tags: trunk
Changes

Changes to src/makemake.tcl.

 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 .... 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565  endif #### The directories where the OpenSSL include and library files are located. # The recommended usage here is to use the Sysinternals junction tool # to create a hard link between an "openssl-1.x" sub-directory of the # Fossil source code directory and the target OpenSSL source directory. # OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2n OPENSSLINCDIR =$(OPENSSLDIR)/include OPENSSLLIBDIR = $(OPENSSLDIR) #### Either the directory where the Tcl library is installed or the Tcl # source code directory resides (depending on the value of the macro # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, # this directory must have "include" and "lib" sub-directories. If ................................................................................ # Enable support for the SQLite Encryption Extension? !ifndef USE_SEE USE_SEE = 0 !endif !if$(FOSSIL_ENABLE_SSL)!=0 SSLDIR = $(B)\compat\openssl-1.0.2n SSLINCDIR =$(SSLDIR)\inc32 !if $(FOSSIL_DYNAMIC_BUILD)!=0 SSLLIBDIR =$(SSLDIR)\out32dll !else SSLLIBDIR = $(SSLDIR)\out32 !endif SSLLFLAGS = /nologo /opt:ref /debug   | |  699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 .... 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565  endif #### The directories where the OpenSSL include and library files are located. # The recommended usage here is to use the Sysinternals junction tool # to create a hard link between an "openssl-1.x" sub-directory of the # Fossil source code directory and the target OpenSSL source directory. # OPENSSLDIR =$(SRCDIR)/../compat/openssl-1.0.2o OPENSSLINCDIR = $(OPENSSLDIR)/include OPENSSLLIBDIR =$(OPENSSLDIR) #### Either the directory where the Tcl library is installed or the Tcl # source code directory resides (depending on the value of the macro # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, # this directory must have "include" and "lib" sub-directories. If ................................................................................ # Enable support for the SQLite Encryption Extension? !ifndef USE_SEE USE_SEE = 0 !endif !if $(FOSSIL_ENABLE_SSL)!=0 SSLDIR =$(B)\compat\openssl-1.0.2o SSLINCDIR = $(SSLDIR)\inc32 !if$(FOSSIL_DYNAMIC_BUILD)!=0 SSLLIBDIR = $(SSLDIR)\out32dll !else SSLLIBDIR =$(SSLDIR)\out32 !endif SSLLFLAGS = /nologo /opt:ref /debug 

Changes to win/Makefile.mingw.

 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186  endif #### The directories where the OpenSSL include and library files are located. # The recommended usage here is to use the Sysinternals junction tool # to create a hard link between an "openssl-1.x" sub-directory of the # Fossil source code directory and the target OpenSSL source directory. # OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2n OPENSSLINCDIR =$(OPENSSLDIR)/include OPENSSLLIBDIR = $(OPENSSLDIR) #### Either the directory where the Tcl library is installed or the Tcl # source code directory resides (depending on the value of the macro # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, # this directory must have "include" and "lib" sub-directories. If   |  172 173 174 175 176 177 178 179 180 181 182 183 184 185 186  endif #### The directories where the OpenSSL include and library files are located. # The recommended usage here is to use the Sysinternals junction tool # to create a hard link between an "openssl-1.x" sub-directory of the # Fossil source code directory and the target OpenSSL source directory. # OPENSSLDIR =$(SRCDIR)/../compat/openssl-1.0.2o OPENSSLINCDIR = $(OPENSSLDIR)/include OPENSSLLIBDIR =$(OPENSSLDIR) #### Either the directory where the Tcl library is installed or the Tcl # source code directory resides (depending on the value of the macro # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, # this directory must have "include" and "lib" sub-directories. If 

Changes to win/Makefile.mingw.mistachkin.

 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186  endif #### The directories where the OpenSSL include and library files are located. # The recommended usage here is to use the Sysinternals junction tool # to create a hard link between an "openssl-1.x" sub-directory of the # Fossil source code directory and the target OpenSSL source directory. # OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2n OPENSSLINCDIR =$(OPENSSLDIR)/include OPENSSLLIBDIR = $(OPENSSLDIR) #### Either the directory where the Tcl library is installed or the Tcl # source code directory resides (depending on the value of the macro # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, # this directory must have "include" and "lib" sub-directories. If   |  172 173 174 175 176 177 178 179 180 181 182 183 184 185 186  endif #### The directories where the OpenSSL include and library files are located. # The recommended usage here is to use the Sysinternals junction tool # to create a hard link between an "openssl-1.x" sub-directory of the # Fossil source code directory and the target OpenSSL source directory. # OPENSSLDIR =$(SRCDIR)/../compat/openssl-1.0.2o OPENSSLINCDIR = $(OPENSSLDIR)/include OPENSSLLIBDIR =$(OPENSSLDIR) #### Either the directory where the Tcl library is installed or the Tcl # source code directory resides (depending on the value of the macro # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, # this directory must have "include" and "lib" sub-directories. If 

Changes to win/Makefile.msc.

 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110   # Enable support for the SQLite Encryption Extension? !ifndef USE_SEE USE_SEE = 0 !endif !if $(FOSSIL_ENABLE_SSL)!=0 SSLDIR =$(B)\compat\openssl-1.0.2n SSLINCDIR = $(SSLDIR)\inc32 !if$(FOSSIL_DYNAMIC_BUILD)!=0 SSLLIBDIR = $(SSLDIR)\out32dll !else SSLLIBDIR =$(SSLDIR)\out32 !endif SSLLFLAGS = /nologo /opt:ref /debug   |  96 97 98 99 100 101 102 103 104 105 106 107 108 109 110   # Enable support for the SQLite Encryption Extension? !ifndef USE_SEE USE_SEE = 0 !endif !if $(FOSSIL_ENABLE_SSL)!=0 SSLDIR =$(B)\compat\openssl-1.0.2o SSLINCDIR = $(SSLDIR)\inc32 !if$(FOSSIL_DYNAMIC_BUILD)!=0 SSLLIBDIR = $(SSLDIR)\out32dll !else SSLLIBDIR =$(SSLDIR)\out32 !endif SSLLFLAGS = /nologo /opt:ref /debug 

Changes to www/build.wiki.

 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148  file "win\buildmsvc.bat" may be used and it will attempt to detect and use the latest installed version of MSVC.

To enable the optional OpenSSL support, first download the official source code for OpenSSL and extract it to an appropriately named "openssl-X.Y.ZA" subdirectory within the local [/tree?ci=trunk&name=compat | compat] directory (e.g. "compat/openssl-1.0.2n"), then make sure that some recent Perl binaries are installed locally, and finally run one of the following commands:
nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
buildmsvc.bat FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin          |          134 135 136 137 138 139 140 141 142 143 144 145 146 147 148   file "win\buildmsvc.bat" may be used and it will attempt to detect and use the latest installed version of MSVC.

To enable the optional OpenSSL support, first download the official source code for OpenSSL and extract it to an appropriately named "openssl-X.Y.ZA" subdirectory within the local [/tree?ci=trunk&name=compat | compat] directory (e.g. "compat/openssl-1.0.2o"), then make sure that some recent Perl binaries are installed locally, and finally run one of the following commands:
nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
buildmsvc.bat FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin