1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
|
This patch contains all the Debian-specific changes mixed together.
The reason for doing this, rather than maintaining quilt patches, is
that the Debian-specific changes are maintained as a branch in a
fossil repository. To review them separately, please inspect the
debian branch in http://people.debian.org/~bap/fossil.fsl
--- fossil-1.37.orig/manifest
+++ fossil-1.37/manifest
@@ -1,5 +1,5 @@
-C Version\s1.37
-D 2017-01-16T20:58:54.194
+C log\schanges
+D 2017-01-18T12:25:23.954
F .dockerignore 29c5476ae4fb609219ea3f11d60c4b133a037b68
F .fossil-settings/binary-glob 34cc11b3b509fd5064afe327e70765799f314c9a
F .fossil-settings/clean-glob 50327fe7150c88e5daf5150f240dc805398665fb
@@ -16,7 +16,7 @@ F Makefile.classic f0e49e92670a94553f0e5
F Makefile.in ca04b4081ad0dc54256f7d609168750c2247882e
F VERSION b05b06b20073554259036e0bee80fb43986651d3
F ajax/README 133f25a88f21479a20cc3b20a8dfa0f0fa807ffc
-F ajax/cgi-bin/fossil-json.cgi.example 5e1245c336a0666e3777c5ba46ce2bbcd6450619
+F ajax/cgi-bin/fossil-json.cgi.example 5e1245c336a0666e3777c5ba46ce2bbcd6450619 x
F ajax/i-test/rhino-shell.js 2b735676d55e3d06d670ffbc643e5d3f748b95ea
F ajax/i-test/rhino-test.js c0e2d874caa424a8cb1628c8d85a4a6b197b8d32
F ajax/index.html f4f8d1b79b51a12dd167f5e16a1e3e6e38f8903e
@@ -63,7 +63,7 @@ F autosetup/jimsh0.c e2e67757a06d0cab4d5
F autosetup/local.tcl 3a6a7704f546f0863f86f69df7af1858de9c41c9
F autosetup/pkg-config.tcl 232a81fd534755653144cea9558656908189e97f
F autosetup/system.tcl 82f4b642c6c605dc1fa8cb728bf251e501350572
-F autosetup/test-tclsh f197a4c7bfa8bde7672864fc36dcbc7f85bdda6c x
+F autosetup/test-tclsh f197a4c7bfa8bde7672864fc36dcbc7f85bdda6c
F autosetup/tmake.auto 76789a7eb47bb057c1d230f549dd6cf1cf3ac376
F autosetup/tmake.tcl 585cf569bb5b94a98876615d6b6dd6d6d84c93a9
F compat/tcl-8.6/generic/tcl.h 3e49f8e5404fd60181c69b6d0ad075e12c4fbd4d
@@ -323,7 +323,19 @@ F compat/zlib/zlib2ansi e9859eecf47ae662
F compat/zlib/zutil.c 2f1fcc93488ac84acf984415b6ea0bd63c72aa49
F compat/zlib/zutil.h f32dab3880d47eca1b71c308cf6542b32941b23c
F configure 239cde01aca7fc63a2903f85bd2a6414189f1bd4 x
-F debian/makedeb.sh b57db65590abc4216946cecd9850a94fd3a4b19f
+F debian/README.Debian 4f504cbfd2afbe917ad659e85f995c5e5bd27cd2
+F debian/changelog 729b4359d5905962adf3b5d2fc0b69b951495b3e
+F debian/compat b6abd567fa79cbe0196d093a067271361dc6ca8b
+F debian/control d00ad12cfaf7edfc9cf3d4a29efc8df757de8ee7
+F debian/copyright 3d850ea9194da4d2322fcf11b61174f7e9a6818a
+F debian/fossil.bash-completion e1e460f40668463a8e3e8df9a99de8f9301c9730
+F debian/fossil.docs 45a770a8534b1a439a32546145737975a9217b30
+F debian/fossil.manpages 8ca3a843375393ec37484e4dbae3d4dfe5b4ddcf
+F debian/rules 85a94009eb1ba23d62ac0f25a447107dd89f3687 x
+F debian/source/format 1064dc0ce263680c076a1005f35ec906a5cf5a32
+F debian/source/local-options 58a65fc3dfe4bbb8692c99e80334fba1e913f072
+F debian/source/patch-header 84c8aca673f2fc094c29a10bd519fca36a57e9f6
+F debian/watch 4bde5f99cfdf4e7e307e1aafacc2f1d37af73030
F fossil.1 740ad69dfd64430b1e31d22ac799a6086c622ef8
F setup/fossil.iss 57e01e1feb0198de025417c0a98f1d4b1c444f53
F setup/fossil.nsi 806b01761d5d42543d1c90b95b927c0ea8b251bf
@@ -383,7 +395,7 @@ F skins/rounded1/details.txt b8f20e99b2d
F skins/rounded1/footer.txt d20c3ed17ceccc1ad865c4fa50375d197e79f877
F skins/rounded1/header.txt 90ea81c5b14e22a048e182c22769e9aa779d8752
F skins/xekri/README.md 4acf7362d3bae2959b35f0d07694128a081f7049
-F skins/xekri/css.txt 50acf931233c8b882c57d6dbe104b5f53cc4883d
+F skins/xekri/css.txt be8150445f26a2c4ad703af1e34576bb1d382067
F skins/xekri/details.txt b8f20e99b2dd421f72f686b286f04c0283f242c5
F skins/xekri/footer.txt e8a573cd5148c80926e8bed7f1407519cefbbd7c
F skins/xekri/header.txt b5adf120f4828b86e6bb9efa6d3345b51ab56fcf
@@ -435,7 +447,7 @@ F src/graph.c 51a4ef3f3f5ad77fa47cc2aa8f
F src/gzip.c b0d60daf0cf3e17c848906ec952ef0a4812d8a49
F src/http.c 5d5c19958bad3b0de0be4f47ad022c689be0d543
F src/http_socket.c 6d14a9c8e2e3a7d9cd0acfdcdf544173b339cab1
-F src/http_ssl.c 0d21a4842ad8c8902309a93cbc5ec2b4768a5710
+F src/http_ssl.c a64ed129e847162f23fe96b501d911576054370c
F src/http_transport.c c6f2ce84687a4f210c62f99948154232abf46bec
F src/import.c 52e37698299310f2ef58aaba7dd732f1f62622a5
F src/info.c 7b09909864e296c4d7404fc17ca644f960071b55
@@ -500,12 +512,12 @@ F src/shun.c 1f8bcfcd826c3b574cd6e723f7a
F src/sitemap.c b7c376b21d29322741c804e1f762b34aedb98ad1
F src/skins.c 0b6ae35015f48cbe9cef2f97d65105a796fc366b
F src/sqlcmd.c 9f904c862aa0c5f83306cbee0140a54c4d1e3a54
-F src/sqlite3.c 2bebdc3f24911c0d12b6d6c0123c3f84d6946b08
+F src/sqlite3.c f991ddcc3b559dba3f99a4122916419549fd74f8
F src/sqlite3.h 4fd3c78c3d9eae88fdc127523cdb45bf5e909677
F src/stash.c ac247e5b718cd29c6c1fc543f7b984be9b9f53e6
F src/stat.c 2f81053ee64a9a9705fdbeac60e7397798145aaf
F src/statrep.c 0845172bf1b5c8f724b4176557f34895a8dcc4ae
-F src/style.c cf9edbf403e1df8e094e8a1d44d5dd9516046678
+F src/style.c 1ce7078e469af57bb12c715a5e8520ee53056f21
F src/sync.c 9cc2947ef0f1ef73bd9fb1fa7291dd5df2c03ce9
F src/tag.c ac52cf03d437d8f569d2a73c8a30dcf6cf40d8fd
F src/tar.c 8cfe3f2ef83784ed5644b3a9c4cd4d85f1096a38
@@ -521,7 +533,7 @@ F src/translate.c 33b65539a12abd079a5797
F src/undo.c d3cca342dd73eaec65e352d978e8f7a9e75a5ddd
F src/unicode.c 49d229135beb3cba5a58013dfda577fa51ab96ee
F src/unversioned.c 8e5f76b5847295f84f0772937617cc945721a72f
-F src/update.c 6520d390b5e37ce8cdd51abc7044778dd33a14de
+F src/update.c 2455fd817f6f63c23f0f2c4caf2d5963d2c9f2cb
F src/url.c be48911fa1624051538157f2dfc815ec082e7206
F src/user.c 1d31844a9e48e2ab515586bf54ecc4b30b47d5b5
F src/utf8.c 9f458b9698fc928cc21e375538f268651d1d22a2
@@ -757,7 +769,7 @@ F www/newrepo.wiki 8b05313b8c7b3ceb71dfc
F www/password.wiki 135405d9e2261e759d0d85fd2104848589c485e6
F www/permutedindex.html e2f7a7752d2527674bfe905d1e2e91cffc3e4e38
F www/pop.wiki a9bd731ae3e8b431328d8c3f017cf12d180f377b
-F www/private.wiki 1c55c09563361db73b733386dc0fd6689156d5ab
+F www/private.wiki d5fb4755e39352116bafdbdecee96ca24221c8a1
F www/qandc.wiki b8b6f9668796bde63440e64dfd40a176766dd78e
F www/quickstart.wiki a35d326e15624f52702b9b7a7e777c89b0b37f81
F www/quotes.wiki 6f77c1af17f05596d0f6a4cc88f149a61188ecfd
@@ -774,7 +786,7 @@ F www/style.wiki da3a414d4c57c3da2636daf
F www/sync.wiki c14259113e0548e41911b177499170269ac0cb2b
F www/tech_overview.wiki a96e1f0c384b3e3ad301f2f64ffb531a2c151aed
F www/th1.md 19fd3af8400d8dbeb0d7c94370db06c73114f5f1
-F www/theory1.wiki 8047579bc30437bffe4dd0c06d8c2aa3ba3648ae
+F www/theory1.wiki 257ff6e0c9e4133050ec22669fea6f68fbfbde60
F www/tickets.wiki 717ff5a436834bf0ec42f9501216449c40b938fe
F www/uitest.html 7d7bd8198689c266012398d1df12eb71ab98031c
F www/unvers.wiki a75ea510c408c0bb83c396afbe72948b8b2202cd
@@ -783,11 +795,7 @@ F www/webui.wiki 411350e0bfcabd3e3e8a750
F www/whyusefossil.wiki fab03dc861eb75931673f2bc9dc3432b102df0fc
F www/wikitheory.wiki bd20172d783835606043b15bba0c69c9f606a87b
F www/xkcd-git.gif 1f9bc44ed41cad3f5ac18f21e3463e3390b53b29
-P 9c97d23d36d05705e51dd181f0602474671d6cce
-R f4d5fb78f5a8d3b7d6f87a6596f7f4ef
-T +bgcolor * #d0c0ff
-T +sym-release *
-T +sym-version-1.37 *
-U drh
-Z a1c193dd2fd0045ace71fa285bc0e131
-# Remove this line to create a well-formed manifest.
+P 52e8f38b8fd5c61895a66c20bccad7827f919925
+R 5ec40ca4970d9b3c259883df360ef67a
+U barak
+Z 688000b57e3c45fc5691b9f7da8b88e9
--- fossil-1.37.orig/manifest.uuid
+++ fossil-1.37/manifest.uuid
@@ -1 +1 @@
-1669115ab9d05c18a185e3ea85e3b33d817f61a5
+463d2a7b49a85b18fc7bbe742bb89f4304204994
--- fossil-1.37.orig/skins/xekri/css.txt
+++ fossil-1.37/skins/xekri/css.txt
@@ -989,7 +989,7 @@ blockquote.reportError {
p.noMoreShun {
color: #00f;
}
-/* format for artifact lines beeing shunned */
+/* format for artifact lines being shunned */
p.shunned {
color: #00f;
}
--- fossil-1.37.orig/src/http_ssl.c
+++ fossil-1.37/src/http_ssl.c
@@ -295,8 +295,10 @@ int ssl_open(UrlData *pUrlData){
SSL_set_mode(ssl, SSL_MODE_AUTO_RETRY);
if( !pUrlData->useProxy ){
- BIO_set_conn_hostname(iBio, pUrlData->name);
- BIO_ctrl(iBio,BIO_C_SET_CONNECT,3,(char *)&pUrlData->port);
+ char *connStr;
+ connStr = mprintf("%s:%d", pUrlData->name, pUrlData->port);
+ BIO_set_conn_hostname(iBio, connStr);
+ free(connStr);
if( BIO_do_connect(iBio)<=0 ){
ssl_set_errmsg("SSL: cannot connect to host %s:%d (%s)",
pUrlData->name, pUrlData->port, ERR_reason_error_string(ERR_get_error()));
--- fossil-1.37.orig/src/sqlite3.c
+++ fossil-1.37/src/sqlite3.c
@@ -118783,7 +118783,7 @@ static void substSelect(
** aggregates.
**
** (**) Restriction (10) was removed from the code on 2005-02-05 but we
-** accidently carried the comment forward until 2014-09-15. Original
+** accidentally carried the comment forward until 2014-09-15. Original
** text: "The subquery does not use aggregates or the outer query
** does not use LIMIT."
**
--- fossil-1.37.orig/src/style.c
+++ fossil-1.37/src/style.c
@@ -1241,7 +1241,7 @@ const struct strctCssDefaults {
@ color: blue;
},
{ "p.shunned",
- "format for artifact lines beeing shunned",
+ "format for artifact lines being shunned",
@ color: blue;
},
{ "span.brokenlink",
--- fossil-1.37.orig/src/update.c
+++ fossil-1.37/src/update.c
@@ -737,7 +737,7 @@ int historical_blob(
**
** Revert all files if no file name is provided.
**
-** If a file is reverted accidently, it can be restored using
+** If a file is reverted accidentally, it can be restored using
** the "fossil undo" command.
**
** Options:
--- fossil-1.37.orig/www/private.wiki
+++ fossil-1.37/www/private.wiki
@@ -60,7 +60,7 @@ you have to enable the "Private" capabil
to enable private branch syncing. The Admin ("a") and Superuser ("s") do
<u>not</u> imply Private ("x"); you'll have to set "x" in addition to
"a" or "s". This is a little extra work, but there is a purpose here:
-the interface is designed to make it very difficult to accidently
+the interface is designed to make it very difficult to accidentally
sync a private branch to a public server. It is highly recommended that
you leave the "x" capability turned off on all repositories used for
collaboration (repositories to which many people push and pull) and
@@ -69,7 +69,7 @@ branches.
Private branch sync only works if you use the --private command-line option.
Private branches are never synced via the auto-sync mechanism. Once
-again, this restriction is designed to make it hard to accidently
+again, this restriction is designed to make it hard to accidentally
push private branches beyond their intended audience.
<h2>Purging Private Branches</h2>
--- fossil-1.37.orig/www/theory1.wiki
+++ fossil-1.37/www/theory1.wiki
@@ -110,7 +110,7 @@ just a programming language.
For certain types of problems, SQL has a huge advantage over other
programming languages because it is so high level and because it allows
-programmers to focus more on the <i>what</i> and less of the <i>how</i>
+programmers to focus more on the <i>what</i> and less on the <i>how</i>
of a computation. In other words,
programmers tend to think about problems at a much higher level when
using SQL; this can result in better applications.
|
