Fossil SCM

merge trunk

baruch 2014-12-22 21:36 file-filter merge
Commit f74480823802cbbce96e06abd6daa8e75b1fc7f9
Parent 221fac45d0c90d7…
16 files changed +1 -1 +1 -1 +1 -3 +6 -5 +2 -2 +4 -4 +31 -6 +1 -1 +28 -5 +17 -1 +29 -1 +14 -5 +1 -1 +1 -1 +1 -1 +1 -1
~ src/browse.c ~ src/browse.c ~ src/cgi.c ~ src/http.c ~ src/http_ssl.c ~ src/json_timeline.c ~ src/makemake.tcl ~ src/markdown.c ~ src/style.c ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc ~ www/concepts.wiki ~ www/foss-cklist.wiki ~ www/fossil-v-git.wiki ~ www/server.wiki
M src/browse.c
+1 -1
--- src/browse.c
+++ src/browse.c
@@ -760,11 +760,11 @@
760760
 nDir++;
761761
 }else if( !showDirOnly ){
762762
 const char *zFileClass = fileext_class(p->zName);
763763
 char *zLink;
764764
 if( zCI ){
765
- zLink = href("%R/artifact/%s",p->zUuid);
765
+ zLink = href("%R/artifact/%.16s",p->zUuid);
766766
 }else{
767767
 zLink = href("%R/finfo?name=%T",p->zFullName);
768768
 }
769769
 @ <li class="%z(zFileClass)%s(zLastClass)"><div class="filetreeline">
770770
 @ %z(zLink)%h(p->zName)</a>
771771
--- src/browse.c
+++ src/browse.c
@@ -760,11 +760,11 @@
760 nDir++;
761 }else if( !showDirOnly ){
762 const char *zFileClass = fileext_class(p->zName);
763 char *zLink;
764 if( zCI ){
765 zLink = href("%R/artifact/%s",p->zUuid);
766 }else{
767 zLink = href("%R/finfo?name=%T",p->zFullName);
768 }
769 @ <li class="%z(zFileClass)%s(zLastClass)"><div class="filetreeline">
770 @ %z(zLink)%h(p->zName)</a>
771
--- src/browse.c
+++ src/browse.c
@@ -760,11 +760,11 @@
760 nDir++;
761 }else if( !showDirOnly ){
762 const char *zFileClass = fileext_class(p->zName);
763 char *zLink;
764 if( zCI ){
765 zLink = href("%R/artifact/%.16s",p->zUuid);
766 }else{
767 zLink = href("%R/finfo?name=%T",p->zFullName);
768 }
769 @ <li class="%z(zFileClass)%s(zLastClass)"><div class="filetreeline">
770 @ %z(zLink)%h(p->zName)</a>
771
M src/browse.c
+1 -1
--- src/browse.c
+++ src/browse.c
@@ -760,11 +760,11 @@
760760
 nDir++;
761761
 }else if( !showDirOnly ){
762762
 const char *zFileClass = fileext_class(p->zName);
763763
 char *zLink;
764764
 if( zCI ){
765
- zLink = href("%R/artifact/%s",p->zUuid);
765
+ zLink = href("%R/artifact/%.16s",p->zUuid);
766766
 }else{
767767
 zLink = href("%R/finfo?name=%T",p->zFullName);
768768
 }
769769
 @ <li class="%z(zFileClass)%s(zLastClass)"><div class="filetreeline">
770770
 @ %z(zLink)%h(p->zName)</a>
771771
--- src/browse.c
+++ src/browse.c
@@ -760,11 +760,11 @@
760 nDir++;
761 }else if( !showDirOnly ){
762 const char *zFileClass = fileext_class(p->zName);
763 char *zLink;
764 if( zCI ){
765 zLink = href("%R/artifact/%s",p->zUuid);
766 }else{
767 zLink = href("%R/finfo?name=%T",p->zFullName);
768 }
769 @ <li class="%z(zFileClass)%s(zLastClass)"><div class="filetreeline">
770 @ %z(zLink)%h(p->zName)</a>
771
--- src/browse.c
+++ src/browse.c
@@ -760,11 +760,11 @@
760 nDir++;
761 }else if( !showDirOnly ){
762 const char *zFileClass = fileext_class(p->zName);
763 char *zLink;
764 if( zCI ){
765 zLink = href("%R/artifact/%.16s",p->zUuid);
766 }else{
767 zLink = href("%R/finfo?name=%T",p->zFullName);
768 }
769 @ <li class="%z(zFileClass)%s(zLastClass)"><div class="filetreeline">
770 @ %z(zLink)%h(p->zName)</a>
771
M src/cgi.c
+1 -3
--- src/cgi.c
+++ src/cgi.c
@@ -342,13 +342,11 @@
342342
 ** case of most /getfile calls for specific versions, the only way the
343343
 ** content changes is if someone breaks the SCM. And if that happens, a
344344
 ** stale cache is the least of the problem. So we provide an Expires
345345
 ** header set to a reasonable period (default: one week).
346346
 */
347
- /*time_t expires = time(0) + atoi(db_config("constant_expires","604800"));*/
348
- time_t expires = time(0) + 604800;
349
- fprintf(g.httpOut, "Expires: %s\r\n", cgi_rfc822_datestamp(expires));
347
+ fprintf(g.httpOut, "Cache-control: max-age=28800\r\n");
350348
 }else{
351349
 fprintf(g.httpOut, "Cache-control: no-cache\r\n");
352350
 }
