# Fossil

Check-in [8cb5da6f]

Overview
Comment: Openssl 1.0.2j -> 1.0.2k. Whitespace. Tarball | ZIP archive | SQL archive family | ancestors | descendants | both | files | file ages | folders 8cb5da6f27ebacd754848ea3beba321664e0d028 jan.nijtmans 2017-01-27 08:57:09
Context
 2017-01-27 12:21 Make "fossil version -v" work again with SQLite 3.15.x, since no-where is documented that "fossil now requires SQLite 3.16" check-in: 042d6a7b user: jan.nijtmans tags: trunk 09:02 Merge trunk. Openssl 1.1.0c -> 1.1.0d check-in: 767ae39c user: jan.nijtmans tags: openssl-1.1 08:57 Openssl 1.0.2j -> 1.0.2k. Whitespace. check-in: 8cb5da6f user: jan.nijtmans tags: trunk 2017-01-25 01:00 The default MIME type for JSON wiki text should be 'text/x-fossil-wiki', not 'text/plain'. check-in: 58dd5383 user: mistachkin tags: trunk
Changes

Changes to src/makemake.tcl.

 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 .... 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513  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.2j 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.2j SSLINCDIR =$(SSLDIR)\inc32 !if $(FOSSIL_DYNAMIC_BUILD)!=0 SSLLIBDIR =$(SSLDIR)\out32dll !else SSLLIBDIR = $(SSLDIR)\out32 !endif SSLLFLAGS = /nologo /opt:ref /debug   | |  668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 .... 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513  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.2k 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.2k SSLINCDIR = $(SSLDIR)\inc32 !if$(FOSSIL_DYNAMIC_BUILD)!=0 SSLLIBDIR = $(SSLDIR)\out32dll !else SSLLIBDIR =$(SSLDIR)\out32 !endif SSLLFLAGS = /nologo /opt:ref /debug 

Changes to test/diff-test-1.wiki.

 1 2 3 4 5 6 7 8 9 10 11  Graph Test One This page contains list of URLs of interesting diffs. Click on all URLs, one by one, to verify the correct operation of the diff logic. * Multiple edits on a single line. This is an SQLite version update diff. It is a large diff and contains many other interesting features. Scan the whole diff. * Graph Test One This page contains list of URLs of interesting diffs. Click on all URLs, one by one, to verify the correct operation of the diff logic. * Multiple edits on a single line. This is an SQLite version update diff. It is a large diff and contains many other interesting features. Scan the whole diff. *

Changes to test/merge5.test.

 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45   regsub -all {\n *} [string trim $RESULT] "\n " result if {$result!=$expected} { protOut " Expected:\n$expected" protOut " Got:\n $result" test merge5-$testid 0 } else { test merge5-$testid 1 } } require_no_open_checkout; test_setup "" # Construct a test repository # exec$::fossilexe sqlite3 --no-repository m5.fossil <$testdir/${testfile}_repo.sql   |  31 32 33 34 35 36 37 38 39 40 41 42 43 44 45   regsub -all {\n *} [string trim $RESULT] "\n " result if {$result!=$expected} { protOut " Expected:\n$expected" protOut " Got:\n $result" test merge5-$testid 0 } else { test merge5-$testid 1 } } require_no_open_checkout; test_setup "" # Construct a test repository # exec$::fossilexe sqlite3 --no-repository m5.fossil <$testdir/${testfile}_repo.sql 

Changes to test/merge_renames.test.

 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480  fossil merge m test_status_list merge_renames-12-5 $RESULT {MERGE f1v} test_file_contents merge_renames-12-6 f1v "f1v\nm" fossil commit -m "merge m" ################################################################# # Test 13 # # Merge in add+rename that happened on a branch, then merged # # back to branch, and again to trunk, then merge in branch. # ################################################################# set repoDir [test_setup] write_file f1 "line1" fossil add f1 fossil commit -m "add f1" --tag c1   |  466 467 468 469 470 471 472 473 474 475 476 477 478 479 480  fossil merge m test_status_list merge_renames-12-5$RESULT {MERGE f1v} test_file_contents merge_renames-12-6 f1v "f1v\nm" fossil commit -m "merge m" ################################################################# # Test 13 # # Merge in add+rename that happened on a branch, then merged # # back to branch, and again to trunk, then merge in branch. # ################################################################# set repoDir [test_setup] write_file f1 "line1" fossil add f1 fossil commit -m "add f1" --tag c1 

Changes to test/revert.test.

 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27  # drh@hwaci.com # http://www.hwaci.com/drh/ # ############################################################################ # # # Tests for 'fossil revert' # # # Test 'fossil revert' against expected results from 'fossil changes' and # 'fossil addremove -n', as well as by verifying the existence of files # on the file system. 'fossil undo' is called after each test # proc revert-test {testid revertArgs expectedRevertOutput args} {   |  13 14 15 16 17 18 19 20 21 22 23 24 25 26 27  # drh@hwaci.com # http://www.hwaci.com/drh/ # ############################################################################ # # # Tests for 'fossil revert' # # # Test 'fossil revert' against expected results from 'fossil changes' and # 'fossil addremove -n', as well as by verifying the existence of files # on the file system. 'fossil undo' is called after each test # proc revert-test {testid revertArgs expectedRevertOutput args} { 

Changes to win/Makefile.mingw.

 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182  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.2j 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   |  168 169 170 171 172 173 174 175 176 177 178 179 180 181 182  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.2k 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.

 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182  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.2j 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   |  168 169 170 171 172 173 174 175 176 177 178 179 180 181 182  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.2k 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.2j 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.2k 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.

 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153  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.2j"), 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          |          139 140 141 142 143 144 145 146 147 148 149 150 151 152 153   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.2k"), 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 

Changes to www/quickstart.wiki.

 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18  

This is a guide to get you started using fossil quickly and painlessly.

Installing

Fossil is a single self-contained C program. You need to either download a precompiled binary or compile it yourself from sources. Install fossil by putting the fossil binary someplace on your $PATH. General Work Flow   |  4 5 6 7 8 9 10 11 12 13 14 15 16 17 18   This is a guide to get you started using fossil quickly and painlessly. Installing Fossil is a single self-contained C program. You need to either download a precompiled binary or compile it yourself from sources. Install fossil by putting the fossil binary someplace on your$PATH.

General Work Flow

`