Fossil

Check-in [77a7078f]

Overview
Comment: Update openssl version number to 1.1.1e. Update custom makefile. Tarball | ZIP archive | SQL archive family | ancestors | descendants | both | files | file ages | folders 77a7078f74bc74a49fc132381907e05518041f0716f8bba34da53f837d3d106a jan.nijtmans 2020-03-24 20:24:06
Context
 2020-03-25 17:48 Add the email address editing to the subscriber information screen (/alerts). Improved cross-linking between subscriber and user editing screens for administrators. (check-in: 54a6f098 user: drh tags: trunk) 2020-03-24 20:24 Update openssl version number to 1.1.1e. Update custom makefile. (check-in: 77a7078f user: jan.nijtmans tags: trunk) 15:04 Add the "nsm" or "No-SubMenu" query parameter to the /wiki page. (check-in: 993700ab user: drh tags: trunk)
Changes

Changes to src/makemake.tcl.

 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 .... 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582  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.1.1d 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.1.1d SSLINCDIR =$(SSLDIR)\include !if $(FOSSIL_DYNAMIC_BUILD)!=0 SSLLIBDIR =$(SSLDIR) !else SSLLIBDIR = $(SSLDIR) !endif SSLLFLAGS = /nologo /opt:ref /debug   | |  711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 .... 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582  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.1.1e 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.1.1e SSLINCDIR = $(SSLDIR)\include !if$(FOSSIL_DYNAMIC_BUILD)!=0 SSLLIBDIR = $(SSLDIR) !else SSLLIBDIR =$(SSLDIR) !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.1.1d 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.1.1e 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 ... 644 645 646 647 648 649 650 651 652 653 654 655 656 657  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.1.1d 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 ................................................................................$(SRCDIR)/login.js \ $(SRCDIR)/markdown.md \$(SRCDIR)/menu.js \ $(SRCDIR)/sbsdiff.js \$(SRCDIR)/scroll.js \ $(SRCDIR)/skin.js \$(SRCDIR)/sorttable.js \ $(SRCDIR)/tree.js \$(SRCDIR)/useredit.js \ $(SRCDIR)/wiki.wiki TRANS_SRC = \$(OBJDIR)/add_.c \ $(OBJDIR)/alerts_.c \   | > > > > > > > > > > > > > > > >  172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 ... 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673  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.1.1e 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 ................................................................................ $(SRCDIR)/login.js \$(SRCDIR)/markdown.md \ $(SRCDIR)/menu.js \$(SRCDIR)/sbsdiff.js \ $(SRCDIR)/scroll.js \$(SRCDIR)/skin.js \ $(SRCDIR)/sorttable.js \$(SRCDIR)/sounds/0.wav \ $(SRCDIR)/sounds/1.wav \$(SRCDIR)/sounds/2.wav \ $(SRCDIR)/sounds/3.wav \$(SRCDIR)/sounds/4.wav \ $(SRCDIR)/sounds/5.wav \$(SRCDIR)/sounds/6.wav \ $(SRCDIR)/sounds/7.wav \$(SRCDIR)/sounds/8.wav \ $(SRCDIR)/sounds/9.wav \$(SRCDIR)/sounds/a.wav \ $(SRCDIR)/sounds/b.wav \$(SRCDIR)/sounds/c.wav \ $(SRCDIR)/sounds/d.wav \$(SRCDIR)/sounds/e.wav \ $(SRCDIR)/sounds/f.wav \$(SRCDIR)/tree.js \ $(SRCDIR)/useredit.js \$(SRCDIR)/wiki.wiki TRANS_SRC = \ $(OBJDIR)/add_.c \$(OBJDIR)/alerts_.c \ 

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.1.1d SSLINCDIR = $(SSLDIR)\include !if$(FOSSIL_DYNAMIC_BUILD)!=0 SSLLIBDIR = $(SSLDIR) !else SSLLIBDIR =$(SSLDIR) !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.1.1e SSLINCDIR = $(SSLDIR)\include !if$(FOSSIL_DYNAMIC_BUILD)!=0 SSLLIBDIR = $(SSLDIR) !else SSLLIBDIR =$(SSLDIR) !endif SSLLFLAGS = /nologo /opt:ref /debug 

Changes to www/build.wiki.

 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173  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.1.1d"), 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          |          159 160 161 162 163 164 165 166 167 168 169 170 171 172 173   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.1.1e"), 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