353351
354352
 /* Content intended for logged in users should only be cached in
355353
--- src/cgi.c
+++ src/cgi.c
@@ -342,13 +342,11 @@
342 ** case of most /getfile calls for specific versions, the only way the
343 ** content changes is if someone breaks the SCM. And if that happens, a
344 ** stale cache is the least of the problem. So we provide an Expires
345 ** header set to a reasonable period (default: one week).
346 */
347 /*time_t expires = time(0) + atoi(db_config("constant_expires","604800"));*/
348 time_t expires = time(0) + 604800;
349 fprintf(g.httpOut, "Expires: %s\r\n", cgi_rfc822_datestamp(expires));
350 }else{
351 fprintf(g.httpOut, "Cache-control: no-cache\r\n");
352 }
353
354 /* Content intended for logged in users should only be cached in
355
--- src/cgi.c
+++ src/cgi.c
@@ -342,13 +342,11 @@
342 ** case of most /getfile calls for specific versions, the only way the
343 ** content changes is if someone breaks the SCM. And if that happens, a
344 ** stale cache is the least of the problem. So we provide an Expires
345 ** header set to a reasonable period (default: one week).
346 */
347 fprintf(g.httpOut, "Cache-control: max-age=28800\r\n");
 
 
348 }else{
349 fprintf(g.httpOut, "Cache-control: no-cache\r\n");
350 }
351
352 /* Content intended for logged in users should only be cached in
353
M src/http.c
+6 -5
--- src/http.c
+++ src/http.c
@@ -285,11 +285,11 @@
285285
 g.zHttpAuth = prompt_for_httpauth_creds();
286286
 transport_close(&g.url);
287287
 return http_exchange(pSend, pReply, useLogin, maxRedirect);
288288
 }
289289
 }
290
- if( rc!=200 && rc!=302 ){
290
+ if( rc!=200 && rc!=301 && rc!=302 ){
291291
 int ii;
292292
 for(ii=7; zLine[ii] && zLine[ii]!=' '; ii++){}
293293
 while( zLine[ii]==' ' ) ii++;
294294
 fossil_warning("server says: %s", &zLine[ii]);
295295
 goto write_err;
@@ -299,11 +299,11 @@
299299
 }else{
300300
 closeConnection = 0;
301301
 }
302302
 }else if( g.url.isSsh && fossil_strnicmp(zLine, "status:", 7)==0 ){
303303
 if( sscanf(zLine, "Status: %d", &rc)!=1 ) goto write_err;
304
- if( rc!=200 && rc!=302 ){
304
+ if( rc!=200 && rc!=301 && rc!=302 ){
305305
 int ii;
306306
 for(ii=7; zLine[ii] && zLine[ii]!=' '; ii++){}
307307
 while( zLine[ii]==' ' ) ii++;
308308
 fossil_warning("server says: %s", &zLine[ii]);
309309
 goto write_err;
@@ -319,11 +319,12 @@
319319
 if( c=='c' || c=='C' ){
320320
 closeConnection = 1;
321321
 }else if( c=='k' || c=='K' ){
322322
 closeConnection = 0;
323323
 }
324
- }else if( rc==302 && fossil_strnicmp(zLine, "location:", 9)==0 ){
324
+ }else if( ( rc==301 || rc==302 ) &&
325
+ fossil_strnicmp(zLine, "location:", 9)==0 ){
325326
 int i, j;
326327
327328
 if ( --maxRedirect == 0){
328329
 fossil_warning("redirect limit exceeded");
329330
 goto write_err;
@@ -338,11 +339,11 @@
338339
 j -= 4;
339340
 zLine[j] = 0;
340341
 }
341342
 transport_close(&g.url);
342343
 transport_global_shutdown(&g.url);
343
- fossil_print("redirect to %s\n", &zLine[i]);
344
+ fossil_print("redirect with status %d to %s\n", rc, &zLine[i]);
344345
 url_parse(&zLine[i], 0);
345346
 fSeenHttpAuth = 0;
346347
 if( g.zHttpAuth ) free(g.zHttpAuth);
347348
 g.zHttpAuth = get_httpauth();
348349
 return http_exchange(pSend, pReply, useLogin, maxRedirect);
@@ -360,11 +361,11 @@
360361
 if( iLength<0 ){
361362
 fossil_warning("server did not reply");
362363
 goto write_err;
363364
 }
364365
 if( rc!=200 ){
365
- fossil_warning("\"location:\" missing from 302 redirect reply");
366
+ fossil_warning("\"location:\" missing from %d redirect reply", rc);
366367
 goto write_err;
367368
 }
368369
369370
 /*
370371
 ** Extract the reply payload that follows the header
371372
--- src/http.c
+++ src/http.c
@@ -285,11 +285,11 @@
285 g.zHttpAuth = prompt_for_httpauth_creds();
286 transport_close(&g.url);
287 return http_exchange(pSend, pReply, useLogin, maxRedirect);
288 }
289 }
290 if( rc!=200 && rc!=302 ){
291 int ii;
292 for(ii=7; zLine[ii] && zLine[ii]!=' '; ii++){}
293 while( zLine[ii]==' ' ) ii++;
294 fossil_warning("server says: %s", &zLine[ii]);
295 goto write_err;
@@ -299,11 +299,11 @@
299 }else{
300 closeConnection = 0;
301 }
302 }else if( g.url.isSsh && fossil_strnicmp(zLine, "status:", 7)==0 ){
303 if( sscanf(zLine, "Status: %d", &rc)!=1 ) goto write_err;
304 if( rc!=200 && rc!=302 ){
305 int ii;
306 for(ii=7; zLine[ii] && zLine[ii]!=' '; ii++){}
307 while( zLine[ii]==' ' ) ii++;
308 fossil_warning("server says: %s", &zLine[ii]);
309 goto write_err;
@@ -319,11 +319,12 @@
319 if( c=='c' || c=='C' ){
320 closeConnection = 1;
321 }else if( c=='k' || c=='K' ){
322 closeConnection = 0;
323 }
324 }else if( rc==302 && fossil_strnicmp(zLine, "location:", 9)==0 ){
 
325 int i, j;
326
327 if ( --maxRedirect == 0){
328 fossil_warning("redirect limit exceeded");
329 goto write_err;
@@ -338,11 +339,11 @@
338 j -= 4;
339 zLine[j] = 0;
340 }
341 transport_close(&g.url);
342 transport_global_shutdown(&g.url);
343 fossil_print("redirect to %s\n", &zLine[i]);
344 url_parse(&zLine[i], 0);
345 fSeenHttpAuth = 0;
346 if( g.zHttpAuth ) free(g.zHttpAuth);
347 g.zHttpAuth = get_httpauth();
348 return http_exchange(pSend, pReply, useLogin, maxRedirect);
@@ -360,11 +361,11 @@
360 if( iLength<0 ){
361 fossil_warning("server did not reply");
362 goto write_err;
363 }
364 if( rc!=200 ){
365 fossil_warning("\"location:\" missing from 302 redirect reply");
366 goto write_err;
367 }
368
369 /*
370 ** Extract the reply payload that follows the header
371
--- src/http.c
+++ src/http.c
@@ -285,11 +285,11 @@
285 g.zHttpAuth = prompt_for_httpauth_creds();
286 transport_close(&g.url);
287 return http_exchange(pSend, pReply, useLogin, maxRedirect);
288 }
289 }
290 if( rc!=200 && rc!=301 && rc!=302 ){
291 int ii;
292 for(ii=7; zLine[ii] && zLine[ii]!=' '; ii++){}
293 while( zLine[ii]==' ' ) ii++;
294 fossil_warning("server says: %s", &zLine[ii]);
295 goto write_err;
@@ -299,11 +299,11 @@
299 }else{
300 closeConnection = 0;
301 }
302 }else if( g.url.isSsh && fossil_strnicmp(zLine, "status:", 7)==0 ){
303 if( sscanf(zLine, "Status: %d", &rc)!=1 ) goto write_err;
304 if( rc!=200 && rc!=301 && rc!=302 ){
305 int ii;
306 for(ii=7; zLine[ii] && zLine[ii]!=' '; ii++){}
307 while( zLine[ii]==' ' ) ii++;
308 fossil_warning("server says: %s", &zLine[ii]);
309 goto write_err;
@@ -319,11 +319,12 @@
319 if( c=='c' || c=='C' ){
320 closeConnection = 1;
321 }else if( c=='k' || c=='K' ){
322 closeConnection = 0;
323 }
324 }else if( ( rc==301 || rc==302 ) &&
325 fossil_strnicmp(zLine, "location:", 9)==0 ){
326 int i, j;
327
328 if ( --maxRedirect == 0){
329 fossil_warning("redirect limit exceeded");
330 goto write_err;
@@ -338,11 +339,11 @@
339 j -= 4;
340 zLine[j] = 0;
341 }
342 transport_close(&g.url);
343 transport_global_shutdown(&g.url);
344 fossil_print("redirect with status %d to %s\n", rc, &zLine[i]);
345 url_parse(&zLine[i], 0);
346 fSeenHttpAuth = 0;
347 if( g.zHttpAuth ) free(g.zHttpAuth);
348 g.zHttpAuth = get_httpauth();
349 return http_exchange(pSend, pReply, useLogin, maxRedirect);
@@ -360,11 +361,11 @@
361 if( iLength<0 ){
362 fossil_warning("server did not reply");
363 goto write_err;
364 }
365 if( rc!=200 ){
366 fossil_warning("\"location:\" missing from %d redirect reply", rc);
367 goto write_err;
368 }
369
370 /*
371 ** Extract the reply payload that follows the header
372
M src/http_ssl.c
+2 -2
--- src/http_ssl.c
+++ src/http_ssl.c
@@ -99,12 +99,12 @@
9999
 SSL_library_init();
100100
 SSL_load_error_strings();
101101
 ERR_load_BIO_strings();
102102
 OpenSSL_add_all_algorithms();
103103
 sslCtx = SSL_CTX_new(SSLv23_client_method());
104
- /* Disable SSLv2 */
105
- SSL_CTX_set_options(sslCtx, SSL_OP_NO_SSLv2);
104
+ /* Disable SSLv2 and SSLv3 */
105
+ SSL_CTX_set_options(sslCtx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3);
106106
107107
 /* Set up acceptable CA root certificates */
108108
 zCaSetting = db_get("ssl-ca-location", 0);
