Fossil SCM

Openssl 1.0.2j -> 1.0.2k. Whitespace.

jan.nijtmans 2017-01-27 08:57 trunk
Commit 8cb5da6f27ebacd754848ea3beba321664e0d028
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -670,11 +670,11 @@
670670
#### The directories where the OpenSSL include and library files are located.
671671
# The recommended usage here is to use the Sysinternals junction tool
672672
# to create a hard link between an "openssl-1.x" sub-directory of the
673673
# Fossil source code directory and the target OpenSSL source directory.
674674
#
675
-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2j
675
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2k
676676
OPENSSLINCDIR = $(OPENSSLDIR)/include
677677
OPENSSLLIBDIR = $(OPENSSLDIR)
678678
679679
#### Either the directory where the Tcl library is installed or the Tcl
680680
# source code directory resides (depending on the value of the macro
@@ -1501,11 +1501,11 @@
15011501
!ifndef USE_SEE
15021502
USE_SEE = 0
15031503
!endif
15041504
15051505
!if $(FOSSIL_ENABLE_SSL)!=0
1506
-SSLDIR = $(B)\compat\openssl-1.0.2j
1506
+SSLDIR = $(B)\compat\openssl-1.0.2k
15071507
SSLINCDIR = $(SSLDIR)\inc32
15081508
!if $(FOSSIL_DYNAMIC_BUILD)!=0
15091509
SSLLIBDIR = $(SSLDIR)\out32dll
15101510
!else
15111511
SSLLIBDIR = $(SSLDIR)\out32
15121512
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -670,11 +670,11 @@
670 #### The directories where the OpenSSL include and library files are located.
671 # The recommended usage here is to use the Sysinternals junction tool
672 # to create a hard link between an "openssl-1.x" sub-directory of the
673 # Fossil source code directory and the target OpenSSL source directory.
674 #
675 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2j
676 OPENSSLINCDIR = $(OPENSSLDIR)/include
677 OPENSSLLIBDIR = $(OPENSSLDIR)
678
679 #### Either the directory where the Tcl library is installed or the Tcl
680 # source code directory resides (depending on the value of the macro
@@ -1501,11 +1501,11 @@
1501 !ifndef USE_SEE
1502 USE_SEE = 0
1503 !endif
1504
1505 !if $(FOSSIL_ENABLE_SSL)!=0
1506 SSLDIR = $(B)\compat\openssl-1.0.2j
1507 SSLINCDIR = $(SSLDIR)\inc32
1508 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1509 SSLLIBDIR = $(SSLDIR)\out32dll
1510 !else
1511 SSLLIBDIR = $(SSLDIR)\out32
1512
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -670,11 +670,11 @@
670 #### The directories where the OpenSSL include and library files are located.
671 # The recommended usage here is to use the Sysinternals junction tool
672 # to create a hard link between an "openssl-1.x" sub-directory of the
673 # Fossil source code directory and the target OpenSSL source directory.
674 #
675 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2k
676 OPENSSLINCDIR = $(OPENSSLDIR)/include
677 OPENSSLLIBDIR = $(OPENSSLDIR)
678
679 #### Either the directory where the Tcl library is installed or the Tcl
680 # source code directory resides (depending on the value of the macro
@@ -1501,11 +1501,11 @@
1501 !ifndef USE_SEE
1502 USE_SEE = 0
1503 !endif
1504
1505 !if $(FOSSIL_ENABLE_SSL)!=0
1506 SSLDIR = $(B)\compat\openssl-1.0.2k
1507 SSLINCDIR = $(SSLDIR)\inc32
1508 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1509 SSLLIBDIR = $(SSLDIR)\out32dll
1510 !else
1511 SSLLIBDIR = $(SSLDIR)\out32
1512
--- test/diff-test-1.wiki
+++ test/diff-test-1.wiki
@@ -1,9 +1,9 @@
11
<title>Graph Test One</title>
22
33
This page contains list of URLs of interesting diffs.
4
-Click on all URLs, one by one, to verify
4
+Click on all URLs, one by one, to verify
55
the correct operation of the diff logic.
66
77
* <a href="../../../info/030035345c#chunk73" target="testwindow">
88
Multiple edits on a single line.</a> This is an SQLite version
99
update diff. It is a large diff and contains many other interesting
1010
--- test/diff-test-1.wiki
+++ test/diff-test-1.wiki
@@ -1,9 +1,9 @@
1 <title>Graph Test One</title>
2
3 This page contains list of URLs of interesting diffs.
4 Click on all URLs, one by one, to verify
5 the correct operation of the diff logic.
6
7 * <a href="../../../info/030035345c#chunk73" target="testwindow">
8 Multiple edits on a single line.</a> This is an SQLite version
9 update diff. It is a large diff and contains many other interesting
10
--- test/diff-test-1.wiki
+++ test/diff-test-1.wiki
@@ -1,9 +1,9 @@
1 <title>Graph Test One</title>
2
3 This page contains list of URLs of interesting diffs.
4 Click on all URLs, one by one, to verify
5 the correct operation of the diff logic.
6
7 * <a href="../../../info/030035345c#chunk73" target="testwindow">
8 Multiple edits on a single line.</a> This is an SQLite version
9 update diff. It is a large diff and contains many other interesting
10
--- test/merge5.test
+++ test/merge5.test
@@ -33,11 +33,11 @@
3333
protOut " Expected:\n $expected"
3434
protOut " Got:\n $result"
3535
test merge5-$testid 0
3636
} else {
3737
test merge5-$testid 1
38
- }
38
+ }
3939
}
4040
4141
require_no_open_checkout; test_setup ""
4242
4343
# Construct a test repository
4444
--- test/merge5.test
+++ test/merge5.test
@@ -33,11 +33,11 @@
33 protOut " Expected:\n $expected"
34 protOut " Got:\n $result"
35 test merge5-$testid 0
36 } else {
37 test merge5-$testid 1
38 }
39 }
40
41 require_no_open_checkout; test_setup ""
42
43 # Construct a test repository
44
--- test/merge5.test
+++ test/merge5.test
@@ -33,11 +33,11 @@
33 protOut " Expected:\n $expected"
34 protOut " Got:\n $result"
35 test merge5-$testid 0
36 } else {
37 test merge5-$testid 1
38 }
39 }
40
41 require_no_open_checkout; test_setup ""
42
43 # Construct a test repository
44
--- test/merge_renames.test
+++ test/merge_renames.test
@@ -468,11 +468,11 @@
468468
test_file_contents merge_renames-12-6 f1v "f1v\nm"
469469
fossil commit -m "merge m"
470470
471471
#################################################################
472472
# Test 13 #
473
-# Merge in add+rename that happened on a branch, then merged #
473
+# Merge in add+rename that happened on a branch, then merged #
474474
# back to branch, and again to trunk, then merge in branch. #
475475
#################################################################
476476
477477
set repoDir [test_setup]
478478
write_file f1 "line1"
479479
--- test/merge_renames.test
+++ test/merge_renames.test
@@ -468,11 +468,11 @@
468 test_file_contents merge_renames-12-6 f1v "f1v\nm"
469 fossil commit -m "merge m"
470
471 #################################################################
472 # Test 13 #
473 # Merge in add+rename that happened on a branch, then merged #
474 # back to branch, and again to trunk, then merge in branch. #
475 #################################################################
476
477 set repoDir [test_setup]
478 write_file f1 "line1"
479
--- test/merge_renames.test
+++ test/merge_renames.test
@@ -468,11 +468,11 @@
468 test_file_contents merge_renames-12-6 f1v "f1v\nm"
469 fossil commit -m "merge m"
470
471 #################################################################
472 # Test 13 #
473 # Merge in add+rename that happened on a branch, then merged #
474 # back to branch, and again to trunk, then merge in branch. #
475 #################################################################
476
477 set repoDir [test_setup]
478 write_file f1 "line1"
479
--- test/revert.test
+++ test/revert.test
@@ -15,11 +15,11 @@
1515
#
1616
############################################################################
1717
#
1818
#
1919
# Tests for 'fossil revert'
20
-#
20
+#
2121
#
2222
2323
# Test 'fossil revert' against expected results from 'fossil changes' and
2424
# 'fossil addremove -n', as well as by verifying the existence of files
2525
# on the file system. 'fossil undo' is called after each test
2626
--- test/revert.test
+++ test/revert.test
@@ -15,11 +15,11 @@
15 #
16 ############################################################################
17 #
18 #
19 # Tests for 'fossil revert'
20 #
21 #
22
23 # Test 'fossil revert' against expected results from 'fossil changes' and
24 # 'fossil addremove -n', as well as by verifying the existence of files
25 # on the file system. 'fossil undo' is called after each test
26
--- test/revert.test
+++ test/revert.test
@@ -15,11 +15,11 @@
15 #
16 ############################################################################
17 #
18 #
19 # Tests for 'fossil revert'
20 #
21 #
22
23 # Test 'fossil revert' against expected results from 'fossil changes' and
24 # 'fossil addremove -n', as well as by verifying the existence of files
25 # on the file system. 'fossil undo' is called after each test
26
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -170,11 +170,11 @@
170170
#### The directories where the OpenSSL include and library files are located.
171171
# The recommended usage here is to use the Sysinternals junction tool
172172
# to create a hard link between an "openssl-1.x" sub-directory of the
173173
# Fossil source code directory and the target OpenSSL source directory.
174174
#
175
-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2j
175
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2k
176176
OPENSSLINCDIR = $(OPENSSLDIR)/include
177177
OPENSSLLIBDIR = $(OPENSSLDIR)
178178
179179
#### Either the directory where the Tcl library is installed or the Tcl
180180
# source code directory resides (depending on the value of the macro
181181
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -170,11 +170,11 @@
170 #### The directories where the OpenSSL include and library files are located.
171 # The recommended usage here is to use the Sysinternals junction tool
172 # to create a hard link between an "openssl-1.x" sub-directory of the
173 # Fossil source code directory and the target OpenSSL source directory.
174 #
175 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2j
176 OPENSSLINCDIR = $(OPENSSLDIR)/include
177 OPENSSLLIBDIR = $(OPENSSLDIR)
178
179 #### Either the directory where the Tcl library is installed or the Tcl
180 # source code directory resides (depending on the value of the macro
181
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -170,11 +170,11 @@
170 #### The directories where the OpenSSL include and library files are located.
171 # The recommended usage here is to use the Sysinternals junction tool
172 # to create a hard link between an "openssl-1.x" sub-directory of the
173 # Fossil source code directory and the target OpenSSL source directory.
174 #
175 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2k
176 OPENSSLINCDIR = $(OPENSSLDIR)/include
177 OPENSSLLIBDIR = $(OPENSSLDIR)
178
179 #### Either the directory where the Tcl library is installed or the Tcl
180 # source code directory resides (depending on the value of the macro
181
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -170,11 +170,11 @@
170170
#### The directories where the OpenSSL include and library files are located.
171171
# The recommended usage here is to use the Sysinternals junction tool
172172
# to create a hard link between an "openssl-1.x" sub-directory of the
173173
# Fossil source code directory and the target OpenSSL source directory.
174174
#
175
-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2j
175
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2k
176176
OPENSSLINCDIR = $(OPENSSLDIR)/include
177177
OPENSSLLIBDIR = $(OPENSSLDIR)
178178
179179
#### Either the directory where the Tcl library is installed or the Tcl
180180
# source code directory resides (depending on the value of the macro
181181
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -170,11 +170,11 @@
170 #### The directories where the OpenSSL include and library files are located.
171 # The recommended usage here is to use the Sysinternals junction tool
172 # to create a hard link between an "openssl-1.x" sub-directory of the
173 # Fossil source code directory and the target OpenSSL source directory.
174 #
175 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2j
176 OPENSSLINCDIR = $(OPENSSLDIR)/include
177 OPENSSLLIBDIR = $(OPENSSLDIR)
178
179 #### Either the directory where the Tcl library is installed or the Tcl
180 # source code directory resides (depending on the value of the macro
181
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -170,11 +170,11 @@
170 #### The directories where the OpenSSL include and library files are located.
171 # The recommended usage here is to use the Sysinternals junction tool
172 # to create a hard link between an "openssl-1.x" sub-directory of the
173 # Fossil source code directory and the target OpenSSL source directory.
174 #
175 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2k
176 OPENSSLINCDIR = $(OPENSSLDIR)/include
177 OPENSSLLIBDIR = $(OPENSSLDIR)
178
179 #### Either the directory where the Tcl library is installed or the Tcl
180 # source code directory resides (depending on the value of the macro
181
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -98,11 +98,11 @@
9898
!ifndef USE_SEE
9999
USE_SEE = 0
100100
!endif
101101
102102
!if $(FOSSIL_ENABLE_SSL)!=0
103
-SSLDIR = $(B)\compat\openssl-1.0.2j
103
+SSLDIR = $(B)\compat\openssl-1.0.2k
104104
SSLINCDIR = $(SSLDIR)\inc32
105105
!if $(FOSSIL_DYNAMIC_BUILD)!=0
106106
SSLLIBDIR = $(SSLDIR)\out32dll
107107
!else
108108
SSLLIBDIR = $(SSLDIR)\out32
109109
--- 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.2j
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.2k
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
@@ -141,11 +141,11 @@
141141
the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
142142
first <a href="https://www.openssl.org/source/">download the official
143143
source code for OpenSSL</a> and extract it to an appropriately named
144144
"<b>openssl-X.Y.ZA</b>" subdirectory within the local
145145
[/tree?ci=trunk&name=compat | compat] directory (e.g.
146
-"<b>compat/openssl-1.0.2j</b>"), then make sure that some recent
146
+"<b>compat/openssl-1.0.2k</b>"), then make sure that some recent
147147
<a href="http://www.perl.org/">Perl</a> binaries are installed locally,
148148
and finally run one of the following commands:
149149
<blockquote><pre>
150150
nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
151151
</pre></blockquote>
152152
--- www/build.wiki
+++ www/build.wiki
@@ -141,11 +141,11 @@
141 the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
142 first <a href="https://www.openssl.org/source/">download the official
143 source code for OpenSSL</a> and extract it to an appropriately named
144 "<b>openssl-X.Y.ZA</b>" subdirectory within the local
145 [/tree?ci=trunk&name=compat | compat] directory (e.g.
146 "<b>compat/openssl-1.0.2j</b>"), then make sure that some recent
147 <a href="http://www.perl.org/">Perl</a> binaries are installed locally,
148 and finally run one of the following commands:
149 <blockquote><pre>
150 nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
151 </pre></blockquote>
152
--- www/build.wiki
+++ www/build.wiki
@@ -141,11 +141,11 @@
141 the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
142 first <a href="https://www.openssl.org/source/">download the official
143 source code for OpenSSL</a> and extract it to an appropriately named
144 "<b>openssl-X.Y.ZA</b>" subdirectory within the local
145 [/tree?ci=trunk&name=compat | compat] directory (e.g.
146 "<b>compat/openssl-1.0.2k</b>"), then make sure that some recent
147 <a href="http://www.perl.org/">Perl</a> binaries are installed locally,
148 and finally run one of the following commands:
149 <blockquote><pre>
150 nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
151 </pre></blockquote>
152
--- www/quickstart.wiki
+++ www/quickstart.wiki
@@ -6,11 +6,11 @@
66
77
<h2>Installing</h2>
88
99
<p>Fossil is a single self-contained C program. You need to
1010
either download a
11
- <a href="https://www.fossil-scm.org/fossil/uv/download.html">precompiled
11
+ <a href="https://www.fossil-scm.org/fossil/uv/download.html">precompiled
1212
binary</a>
1313
or <a href="build.wiki">compile it yourself</a> from sources.
1414
Install fossil by putting the fossil binary
1515
someplace on your $PATH.</p>
1616
1717
--- www/quickstart.wiki
+++ www/quickstart.wiki
@@ -6,11 +6,11 @@
6
7 <h2>Installing</h2>
8
9 <p>Fossil is a single self-contained C program. You need to
10 either download a
11 <a href="https://www.fossil-scm.org/fossil/uv/download.html">precompiled
12 binary</a>
13 or <a href="build.wiki">compile it yourself</a> from sources.
14 Install fossil by putting the fossil binary
15 someplace on your $PATH.</p>
16
17
--- www/quickstart.wiki
+++ www/quickstart.wiki
@@ -6,11 +6,11 @@
6
7 <h2>Installing</h2>
8
9 <p>Fossil is a single self-contained C program. You need to
10 either download a
11 <a href="https://www.fossil-scm.org/fossil/uv/download.html">precompiled
12 binary</a>
13 or <a href="build.wiki">compile it yourself</a> from sources.
14 Install fossil by putting the fossil binary
15 someplace on your $PATH.</p>
16
17

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button