109109
 if( zCaSetting==0 || zCaSetting[0]=='\0' ){
110110
 /* CA location not specified, use platform's default certificate store */
111111
--- src/http_ssl.c
+++ src/http_ssl.c
@@ -99,12 +99,12 @@
99 SSL_library_init();
100 SSL_load_error_strings();
101 ERR_load_BIO_strings();
102 OpenSSL_add_all_algorithms();
103 sslCtx = SSL_CTX_new(SSLv23_client_method());
104 /* Disable SSLv2 */
105 SSL_CTX_set_options(sslCtx, SSL_OP_NO_SSLv2);
106
107 /* Set up acceptable CA root certificates */
108 zCaSetting = db_get("ssl-ca-location", 0);
109 if( zCaSetting==0 || zCaSetting[0]=='\0' ){
110 /* CA location not specified, use platform's default certificate store */
111
--- src/http_ssl.c
+++ src/http_ssl.c
@@ -99,12 +99,12 @@
99 SSL_library_init();
100 SSL_load_error_strings();
101 ERR_load_BIO_strings();
102 OpenSSL_add_all_algorithms();
103 sslCtx = SSL_CTX_new(SSLv23_client_method());
104 /* Disable SSLv2 and SSLv3 */
105 SSL_CTX_set_options(sslCtx, SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3);
106
107 /* Set up acceptable CA root certificates */
108 zCaSetting = db_get("ssl-ca-location", 0);
109 if( zCaSetting==0 || zCaSetting[0]=='\0' ){
110 /* CA location not specified, use platform's default certificate store */
111
M src/json_timeline.c
+4 -4
--- src/json_timeline.c
+++ src/json_timeline.c
@@ -88,20 +88,21 @@
8888
 db_multi_exec("%s", zSql /*safe-for-%s*/);
8989
 }
9090
9191
 /*
9292
 ** Return a pointer to a constant string that forms the basis
93
-** for a timeline query for the JSON interface.
93
+** for a timeline query for the JSON interface. It MUST NOT
94
+** be used in a formatted string argument.
9495
 */
9596
 char const * json_timeline_query(void){
9697
 /* Field order MUST match that from json_timeline_temp_table()!!! */
9798
 static const char zBaseSql[] =
9899
 @ SELECT
99100
 @ NULL,
100101
 @ blob.rid,
101102
 @ uuid,
102
- @ CAST(strftime('%%s',event.mtime) AS INTEGER),
103
+ @ CAST(strftime('%s',event.mtime) AS INTEGER),
103104
 @ datetime(event.mtime),
104105
 @ coalesce(ecomment, comment),
105106
 @ coalesce(euser, user),
106107
 @ blob.rid IN leaf,
107108
 @ bgcolor,
@@ -544,12 +545,11 @@
544545
 goto error;
545546
 }
546547
547548
 #if 0
548549
 /* only for testing! */
549
- tmp = cson_value_new_string(blob_buffer(&sql),strlen(blob_buffer(&sql)));
550
- SET("timelineSql");
550
+ cson_object_set(pay, "timelineSql", cson_value_new_string(blob_buffer(&sql),strlen(blob_buffer(&sql))));
551551
 #endif
552552
 db_multi_exec("%s", blob_buffer(&sql) /*safe-for-%s*/);
553553
 blob_reset(&sql);
554554
 db_prepare(&q, "SELECT"
555555
 " uuid AS uuid,"
556556
--- src/json_timeline.c
+++ src/json_timeline.c
@@ -88,20 +88,21 @@
88 db_multi_exec("%s", zSql /*safe-for-%s*/);
89 }
90
91 /*
92 ** Return a pointer to a constant string that forms the basis
93 ** for a timeline query for the JSON interface.
 
94 */
95 char const * json_timeline_query(void){
96 /* Field order MUST match that from json_timeline_temp_table()!!! */
97 static const char zBaseSql[] =
98 @ SELECT
99 @ NULL,
100 @ blob.rid,
101 @ uuid,
102 @ CAST(strftime('%%s',event.mtime) AS INTEGER),
103 @ datetime(event.mtime),
104 @ coalesce(ecomment, comment),
105 @ coalesce(euser, user),
106 @ blob.rid IN leaf,
107 @ bgcolor,
@@ -544,12 +545,11 @@
544 goto error;
545 }
546
547 #if 0
548 /* only for testing! */
549 tmp = cson_value_new_string(blob_buffer(&sql),strlen(blob_buffer(&sql)));
550 SET("timelineSql");
551 #endif
552 db_multi_exec("%s", blob_buffer(&sql) /*safe-for-%s*/);
553 blob_reset(&sql);
554 db_prepare(&q, "SELECT"
555 " uuid AS uuid,"
556
--- src/json_timeline.c
+++ src/json_timeline.c
@@ -88,20 +88,21 @@
88 db_multi_exec("%s", zSql /*safe-for-%s*/);
89 }
90
91 /*
92 ** Return a pointer to a constant string that forms the basis
93 ** for a timeline query for the JSON interface. It MUST NOT
94 ** be used in a formatted string argument.
95 */
96 char const * json_timeline_query(void){
97 /* Field order MUST match that from json_timeline_temp_table()!!! */
98 static const char zBaseSql[] =
99 @ SELECT
100 @ NULL,
101 @ blob.rid,
102 @ uuid,
103 @ CAST(strftime('%s',event.mtime) AS INTEGER),
104 @ datetime(event.mtime),
105 @ coalesce(ecomment, comment),
106 @ coalesce(euser, user),
107 @ blob.rid IN leaf,
108 @ bgcolor,
@@ -544,12 +545,11 @@
545 goto error;
546 }
547
548 #if 0
549 /* only for testing! */
550 cson_object_set(pay, "timelineSql", cson_value_new_string(blob_buffer(&sql),strlen(blob_buffer(&sql))));
 
551 #endif
552 db_multi_exec("%s", blob_buffer(&sql) /*safe-for-%s*/);
553 blob_reset(&sql);
554 db_prepare(&q, "SELECT"
555 " uuid AS uuid,"
556
M src/makemake.tcl
+31 -6
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -514,11 +514,12 @@
514514
 # This is useful when Tcl has been compiled statically with MinGW.
515515
 #
516516
 FOSSIL_TCL_SOURCE = 1
517517
518518
 #### Check if the workaround for the MinGW command line handling needs to
519
-# be enabled by default.
519
+# be enabled by default. This check may be somewhat fragile due to the
520
+# use of "findstring".
520521
 #
521522
 ifndef MINGW_IS_32BIT_ONLY
522523
 ifeq (,$(findstring w64-mingw32,$(PREFIX)))
523524
 MINGW_IS_32BIT_ONLY = 1
524525
 endif
@@ -527,16 +528,23 @@
527528
 #### The directories where the zlib include and library files are located.
528529
 #
529530
 ZINCDIR = $(SRCDIR)/../compat/zlib
530531
 ZLIBDIR = $(SRCDIR)/../compat/zlib
531532
533
+#### Make an attempt to detect if Fossil is being built for the x64 processor
534
+# architecture. This check may be somewhat fragile due to "findstring".
535
+#
532536
 ifndef X64
533537
 ifneq (,$(findstring x86_64-w64-mingw32,$(PREFIX)))
534538
 X64 = 1
535539
 endif
536540
 endif
537541
542
+#### Determine if the optimized assembly routines provided with zlib should be
543
+# used, taking into account whether zlib is actually enabled and the target
544
+# processor architecture.
545
+#
538546
 ifndef X64
539547
 SSLCONFIG = mingw
540548
 ifndef FOSSIL_ENABLE_MINIZ
541549
 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
542550
 LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
@@ -548,10 +556,18 @@
548556
 SSLCONFIG = mingw64
549557
 ZLIBCONFIG =
550558
 LIBTARGETS =
551559
 endif
552560
561
+#### Disable creation of the OpenSSL shared libraries. Also, disable support
562
+# for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
563
+#
564
+SSLCONFIG += no-ssl2 no-ssl3 no-shared
565
+
566
+#### When using zlib, make sure that OpenSSL is configured to use the zlib
567
+# that Fossil knows about (i.e. the one within the source tree).
568
+#
553569
 ifndef FOSSIL_ENABLE_MINIZ
554570
 SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
555571
 endif
556572
557573
 #### The directories where the OpenSSL include and library files are located.
@@ -1296,23 +1312,32 @@
12961312
 SSLLIBDIR = $(SSLDIR)\out32
12971313
 SSLLFLAGS = /nologo /opt:ref /debug
12981314
 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
12991315
 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
13001316
 !message Using 'x64' platform for OpenSSL...
1301
-SSLCONFIG = VC-WIN64A no-asm
1317
+# BUGBUG (OpenSSL): Apparently, using "no-ssl*" here breaks the build.
1318
+# SSLCONFIG = VC-WIN64A no-asm no-ssl2 no-ssl3 no-shared
1319
+SSLCONFIG = VC-WIN64A no-asm no-shared
13021320
 SSLSETUP = ms\do_win64a.bat
13031321
 SSLNMAKE = ms\nt.mak all
1322
+SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
13041323
 !elseif "$(PLATFORM)"=="ia64"
13051324
 !message Using 'ia64' platform for OpenSSL...
1306
-SSLCONFIG = VC-WIN64I no-asm
1325
+# BUGBUG (OpenSSL): Apparently, using "no-ssl*" here breaks the build.
1326
+# SSLCONFIG = VC-WIN64I no-asm no-ssl2 no-ssl3 no-shared
1327
+SSLCONFIG = VC-WIN64I no-asm no-shared
13071328
 SSLSETUP = ms\do_win64i.bat
13081329
 SSLNMAKE = ms\nt.mak all
1330
+SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
13091331
 !else
13101332
 !message Assuming 'x86' platform for OpenSSL...
1311
-SSLCONFIG = VC-WIN32 no-asm
1333
+# BUGBUG (OpenSSL): Apparently, using "no-ssl*" here breaks the build.
1334
+# SSLCONFIG = VC-WIN32 no-asm no-ssl2 no-ssl3 no-shared
1335
+SSLCONFIG = VC-WIN32 no-asm no-shared
13121336
 SSLSETUP = ms\do_ms.bat
13131337
 SSLNMAKE = ms\nt.mak all
1338
+SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
13141339
 !endif
13151340
 !endif
13161341
13171342
 !ifdef FOSSIL_ENABLE_TCL
13181343
 TCLDIR = $(B)\compat\tcl-8.6
@@ -1481,13 +1506,13 @@
14811506
 @set PATH=$(PERLDIR);$(PATH)
14821507
 !endif
14831508
 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
14841509
 @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
14851510
 !ifdef FOSSIL_ENABLE_WINXP
1486
- @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
1511
+ @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS) $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
14871512
 !else
1488
- @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) && popd
1513
+ @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS)" && popd
14891514
 !endif
14901515
 !endif
14911516
14921517
 !ifndef FOSSIL_ENABLE_MINIZ
14931518
 APPTARGETS = $(APPTARGETS) zlib
14941519
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -514,11 +514,12 @@
514 # This is useful when Tcl has been compiled statically with MinGW.
515 #
516 FOSSIL_TCL_SOURCE = 1
517
518 #### Check if the workaround for the MinGW command line handling needs to
519 # be enabled by default.
 
520 #
521 ifndef MINGW_IS_32BIT_ONLY
522 ifeq (,$(findstring w64-mingw32,$(PREFIX)))
523 MINGW_IS_32BIT_ONLY = 1
524 endif
@@ -527,16 +528,23 @@
527 #### The directories where the zlib include and library files are located.
528 #
529 ZINCDIR = $(SRCDIR)/../compat/zlib
530 ZLIBDIR = $(SRCDIR)/../compat/zlib
531
 
 
 
532 ifndef X64
533 ifneq (,$(findstring x86_64-w64-mingw32,$(PREFIX)))
534 X64 = 1
535 endif
536 endif
537
 
 
 
 
538 ifndef X64
539 SSLCONFIG = mingw
540 ifndef FOSSIL_ENABLE_MINIZ
541 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
542 LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
@@ -548,10 +556,18 @@
548 SSLCONFIG = mingw64
549 ZLIBCONFIG =
550 LIBTARGETS =
551 endif
552
 
 
 
 
 
 
 
 
553 ifndef FOSSIL_ENABLE_MINIZ
554 SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
555 endif
556
557 #### The directories where the OpenSSL include and library files are located.
@@ -1296,23 +1312,32 @@
1296 SSLLIBDIR = $(SSLDIR)\out32
1297 SSLLFLAGS = /nologo /opt:ref /debug
1298 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1299 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
1300 !message Using 'x64' platform for OpenSSL...
1301 SSLCONFIG = VC-WIN64A no-asm
 
 
1302 SSLSETUP = ms\do_win64a.bat
1303 SSLNMAKE = ms\nt.mak all
 
1304 !elseif "$(PLATFORM)"=="ia64"
1305 !message Using 'ia64' platform for OpenSSL...
1306 SSLCONFIG = VC-WIN64I no-asm
 
 
1307 SSLSETUP = ms\do_win64i.bat
1308 SSLNMAKE = ms\nt.mak all
 
1309 !else
1310 !message Assuming 'x86' platform for OpenSSL...
1311 SSLCONFIG = VC-WIN32 no-asm
 
 
1312 SSLSETUP = ms\do_ms.bat
1313 SSLNMAKE = ms\nt.mak all
 
1314 !endif
1315 !endif
1316
1317 !ifdef FOSSIL_ENABLE_TCL
1318 TCLDIR = $(B)\compat\tcl-8.6
@@ -1481,13 +1506,13 @@
1481 @set PATH=$(PERLDIR);$(PATH)
1482 !endif
1483 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
1484 @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
1485 !ifdef FOSSIL_ENABLE_WINXP
1486 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
1487 !else
1488 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) && popd
1489 !endif
1490 !endif
1491
1492 !ifndef FOSSIL_ENABLE_MINIZ
1493 APPTARGETS = $(APPTARGETS) zlib
1494
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -514,11 +514,12 @@
514 # This is useful when Tcl has been compiled statically with MinGW.
515 #
516 FOSSIL_TCL_SOURCE = 1
517
518 #### Check if the workaround for the MinGW command line handling needs to
519 # be enabled by default. This check may be somewhat fragile due to the
520 # use of "findstring".
521 #
522 ifndef MINGW_IS_32BIT_ONLY
523 ifeq (,$(findstring w64-mingw32,$(PREFIX)))
524 MINGW_IS_32BIT_ONLY = 1
525 endif
@@ -527,16 +528,23 @@
528 #### The directories where the zlib include and library files are located.
529 #
530 ZINCDIR = $(SRCDIR)/../compat/zlib
531 ZLIBDIR = $(SRCDIR)/../compat/zlib
532
533 #### Make an attempt to detect if Fossil is being built for the x64 processor
534 # architecture. This check may be somewhat fragile due to "findstring".
535 #
536 ifndef X64
537 ifneq (,$(findstring x86_64-w64-mingw32,$(PREFIX)))
538 X64 = 1
539 endif
540 endif
541
542 #### Determine if the optimized assembly routines provided with zlib should be
543 # used, taking into account whether zlib is actually enabled and the target
544 # processor architecture.
545 #
546 ifndef X64
547 SSLCONFIG = mingw
548 ifndef FOSSIL_ENABLE_MINIZ
549 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
550 LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
@@ -548,10 +556,18 @@
556 SSLCONFIG = mingw64
557 ZLIBCONFIG =
558 LIBTARGETS =
559 endif
560
561 #### Disable creation of the OpenSSL shared libraries. Also, disable support
562 # for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
563 #
564 SSLCONFIG += no-ssl2 no-ssl3 no-shared
565
566 #### When using zlib, make sure that OpenSSL is configured to use the zlib
567 # that Fossil knows about (i.e. the one within the source tree).
568 #
569 ifndef FOSSIL_ENABLE_MINIZ
570 SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
571 endif
572
573 #### The directories where the OpenSSL include and library files are located.
@@ -1296,23 +1312,32 @@
1312 SSLLIBDIR = $(SSLDIR)\out32
1313 SSLLFLAGS = /nologo /opt:ref /debug
1314 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1315 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
1316 !message Using 'x64' platform for OpenSSL...
1317 # BUGBUG (OpenSSL): Apparently, using "no-ssl*" here breaks the build.
1318 # SSLCONFIG = VC-WIN64A no-asm no-ssl2 no-ssl3 no-shared
1319 SSLCONFIG = VC-WIN64A no-asm no-shared
1320 SSLSETUP = ms\do_win64a.bat
1321 SSLNMAKE = ms\nt.mak all
1322 SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
1323 !elseif "$(PLATFORM)"=="ia64"
1324 !message Using 'ia64' platform for OpenSSL...
1325 # BUGBUG (OpenSSL): Apparently, using "no-ssl*" here breaks the build.
1326 # SSLCONFIG = VC-WIN64I no-asm no-ssl2 no-ssl3 no-shared
1327 SSLCONFIG = VC-WIN64I no-asm no-shared
1328 SSLSETUP = ms\do_win64i.bat
1329 SSLNMAKE = ms\nt.mak all
1330 SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
1331 !else
1332 !message Assuming 'x86' platform for OpenSSL...
1333 # BUGBUG (OpenSSL): Apparently, using "no-ssl*" here breaks the build.
1334 # SSLCONFIG = VC-WIN32 no-asm no-ssl2 no-ssl3 no-shared
1335 SSLCONFIG = VC-WIN32 no-asm no-shared
1336 SSLSETUP = ms\do_ms.bat
1337 SSLNMAKE = ms\nt.mak all
1338 SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
1339 !endif
1340 !endif
1341
1342 !ifdef FOSSIL_ENABLE_TCL
1343 TCLDIR = $(B)\compat\tcl-8.6
@@ -1481,13 +1506,13 @@
1506 @set PATH=$(PERLDIR);$(PATH)
1507 !endif
1508 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
1509 @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
1510 !ifdef FOSSIL_ENABLE_WINXP
1511 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS) $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
1512 !else
1513 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS)" && popd
1514 !endif
1515 !endif
1516
1517 !ifndef FOSSIL_ENABLE_MINIZ
1518 APPTARGETS = $(APPTARGETS) zlib
1519
M src/markdown.c
+1 -1
--- src/markdown.c
+++ src/markdown.c
@@ -2155,11 +2155,11 @@
21552155
 struct Blob *ib, /* input blob in markdown */
21562156
 const struct mkd_renderer *rndrer /* renderer descriptor (callbacks) */
21572157
 ){
21582158
 struct link_ref *lr;
21592159
 struct Blob text = BLOB_INITIALIZER;
2160
- size_t i, beg, end;
2160
+ size_t i, beg, end = 0;
21612161
 struct render rndr;
21622162
 char *ib_data;
21632163
21642164
 /* filling the render structure */
21652165
 if( !rndrer ) return;
21662166
--- src/markdown.c
+++ src/markdown.c
@@ -2155,11 +2155,11 @@
2155 struct Blob *ib, /* input blob in markdown */
2156 const struct mkd_renderer *rndrer /* renderer descriptor (callbacks) */
2157 ){
2158 struct link_ref *lr;
2159 struct Blob text = BLOB_INITIALIZER;
2160 size_t i, beg, end;
2161 struct render rndr;
2162 char *ib_data;
2163
2164 /* filling the render structure */
2165 if( !rndrer ) return;
2166
--- src/markdown.c
+++ src/markdown.c
@@ -2155,11 +2155,11 @@
2155 struct Blob *ib, /* input blob in markdown */
2156 const struct mkd_renderer *rndrer /* renderer descriptor (callbacks) */
2157 ){
2158 struct link_ref *lr;
2159 struct Blob text = BLOB_INITIALIZER;
2160 size_t i, beg, end = 0;
2161 struct render rndr;
2162 char *ib_data;
2163
2164 /* filling the render structure */
2165 if( !rndrer ) return;
2166
M src/style.c
+28 -5
--- src/style.c
+++ src/style.c
@@ -783,10 +783,15 @@
783783
 { ".filetree",
784784
 "tree-view file browser",
785785
 @ margin: 1em 0;
786786
 @ line-height: 1.5;
787787
 },
788
+ {
789
+ ".filetree > ul",
790
+ "tree-view top-level list",
791
+ @ display: inline-block;
792
+ },
788793
 { ".filetree ul",
789794
 "tree-view lists",
790795
 @ margin: 0;
791796
 @ padding: 0;
792797
 @ list-style: none;
@@ -832,25 +837,32 @@
832837
 },
833838
 { ".filetree a",
834839
 "tree-view links",
835840
 @ position: relative;
836841
 @ z-index: 1;
837
- @ display: inline-block;
842
+ @ display: table-cell;
838843
 @ min-height: 16px;
839844
 @ padding-left: 21px;
840845
 @ background-image: url(data:image/gif;base64,R0lGODlhEAAQAJEAAP\/\/\/yEhIf\/\/\/wAAACH5BAEHAAIALAAAAAAQABAAAAIvlIKpxqcfmgOUvoaqDSCxrEEfF14GqFXImJZsu73wepJzVMNxrtNTj3NATMKhpwAAOw==);
841846
 @ background-position: center left;
842847
 @ background-repeat: no-repeat;
843848
 },
849
+ { "div.filetreeline",
850
+ "line of a file tree",
851
+ @ display: table;
852
+ @ width: 100%;
853
+ @ white-space: nowrap;
854
+ },
844855
 { ".filetree .dir > div.filetreeline > a",
845856
 "tree-view directory links",
846857
 @ background-image: url(data:image/gif;base64,R0lGODlhEAAQAJEAAP/WVCIiIv\/\/\/wAAACH5BAEHAAIALAAAAAAQABAAAAInlI9pwa3XYniCgQtkrAFfLXkiFo1jaXpo+jUs6b5Z/K4siDu5RPUFADs=);
847858
 },
848859
 { "div.filetreeage",
849860
 "Last change floating display on the right",
850
- @ clear: right;
851
- @ float: right;
861
+ @ display: table-cell;
862
+ @ padding-left: 3em;
863
+ @ text-align: right;
852864
 },
853865
 { "div.filetreeline:hover",
854866
 "Highlight the line of a file tree",
855867
 @ background-color: #eee;
856868
 },
@@ -1232,24 +1244,35 @@
12321244
 },
12331245
 { ".fileage table",
12341246
 "The fileage table",
12351247
 @ border-spacing: 0;
12361248
 },
1249
+ { ".fileage tr:hover",
1250
+ "Mouse-over effects for the file-age table",
1251
+ @ background-color: #eee;
1252
+ },
12371253
 { ".fileage td",
12381254
 "fileage table cells",
12391255
 @ vertical-align: top;
12401256
 @ text-align: left;
1241
- @ border-top: 1px solid black;
1257
+ @ border-top: 1px solid #ddd;
1258
+ @ padding-top: 3px;
12421259
 },
12431260
 { ".fileage td:first-child",
12441261
 "fileage first column (the age)",
12451262
 @ white-space: nowrap;
12461263
 },
1247
- { ".fileage td:first-child + td",
1264
+ { ".fileage td:nth-child(2)",
12481265
 "fileage second column (the filename)",
12491266
 @ padding-left: 1em;
12501267
 @ padding-right: 1em;
1268
+ },
1269
+ { ".fileage td:nth-child(3)",
1270
+ "fileage third column (the check-in comment)",
1271
+ @ word-break: break-all;
1272
+ @ word-wrap: break-word;
1273
+ @ max-width: 50%;
12511274
 },
12521275
 { 0,
12531276
 0,
12541277
 0
12551278
 }
12561279
--- src/style.c
+++ src/style.c
@@ -783,10 +783,15 @@
783 { ".filetree",
784 "tree-view file browser",
785 @ margin: 1em 0;
786 @ line-height: 1.5;
787 },
 
 
 
 
 
788 { ".filetree ul",
789 "tree-view lists",
790 @ margin: 0;
791 @ padding: 0;
792 @ list-style: none;
@@ -832,25 +837,32 @@
832 },
833 { ".filetree a",
834 "tree-view links",
835 @ position: relative;
836 @ z-index: 1;
837 @ display: inline-block;
838 @ min-height: 16px;
839 @ padding-left: 21px;
840 @ background-image: url(data:image/gif;base64,R0lGODlhEAAQAJEAAP\/\/\/yEhIf\/\/\/wAAACH5BAEHAAIALAAAAAAQABAAAAIvlIKpxqcfmgOUvoaqDSCxrEEfF14GqFXImJZsu73wepJzVMNxrtNTj3NATMKhpwAAOw==);
841 @ background-position: center left;
842 @ background-repeat: no-repeat;
843 },
 
 
 
 
 
 
844 { ".filetree .dir > div.filetreeline > a",
845 "tree-view directory links",
846 @ background-image: url(data:image/gif;base64,R0lGODlhEAAQAJEAAP/WVCIiIv\/\/\/wAAACH5BAEHAAIALAAAAAAQABAAAAInlI9pwa3XYniCgQtkrAFfLXkiFo1jaXpo+jUs6b5Z/K4siDu5RPUFADs=);
847 },
848 { "div.filetreeage",
849 "Last change floating display on the right",
850 @ clear: right;
851 @ float: right;
 
852 },
853 { "div.filetreeline:hover",
854 "Highlight the line of a file tree",
855 @ background-color: #eee;
856 },
@@ -1232,24 +1244,35 @@
1232 },
1233 { ".fileage table",
1234 "The fileage table",
1235 @ border-spacing: 0;
1236 },
 
 
 
 
1237 { ".fileage td",
1238 "fileage table cells",
1239 @ vertical-align: top;
1240 @ text-align: left;
1241 @ border-top: 1px solid black;
 
1242 },
1243 { ".fileage td:first-child",
1244 "fileage first column (the age)",
1245 @ white-space: nowrap;
1246 },
1247 { ".fileage td:first-child + td",
1248 "fileage second column (the filename)",
1249 @ padding-left: 1em;
1250 @ padding-right: 1em;
 
 
 
 
 
 
1251 },
1252 { 0,
1253 0,
1254 0
1255 }
1256
--- src/style.c
+++ src/style.c
@@ -783,10 +783,15 @@
783 { ".filetree",
784 "tree-view file browser",
785 @ margin: 1em 0;
786 @ line-height: 1.5;
787 },
788 {
789 ".filetree > ul",
790 "tree-view top-level list",
791 @ display: inline-block;
792 },
793 { ".filetree ul",
794 "tree-view lists",
795 @ margin: 0;
796 @ padding: 0;
797 @ list-style: none;
@@ -832,25 +837,32 @@
837 },
838 { ".filetree a",
839 "tree-view links",
840 @ position: relative;
841 @ z-index: 1;
842 @ display: table-cell;
843 @ min-height: 16px;
844 @ padding-left: 21px;
845 @ background-image: url(data:image/gif;base64,R0lGODlhEAAQAJEAAP\/\/\/yEhIf\/\/\/wAAACH5BAEHAAIALAAAAAAQABAAAAIvlIKpxqcfmgOUvoaqDSCxrEEfF14GqFXImJZsu73wepJzVMNxrtNTj3NATMKhpwAAOw==);
846 @ background-position: center left;
847 @ background-repeat: no-repeat;
848 },
849 { "div.filetreeline",
850 "line of a file tree",
851 @ display: table;
852 @ width: 100%;
853 @ white-space: nowrap;
854 },
855 { ".filetree .dir > div.filetreeline > a",
856 "tree-view directory links",
857 @ background-image: url(data:image/gif;base64,R0lGODlhEAAQAJEAAP/WVCIiIv\/\/\/wAAACH5BAEHAAIALAAAAAAQABAAAAInlI9pwa3XYniCgQtkrAFfLXkiFo1jaXpo+jUs6b5Z/K4siDu5RPUFADs=);
858 },
859 { "div.filetreeage",
860 "Last change floating display on the right",
861 @ display: table-cell;
862 @ padding-left: 3em;
863 @ text-align: right;
864 },
865 { "div.filetreeline:hover",
866 "Highlight the line of a file tree",
867 @ background-color: #eee;
868 },
@@ -1232,24 +1244,35 @@
1244 },
1245 { ".fileage table",
1246 "The fileage table",
1247 @ border-spacing: 0;
1248 },
1249 { ".fileage tr:hover",
1250 "Mouse-over effects for the file-age table",
1251 @ background-color: #eee;
1252 },
1253 { ".fileage td",
1254 "fileage table cells",
1255 @ vertical-align: top;
1256 @ text-align: left;
1257 @ border-top: 1px solid #ddd;
1258 @ padding-top: 3px;
1259 },
1260 { ".fileage td:first-child",
1261 "fileage first column (the age)",
1262 @ white-space: nowrap;
1263 },
1264 { ".fileage td:nth-child(2)",
1265 "fileage second column (the filename)",
1266 @ padding-left: 1em;
1267 @ padding-right: 1em;
1268 },
1269 { ".fileage td:nth-child(3)",
1270 "fileage third column (the check-in comment)",
1271 @ word-break: break-all;
1272 @ word-wrap: break-word;
1273 @ max-width: 50%;
1274 },
1275 { 0,
1276 0,
1277 0
1278 }
1279
M win/Makefile.mingw
+17 -1
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -87,11 +87,12 @@
8787
 # This is useful when Tcl has been compiled statically with MinGW.
8888
 #
8989
 FOSSIL_TCL_SOURCE = 1
9090
9191
 #### Check if the workaround for the MinGW command line handling needs to
92
-# be enabled by default.
92
+# be enabled by default. This check may be somewhat fragile due to the
93
+# use of "findstring".
9394
 #
9495
 ifndef MINGW_IS_32BIT_ONLY
9596
 ifeq (,$(findstring w64-mingw32,$(PREFIX)))
9697
 MINGW_IS_32BIT_ONLY = 1
9798
 endif
@@ -100,16 +101,23 @@
100101
 #### The directories where the zlib include and library files are located.
101102
 #
102103
 ZINCDIR = $(SRCDIR)/../compat/zlib
103104
 ZLIBDIR = $(SRCDIR)/../compat/zlib
104105
106
+#### Make an attempt to detect if Fossil is being built for the x64 processor
107
+# architecture. This check may be somewhat fragile due to "findstring".
108
+#
105109
 ifndef X64
106110
 ifneq (,$(findstring x86_64-w64-mingw32,$(PREFIX)))
107111
 X64 = 1
108112
 endif
109113
 endif
110114
115
+#### Determine if the optimized assembly routines provided with zlib should be
116
+# used, taking into account whether zlib is actually enabled and the target
117
+# processor architecture.
118
+#
111119
 ifndef X64
112120
 SSLCONFIG = mingw
113121
 ifndef FOSSIL_ENABLE_MINIZ
114122
 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
115123
 LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
@@ -121,10 +129,18 @@
121129
 SSLCONFIG = mingw64
122130
 ZLIBCONFIG =
123131
 LIBTARGETS =
124132
 endif
125133
134
+#### Disable creation of the OpenSSL shared libraries. Also, disable support
135
+# for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
136
+#
137
+SSLCONFIG += no-ssl2 no-ssl3 no-shared
138
+
139
+#### When using zlib, make sure that OpenSSL is configured to use the zlib
140
+# that Fossil knows about (i.e. the one within the source tree).
141
+#
126142
 ifndef FOSSIL_ENABLE_MINIZ
127143
 SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
128144
 endif
129145
130146
 #### The directories where the OpenSSL include and library files are located.
131147
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -87,11 +87,12 @@
87 # This is useful when Tcl has been compiled statically with MinGW.
88 #
89 FOSSIL_TCL_SOURCE = 1
90
91 #### Check if the workaround for the MinGW command line handling needs to
92 # be enabled by default.
 
93 #
94 ifndef MINGW_IS_32BIT_ONLY
95 ifeq (,$(findstring w64-mingw32,$(PREFIX)))
96 MINGW_IS_32BIT_ONLY = 1
97 endif
@@ -100,16 +101,23 @@
100 #### The directories where the zlib include and library files are located.
101 #
102 ZINCDIR = $(SRCDIR)/../compat/zlib
103 ZLIBDIR = $(SRCDIR)/../compat/zlib
104
 
 
 
105 ifndef X64
106 ifneq (,$(findstring x86_64-w64-mingw32,$(PREFIX)))
107 X64 = 1
108 endif
109 endif
110
 
 
 
 
111 ifndef X64
112 SSLCONFIG = mingw
113 ifndef FOSSIL_ENABLE_MINIZ
114 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
115 LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
@@ -121,10 +129,18 @@
121 SSLCONFIG = mingw64
122 ZLIBCONFIG =
123 LIBTARGETS =
124 endif
125
 
 
 
 
 
 
 
 
126 ifndef FOSSIL_ENABLE_MINIZ
127 SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
128 endif
129
130 #### The directories where the OpenSSL include and library files are located.
131
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -87,11 +87,12 @@
87 # This is useful when Tcl has been compiled statically with MinGW.
88 #
89 FOSSIL_TCL_SOURCE = 1
90
91 #### Check if the workaround for the MinGW command line handling needs to
92 # be enabled by default. This check may be somewhat fragile due to the
93 # use of "findstring".
94 #
95 ifndef MINGW_IS_32BIT_ONLY
96 ifeq (,$(findstring w64-mingw32,$(PREFIX)))
97 MINGW_IS_32BIT_ONLY = 1
98 endif
@@ -100,16 +101,23 @@
101 #### The directories where the zlib include and library files are located.
102 #
103 ZINCDIR = $(SRCDIR)/../compat/zlib
104 ZLIBDIR = $(SRCDIR)/../compat/zlib
105
106 #### Make an attempt to detect if Fossil is being built for the x64 processor
107 # architecture. This check may be somewhat fragile due to "findstring".
108 #
109 ifndef X64
110 ifneq (,$(findstring x86_64-w64-mingw32,$(PREFIX)))
111 X64 = 1
112 endif
113 endif
114
115 #### Determine if the optimized assembly routines provided with zlib should be
116 # used, taking into account whether zlib is actually enabled and the target
117 # processor architecture.
118 #
119 ifndef X64
120 SSLCONFIG = mingw
121 ifndef FOSSIL_ENABLE_MINIZ
122 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
123 LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
@@ -121,10 +129,18 @@
129 SSLCONFIG = mingw64
130 ZLIBCONFIG =
131 LIBTARGETS =
132 endif
133
134 #### Disable creation of the OpenSSL shared libraries. Also, disable support
135 # for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
136 #
137 SSLCONFIG += no-ssl2 no-ssl3 no-shared
138
139 #### When using zlib, make sure that OpenSSL is configured to use the zlib
140 # that Fossil knows about (i.e. the one within the source tree).
141 #
142 ifndef FOSSIL_ENABLE_MINIZ
143 SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
144 endif
145
146 #### The directories where the OpenSSL include and library files are located.
147
M win/Makefile.mingw.mistachkin
+29 -1
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -87,11 +87,12 @@
8787
 # This is useful when Tcl has been compiled statically with MinGW.
8888
 #
8989
 FOSSIL_TCL_SOURCE = 1
9090
9191
 #### Check if the workaround for the MinGW command line handling needs to
92
-# be enabled by default.
92
+# be enabled by default. This check may be somewhat fragile due to the
93
+# use of "findstring".
9394
 #
9495
 ifndef MINGW_IS_32BIT_ONLY
9596
 ifeq (,$(findstring w64-mingw32,$(PREFIX)))
9697
 MINGW_IS_32BIT_ONLY = 1
9798
 endif
@@ -100,16 +101,23 @@
100101
 #### The directories where the zlib include and library files are located.
101102
 #
102103
 ZINCDIR = $(SRCDIR)/../compat/zlib
103104
 ZLIBDIR = $(SRCDIR)/../compat/zlib
104105
106
+#### Make an attempt to detect if Fossil is being built for the x64 processor
107
+# architecture. This check may be somewhat fragile due to "findstring".
108
+#
105109
 ifndef X64
106110
 ifneq (,$(findstring x86_64-w64-mingw32,$(PREFIX)))
107111
 X64 = 1
108112
 endif
109113
 endif
110114
115
+#### Determine if the optimized assembly routines provided with zlib should be
116
+# used, taking into account whether zlib is actually enabled and the target
117
+# processor architecture.
118
+#
111119
 ifndef X64
112120
 SSLCONFIG = mingw
113121
 ifndef FOSSIL_ENABLE_MINIZ
114122
 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
115123
 LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
@@ -121,10 +129,18 @@
121129
 SSLCONFIG = mingw64
122130
 ZLIBCONFIG =
123131
 LIBTARGETS =
124132
 endif
125133
134
+#### Disable creation of the OpenSSL shared libraries. Also, disable support
135
+# for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
136
+#
137
+SSLCONFIG += no-ssl2 no-ssl3 no-shared
138
+
139
+#### When using zlib, make sure that OpenSSL is configured to use the zlib
140
+# that Fossil knows about (i.e. the one within the source tree).
141
+#
126142
 ifndef FOSSIL_ENABLE_MINIZ
127143
 SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
128144
 endif
129145
130146
 #### The directories where the OpenSSL include and library files are located.
@@ -435,10 +451,11 @@
435451
 $(SRCDIR)/schema.c \
436452
 $(SRCDIR)/search.c \
437453
 $(SRCDIR)/setup.c \
438454
 $(SRCDIR)/sha1.c \
439455
 $(SRCDIR)/shun.c \
456
+ $(SRCDIR)/sitemap.c \
440457
 $(SRCDIR)/skins.c \
441458
 $(SRCDIR)/sqlcmd.c \
442459
 $(SRCDIR)/stash.c \
443460
 $(SRCDIR)/stat.c \
444461
 $(SRCDIR)/style.c \
@@ -556,10 +573,11 @@
556573
 $(OBJDIR)/schema_.c \
557574
 $(OBJDIR)/search_.c \
558575
 $(OBJDIR)/setup_.c \
559576
 $(OBJDIR)/sha1_.c \
560577
 $(OBJDIR)/shun_.c \
578
+ $(OBJDIR)/sitemap_.c \
561579
 $(OBJDIR)/skins_.c \
562580
 $(OBJDIR)/sqlcmd_.c \
563581
 $(OBJDIR)/stash_.c \
564582
 $(OBJDIR)/stat_.c \
565583
 $(OBJDIR)/style_.c \
@@ -674,10 +692,11 @@
674692
 $(OBJDIR)/schema.o \
675693
 $(OBJDIR)/search.o \
676694
 $(OBJDIR)/setup.o \
677695
 $(OBJDIR)/sha1.o \
678696
 $(OBJDIR)/shun.o \
697
+ $(OBJDIR)/sitemap.o \
679698
 $(OBJDIR)/skins.o \
680699
 $(OBJDIR)/sqlcmd.o \
681700
 $(OBJDIR)/stash.o \
682701
 $(OBJDIR)/stat.o \
683702
 $(OBJDIR)/style.o \
@@ -985,10 +1004,11 @@
9851004
 $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h \
9861005
 $(OBJDIR)/search_.c:$(OBJDIR)/search.h \
9871006
 $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h \
9881007
 $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h \
9891008
 $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h \
1009
+ $(OBJDIR)/sitemap_.c:$(OBJDIR)/sitemap.h \
9901010
 $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h \
9911011
 $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h \
9921012
 $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h \
9931013
 $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h \
9941014
 $(OBJDIR)/style_.c:$(OBJDIR)/style.h \
@@ -1718,10 +1738,18 @@
17181738
17191739
 $(OBJDIR)/shun.o: $(OBJDIR)/shun_.c $(OBJDIR)/shun.h $(SRCDIR)/config.h
17201740
 $(XTCC) -o $(OBJDIR)/shun.o -c $(OBJDIR)/shun_.c
17211741
17221742
 $(OBJDIR)/shun.h: $(OBJDIR)/headers
1743
+
1744
+$(OBJDIR)/sitemap_.c: $(SRCDIR)/sitemap.c $(TRANSLATE)
1745
+ $(TRANSLATE) $(SRCDIR)/sitemap.c >$@
1746
+
1747
+$(OBJDIR)/sitemap.o: $(OBJDIR)/sitemap_.c $(OBJDIR)/sitemap.h $(SRCDIR)/config.h
1748
+ $(XTCC) -o $(OBJDIR)/sitemap.o -c $(OBJDIR)/sitemap_.c
1749
+
1750
+$(OBJDIR)/sitemap.h: $(OBJDIR)/headers
17231751
17241752
 $(OBJDIR)/skins_.c: $(SRCDIR)/skins.c $(TRANSLATE)
17251753
 $(TRANSLATE) $(SRCDIR)/skins.c >$@
17261754
17271755
 $(OBJDIR)/skins.o: $(OBJDIR)/skins_.c $(OBJDIR)/skins.h $(SRCDIR)/config.h
17281756
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -87,11 +87,12 @@
87 # This is useful when Tcl has been compiled statically with MinGW.
88 #
89 FOSSIL_TCL_SOURCE = 1
90
91 #### Check if the workaround for the MinGW command line handling needs to
92 # be enabled by default.
 
93 #
94 ifndef MINGW_IS_32BIT_ONLY
95 ifeq (,$(findstring w64-mingw32,$(PREFIX)))
96 MINGW_IS_32BIT_ONLY = 1
97 endif
@@ -100,16 +101,23 @@
100 #### The directories where the zlib include and library files are located.
101 #
102 ZINCDIR = $(SRCDIR)/../compat/zlib
103 ZLIBDIR = $(SRCDIR)/../compat/zlib
104
 
 
 
105 ifndef X64
106 ifneq (,$(findstring x86_64-w64-mingw32,$(PREFIX)))
107 X64 = 1
108 endif
109 endif
110
 
 
 
 
111 ifndef X64
112 SSLCONFIG = mingw
113 ifndef FOSSIL_ENABLE_MINIZ
114 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
115 LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
@@ -121,10 +129,18 @@
121 SSLCONFIG = mingw64
122 ZLIBCONFIG =
123 LIBTARGETS =
124 endif
125
 
 
 
 
 
 
 
 
126 ifndef FOSSIL_ENABLE_MINIZ
127 SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
128 endif
129
130 #### The directories where the OpenSSL include and library files are located.
@@ -435,10 +451,11 @@
435 $(SRCDIR)/schema.c \
436 $(SRCDIR)/search.c \
437 $(SRCDIR)/setup.c \
438 $(SRCDIR)/sha1.c \
439 $(SRCDIR)/shun.c \
 
440 $(SRCDIR)/skins.c \
441 $(SRCDIR)/sqlcmd.c \
442 $(SRCDIR)/stash.c \
443 $(SRCDIR)/stat.c \
444 $(SRCDIR)/style.c \
@@ -556,10 +573,11 @@
556 $(OBJDIR)/schema_.c \
557 $(OBJDIR)/search_.c \
558 $(OBJDIR)/setup_.c \
559 $(OBJDIR)/sha1_.c \
560 $(OBJDIR)/shun_.c \
 
561 $(OBJDIR)/skins_.c \
562 $(OBJDIR)/sqlcmd_.c \
563 $(OBJDIR)/stash_.c \
564 $(OBJDIR)/stat_.c \
565 $(OBJDIR)/style_.c \
@@ -674,10 +692,11 @@
674 $(OBJDIR)/schema.o \
675 $(OBJDIR)/search.o \
676 $(OBJDIR)/setup.o \
677 $(OBJDIR)/sha1.o \
678 $(OBJDIR)/shun.o \
 
679 $(OBJDIR)/skins.o \
680 $(OBJDIR)/sqlcmd.o \
681 $(OBJDIR)/stash.o \
682 $(OBJDIR)/stat.o \
683 $(OBJDIR)/style.o \
@@ -985,10 +1004,11 @@
985 $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h \
986 $(OBJDIR)/search_.c:$(OBJDIR)/search.h \
987 $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h \
988 $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h \
989 $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h \
 
990 $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h \
991 $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h \
992 $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h \
993 $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h \
994 $(OBJDIR)/style_.c:$(OBJDIR)/style.h \
@@ -1718,10 +1738,18 @@
1718
1719 $(OBJDIR)/shun.o: $(OBJDIR)/shun_.c $(OBJDIR)/shun.h $(SRCDIR)/config.h
1720 $(XTCC) -o $(OBJDIR)/shun.o -c $(OBJDIR)/shun_.c
1721
1722 $(OBJDIR)/shun.h: $(OBJDIR)/headers
 
 
 
 
 
 
 
 
1723
1724 $(OBJDIR)/skins_.c: $(SRCDIR)/skins.c $(TRANSLATE)
1725 $(TRANSLATE) $(SRCDIR)/skins.c >$@
1726
1727 $(OBJDIR)/skins.o: $(OBJDIR)/skins_.c $(OBJDIR)/skins.h $(SRCDIR)/config.h
1728
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -87,11 +87,12 @@
87 # This is useful when Tcl has been compiled statically with MinGW.
88 #
89 FOSSIL_TCL_SOURCE = 1
90
91 #### Check if the workaround for the MinGW command line handling needs to
92 # be enabled by default. This check may be somewhat fragile due to the
93 # use of "findstring".
94 #
95 ifndef MINGW_IS_32BIT_ONLY
96 ifeq (,$(findstring w64-mingw32,$(PREFIX)))
97 MINGW_IS_32BIT_ONLY = 1
98 endif
@@ -100,16 +101,23 @@
101 #### The directories where the zlib include and library files are located.
102 #
103 ZINCDIR = $(SRCDIR)/../compat/zlib
104 ZLIBDIR = $(SRCDIR)/../compat/zlib
105
106 #### Make an attempt to detect if Fossil is being built for the x64 processor
107 # architecture. This check may be somewhat fragile due to "findstring".
108 #
109 ifndef X64
110 ifneq (,$(findstring x86_64-w64-mingw32,$(PREFIX)))
111 X64 = 1
112 endif
113 endif
114
115 #### Determine if the optimized assembly routines provided with zlib should be
116 # used, taking into account whether zlib is actually enabled and the target
117 # processor architecture.
118 #
119 ifndef X64
120 SSLCONFIG = mingw
121 ifndef FOSSIL_ENABLE_MINIZ
122 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
123 LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
@@ -121,10 +129,18 @@
129 SSLCONFIG = mingw64
130 ZLIBCONFIG =
131 LIBTARGETS =
132 endif
133
134 #### Disable creation of the OpenSSL shared libraries. Also, disable support
135 # for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
136 #
137 SSLCONFIG += no-ssl2 no-ssl3 no-shared
138
139 #### When using zlib, make sure that OpenSSL is configured to use the zlib
140 # that Fossil knows about (i.e. the one within the source tree).
141 #
142 ifndef FOSSIL_ENABLE_MINIZ
143 SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
144 endif
145
146 #### The directories where the OpenSSL include and library files are located.
@@ -435,10 +451,11 @@
451 $(SRCDIR)/schema.c \
452 $(SRCDIR)/search.c \
453 $(SRCDIR)/setup.c \
454 $(SRCDIR)/sha1.c \
455 $(SRCDIR)/shun.c \
456 $(SRCDIR)/sitemap.c \
457 $(SRCDIR)/skins.c \
458 $(SRCDIR)/sqlcmd.c \
459 $(SRCDIR)/stash.c \
460 $(SRCDIR)/stat.c \
461 $(SRCDIR)/style.c \
@@ -556,10 +573,11 @@
573 $(OBJDIR)/schema_.c \
574 $(OBJDIR)/search_.c \
575 $(OBJDIR)/setup_.c \
576 $(OBJDIR)/sha1_.c \
577 $(OBJDIR)/shun_.c \
578 $(OBJDIR)/sitemap_.c \
579 $(OBJDIR)/skins_.c \
580 $(OBJDIR)/sqlcmd_.c \
581 $(OBJDIR)/stash_.c \
582 $(OBJDIR)/stat_.c \
583 $(OBJDIR)/style_.c \
@@ -674,10 +692,11 @@
692 $(OBJDIR)/schema.o \
693 $(OBJDIR)/search.o \
694 $(OBJDIR)/setup.o \
695 $(OBJDIR)/sha1.o \
696 $(OBJDIR)/shun.o \
697 $(OBJDIR)/sitemap.o \
698 $(OBJDIR)/skins.o \
699 $(OBJDIR)/sqlcmd.o \
700 $(OBJDIR)/stash.o \
701 $(OBJDIR)/stat.o \
702 $(OBJDIR)/style.o \
@@ -985,10 +1004,11 @@
1004 $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h \
1005 $(OBJDIR)/search_.c:$(OBJDIR)/search.h \
1006 $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h \
1007 $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h \
1008 $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h \
1009 $(OBJDIR)/sitemap_.c:$(OBJDIR)/sitemap.h \
1010 $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h \
1011 $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h \
1012 $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h \
1013 $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h \
1014 $(OBJDIR)/style_.c:$(OBJDIR)/style.h \
@@ -1718,10 +1738,18 @@
1738
1739 $(OBJDIR)/shun.o: $(OBJDIR)/shun_.c $(OBJDIR)/shun.h $(SRCDIR)/config.h
1740 $(XTCC) -o $(OBJDIR)/shun.o -c $(OBJDIR)/shun_.c
1741
1742 $(OBJDIR)/shun.h: $(OBJDIR)/headers
1743
1744 $(OBJDIR)/sitemap_.c: $(SRCDIR)/sitemap.c $(TRANSLATE)
1745 $(TRANSLATE) $(SRCDIR)/sitemap.c >$@
1746
1747 $(OBJDIR)/sitemap.o: $(OBJDIR)/sitemap_.c $(OBJDIR)/sitemap.h $(SRCDIR)/config.h
1748 $(XTCC) -o $(OBJDIR)/sitemap.o -c $(OBJDIR)/sitemap_.c
1749
1750 $(OBJDIR)/sitemap.h: $(OBJDIR)/headers
1751
1752 $(OBJDIR)/skins_.c: $(SRCDIR)/skins.c $(TRANSLATE)
1753 $(TRANSLATE) $(SRCDIR)/skins.c >$@
1754
1755 $(OBJDIR)/skins.o: $(OBJDIR)/skins_.c $(OBJDIR)/skins.h $(SRCDIR)/config.h
1756
M win/Makefile.msc
+14 -5
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -62,23 +62,32 @@
6262
 SSLLIBDIR = $(SSLDIR)\out32
6363
 SSLLFLAGS = /nologo /opt:ref /debug
6464
 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
6565
 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
6666
 !message Using 'x64' platform for OpenSSL...
67
-SSLCONFIG = VC-WIN64A no-asm
67
+# BUGBUG (OpenSSL): Apparently, using "no-ssl*" here breaks the build.
68
+# SSLCONFIG = VC-WIN64A no-asm no-ssl2 no-ssl3 no-shared
69
+SSLCONFIG = VC-WIN64A no-asm no-shared
6870
 SSLSETUP = ms\do_win64a.bat
6971
 SSLNMAKE = ms\nt.mak all
72
+SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
7073
 !elseif "$(PLATFORM)"=="ia64"
7174
 !message Using 'ia64' platform for OpenSSL...
72
-SSLCONFIG = VC-WIN64I no-asm
75
+# BUGBUG (OpenSSL): Apparently, using "no-ssl*" here breaks the build.
76
+# SSLCONFIG = VC-WIN64I no-asm no-ssl2 no-ssl3 no-shared
77
+SSLCONFIG = VC-WIN64I no-asm no-shared
7378
 SSLSETUP = ms\do_win64i.bat
7479
 SSLNMAKE = ms\nt.mak all
80
+SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
7581
 !else
7682
 !message Assuming 'x86' platform for OpenSSL...
77
-SSLCONFIG = VC-WIN32 no-asm
83
+# BUGBUG (OpenSSL): Apparently, using "no-ssl*" here breaks the build.
84
+# SSLCONFIG = VC-WIN32 no-asm no-ssl2 no-ssl3 no-shared
85
+SSLCONFIG = VC-WIN32 no-asm no-shared
7886
 SSLSETUP = ms\do_ms.bat
7987
 SSLNMAKE = ms\nt.mak all
88
+SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
8089
 !endif
8190
 !endif
8291
8392
 !ifdef FOSSIL_ENABLE_TCL
8493
 TCLDIR = $(B)\compat\tcl-8.6
@@ -467,13 +476,13 @@
467476
 @set PATH=$(PERLDIR);$(PATH)
468477
 !endif
469478
 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
470479
 @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
471480
 !ifdef FOSSIL_ENABLE_WINXP
472
- @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
481
+ @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS) $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
473482
 !else
474
- @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) && popd
483
+ @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS)" && popd
475484
 !endif
476485
 !endif
477486
478487
 !ifndef FOSSIL_ENABLE_MINIZ
479488
 APPTARGETS = $(APPTARGETS) zlib
480489
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -62,23 +62,32 @@
62 SSLLIBDIR = $(SSLDIR)\out32
63 SSLLFLAGS = /nologo /opt:ref /debug
64 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
65 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
66 !message Using 'x64' platform for OpenSSL...
67 SSLCONFIG = VC-WIN64A no-asm
 
 
68 SSLSETUP = ms\do_win64a.bat
69 SSLNMAKE = ms\nt.mak all
 
70 !elseif "$(PLATFORM)"=="ia64"
71 !message Using 'ia64' platform for OpenSSL...
72 SSLCONFIG = VC-WIN64I no-asm
 
 
73 SSLSETUP = ms\do_win64i.bat
74 SSLNMAKE = ms\nt.mak all
 
75 !else
76 !message Assuming 'x86' platform for OpenSSL...
77 SSLCONFIG = VC-WIN32 no-asm
 
 
78 SSLSETUP = ms\do_ms.bat
79 SSLNMAKE = ms\nt.mak all
 
80 !endif
81 !endif
82
83 !ifdef FOSSIL_ENABLE_TCL
84 TCLDIR = $(B)\compat\tcl-8.6
@@ -467,13 +476,13 @@
467 @set PATH=$(PERLDIR);$(PATH)
468 !endif
469 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
470 @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
471 !ifdef FOSSIL_ENABLE_WINXP
472 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
473 !else
474 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) && popd
475 !endif
476 !endif
477
478 !ifndef FOSSIL_ENABLE_MINIZ
479 APPTARGETS = $(APPTARGETS) zlib
480
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -62,23 +62,32 @@
62 SSLLIBDIR = $(SSLDIR)\out32
63 SSLLFLAGS = /nologo /opt:ref /debug
64 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
65 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
66 !message Using 'x64' platform for OpenSSL...
67 # BUGBUG (OpenSSL): Apparently, using "no-ssl*" here breaks the build.
68 # SSLCONFIG = VC-WIN64A no-asm no-ssl2 no-ssl3 no-shared
69 SSLCONFIG = VC-WIN64A no-asm no-shared
70 SSLSETUP = ms\do_win64a.bat
71 SSLNMAKE = ms\nt.mak all
72 SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
73 !elseif "$(PLATFORM)"=="ia64"
74 !message Using 'ia64' platform for OpenSSL...
75 # BUGBUG (OpenSSL): Apparently, using "no-ssl*" here breaks the build.
76 # SSLCONFIG = VC-WIN64I no-asm no-ssl2 no-ssl3 no-shared
77 SSLCONFIG = VC-WIN64I no-asm no-shared
78 SSLSETUP = ms\do_win64i.bat
79 SSLNMAKE = ms\nt.mak all
80 SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
81 !else
82 !message Assuming 'x86' platform for OpenSSL...
83 # BUGBUG (OpenSSL): Apparently, using "no-ssl*" here breaks the build.
84 # SSLCONFIG = VC-WIN32 no-asm no-ssl2 no-ssl3 no-shared
85 SSLCONFIG = VC-WIN32 no-asm no-shared
86 SSLSETUP = ms\do_ms.bat
87 SSLNMAKE = ms\nt.mak all
88 SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
89 !endif
90 !endif
91
92 !ifdef FOSSIL_ENABLE_TCL
93 TCLDIR = $(B)\compat\tcl-8.6
@@ -467,13 +476,13 @@
476 @set PATH=$(PERLDIR);$(PATH)
477 !endif
478 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
479 @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
480 !ifdef FOSSIL_ENABLE_WINXP
481 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS) $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
482 !else
483 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS)" && popd
484 !endif
485 !endif
486
487 !ifndef FOSSIL_ENABLE_MINIZ
488 APPTARGETS = $(APPTARGETS) zlib
489
M www/concepts.wiki
+1 -1
--- www/concepts.wiki
+++ www/concepts.wiki
@@ -405,11 +405,11 @@
405405
 can do pushes or pulls against your server. Use the <b>--port</b>
406406
 option to the server command to specify a different TCP port. If
407407
 you do not have a local source tree, use the <b>-R</b> command-line
408408
 option to specify the repository file.
409409
410
-A stand-alone server is a great way to set of transient connections
410
+The "fossil server" command is a great way to set of transient connections
411411
 between coworkers for doing quick pushes or pulls. But you can also
412412
 set up a permanent stand-alone server if you prefer. Just make
413413
 arrangements for fossil to be launched with appropriate arguments
414414
 after every reboot.
415415
416416
--- www/concepts.wiki
+++ www/concepts.wiki
@@ -405,11 +405,11 @@
405 can do pushes or pulls against your server. Use the <b>--port</b>
406 option to the server command to specify a different TCP port. If
407 you do not have a local source tree, use the <b>-R</b> command-line
408 option to specify the repository file.
409
410 A stand-alone server is a great way to set of transient connections
411 between coworkers for doing quick pushes or pulls. But you can also
412 set up a permanent stand-alone server if you prefer. Just make
413 arrangements for fossil to be launched with appropriate arguments
414 after every reboot.
415
416
--- www/concepts.wiki
+++ www/concepts.wiki
@@ -405,11 +405,11 @@
405 can do pushes or pulls against your server. Use the <b>--port</b>
406 option to the server command to specify a different TCP port. If
407 you do not have a local source tree, use the <b>-R</b> command-line
408 option to specify the repository file.
409
410 The "fossil server" command is a great way to set of transient connections
411 between coworkers for doing quick pushes or pulls. But you can also
412 set up a permanent stand-alone server if you prefer. Just make
413 arrangements for fossil to be launched with appropriate arguments
414 after every reboot.
415
416
M www/foss-cklist.wiki
+1 -1
--- www/foss-cklist.wiki
+++ www/foss-cklist.wiki
@@ -5,11 +5,11 @@
55
 blog post <a href="http://spot.livejournal.com/308370.html">
66
 http://spot.livejournal.com/308370.html</a> (see also
77
 <a href="http://www.theopensourceway.org/book/The_Open_Source_Way-How_to_tell_if_a_FLOSS_project_is_doomed_to_FAIL.html">[1]</a> and
88
 <a href="https://www.theopensourceway.org/wiki/How_to_tell_if_a_FLOSS_project_is_doomed_to_FAIL">[2]</a>).
99
 Tom's original post assigned point scores to the various elements and
10
-by adding together the individual points, the reader is suppose to be able
10
+by adding together the individual points, the reader is supposed to be able
1111
 to judge the likelihood that the project will fail.
1212
 The point scores, and the items on the list, clearly reflect Tom's
1313
 biases and are not necessarily those of the larger open-source community.
1414
 Nevertheless, the policy of the Fossil shall be to strive for a perfect
1515
 score.</p>
1616
--- www/foss-cklist.wiki
+++ www/foss-cklist.wiki
@@ -5,11 +5,11 @@
5 blog post <a href="http://spot.livejournal.com/308370.html">
6 http://spot.livejournal.com/308370.html</a> (see also
7 <a href="http://www.theopensourceway.org/book/The_Open_Source_Way-How_to_tell_if_a_FLOSS_project_is_doomed_to_FAIL.html">[1]</a> and
8 <a href="https://www.theopensourceway.org/wiki/How_to_tell_if_a_FLOSS_project_is_doomed_to_FAIL">[2]</a>).
9 Tom's original post assigned point scores to the various elements and
10 by adding together the individual points, the reader is suppose to be able
11 to judge the likelihood that the project will fail.
12 The point scores, and the items on the list, clearly reflect Tom's
13 biases and are not necessarily those of the larger open-source community.
14 Nevertheless, the policy of the Fossil shall be to strive for a perfect
15 score.</p>
16
--- www/foss-cklist.wiki
+++ www/foss-cklist.wiki
@@ -5,11 +5,11 @@
5 blog post <a href="http://spot.livejournal.com/308370.html">
6 http://spot.livejournal.com/308370.html</a> (see also
7 <a href="http://www.theopensourceway.org/book/The_Open_Source_Way-How_to_tell_if_a_FLOSS_project_is_doomed_to_FAIL.html">[1]</a> and
8 <a href="https://www.theopensourceway.org/wiki/How_to_tell_if_a_FLOSS_project_is_doomed_to_FAIL">[2]</a>).
9 Tom's original post assigned point scores to the various elements and
10 by adding together the individual points, the reader is supposed to be able
11 to judge the likelihood that the project will fail.
12 The point scores, and the items on the list, clearly reflect Tom's
13 biases and are not necessarily those of the larger open-source community.
14 Nevertheless, the policy of the Fossil shall be to strive for a perfect
15 score.</p>
16
M www/fossil-v-git.wiki
+1 -1
--- www/fossil-v-git.wiki
+++ www/fossil-v-git.wiki
@@ -185,11 +185,11 @@
185185
 between repositories and working checkouts. A power-loss or system crash
186186
 in the middle of Git operation can damage or corrupt the Git repository.
187187
188188
 A Fossil repository consists of a single disk file. A single Fossil
189189
 repository can serve multiple simultaneous working checkouts.
190
-A Fossil repository is an SQLite database, so it highly resistant
190
+A Fossil repository is an SQLite database, so it is highly resistant
191191
 to damage from a power-loss or system crash - incomplete transactions
192192
 are simply rolled back after the system reboots.
193193
194194
 <h3>3.8 Audit Trail</h3>
195195
196196
--- www/fossil-v-git.wiki
+++ www/fossil-v-git.wiki
@@ -185,11 +185,11 @@
185 between repositories and working checkouts. A power-loss or system crash
186 in the middle of Git operation can damage or corrupt the Git repository.
187
188 A Fossil repository consists of a single disk file. A single Fossil
189 repository can serve multiple simultaneous working checkouts.
190 A Fossil repository is an SQLite database, so it highly resistant
191 to damage from a power-loss or system crash - incomplete transactions
192 are simply rolled back after the system reboots.
193
194 <h3>3.8 Audit Trail</h3>
195
196
--- www/fossil-v-git.wiki
+++ www/fossil-v-git.wiki
@@ -185,11 +185,11 @@
185 between repositories and working checkouts. A power-loss or system crash
186 in the middle of Git operation can damage or corrupt the Git repository.
187
188 A Fossil repository consists of a single disk file. A single Fossil
189 repository can serve multiple simultaneous working checkouts.
190 A Fossil repository is an SQLite database, so it is highly resistant
191 to damage from a power-loss or system crash - incomplete transactions
192 are simply rolled back after the system reboots.
193
194 <h3>3.8 Audit Trail</h3>
195
196
M www/server.wiki
+1 -1
--- www/server.wiki
+++ www/server.wiki
@@ -70,11 +70,11 @@
7070
 need to modify the pathnames for your particular setup.
7171
 The final argument is either the name of the fossil repository to be served,
7272
 or a directory containing multiple repositories.
7373
 </p>
7474
 <p>
75
-If you system is running xinetd, then the configuration is likely to be
75
+If your system is running xinetd, then the configuration is likely to be
7676
 in the file "/etc/xinetd.conf" or in a subfile of "/etc/xinetd.d".
7777
 An xinetd configuration file will appear like this:</p>
7878
 <blockquote>
7979
 <pre>
8080
 service http-alt
8181
--- www/server.wiki
+++ www/server.wiki
@@ -70,11 +70,11 @@
70 need to modify the pathnames for your particular setup.
71 The final argument is either the name of the fossil repository to be served,
72 or a directory containing multiple repositories.
73 </p>
74 <p>
75 If you system is running xinetd, then the configuration is likely to be
76 in the file "/etc/xinetd.conf" or in a subfile of "/etc/xinetd.d".
77 An xinetd configuration file will appear like this:</p>
78 <blockquote>
79 <pre>
80 service http-alt
81
--- www/server.wiki
+++ www/server.wiki
@@ -70,11 +70,11 @@
70 need to modify the pathnames for your particular setup.
71 The final argument is either the name of the fossil repository to be served,
72 or a directory containing multiple repositories.
73 </p>
74 <p>
75 If your system is running xinetd, then the configuration is likely to be
76 in the file "/etc/xinetd.conf" or in a subfile of "/etc/xinetd.d".
77 An xinetd configuration file will appear like this:</p>
78 <blockquote>
79 <pre>
80 service http-alt
81

Keyboard Shortcuts

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