39decf0ddfb… — Fossil SCM

M src/browse.c

+1 -1

		--- src/browse.c
		+++ src/browse.c
		@@ -760,11 +760,11 @@
760	760	nDir++;
761	761	}else if( !showDirOnly ){
762	762	const char *zFileClass = fileext_class(p->zName);
763	763	char *zLink;
764	764	if( zCI ){
765		- zLink = href("%R/artifact/%s",p->zUuid);
	765	+ zLink = href("%R/artifact/%.16s",p->zUuid);
766	766	}else{
767	767	zLink = href("%R/finfo?name=%T",p->zFullName);
768	768	}
769	769	@ <li class="%z(zFileClass)%s(zLastClass)"><div class="filetreeline">
770	770	@ %z(zLink)%h(p->zName)</a>
771	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/%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 @@
342	342	** case of most /getfile calls for specific versions, the only way the
343	343	** content changes is if someone breaks the SCM. And if that happens, a
344	344	** stale cache is the least of the problem. So we provide an Expires
345	345	** header set to a reasonable period (default: one week).
346	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));
	347	+ fprintf(g.httpOut, "Cache-control: max-age=28800\r\n");
350	348	}else{
351	349	fprintf(g.httpOut, "Cache-control: no-cache\r\n");
352	350	}
353	351
354	352	/* Content intended for logged in users should only be cached in
355	353

	--- 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 @@
285	285	g.zHttpAuth = prompt_for_httpauth_creds();
286	286	transport_close(&g.url);
287	287	return http_exchange(pSend, pReply, useLogin, maxRedirect);
288	288	}
289	289	}
290		- if( rc!=200 && rc!=302 ){
	290	+ if( rc!=200 && rc!=301 && rc!=302 ){
291	291	int ii;
292	292	for(ii=7; zLine[ii] && zLine[ii]!=' '; ii++){}
293	293	while( zLine[ii]==' ' ) ii++;
294	294	fossil_warning("server says: %s", &zLine[ii]);
295	295	goto write_err;
		@@ -299,11 +299,11 @@
299	299	}else{
300	300	closeConnection = 0;
301	301	}
302	302	}else if( g.url.isSsh && fossil_strnicmp(zLine, "status:", 7)==0 ){
303	303	if( sscanf(zLine, "Status: %d", &rc)!=1 ) goto write_err;
304		- if( rc!=200 && rc!=302 ){
	304	+ if( rc!=200 && rc!=301 && rc!=302 ){
305	305	int ii;
306	306	for(ii=7; zLine[ii] && zLine[ii]!=' '; ii++){}
307	307	while( zLine[ii]==' ' ) ii++;
308	308	fossil_warning("server says: %s", &zLine[ii]);
309	309	goto write_err;
		@@ -319,11 +319,12 @@
319	319	if( c=='c' \|\| c=='C' ){
320	320	closeConnection = 1;
321	321	}else if( c=='k' \|\| c=='K' ){
322	322	closeConnection = 0;
323	323	}
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 ){
325	326	int i, j;
326	327
327	328	if ( --maxRedirect == 0){
328	329	fossil_warning("redirect limit exceeded");
329	330	goto write_err;
		@@ -338,11 +339,11 @@
338	339	j -= 4;
339	340	zLine[j] = 0;
340	341	}
341	342	transport_close(&g.url);
342	343	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]);
344	345	url_parse(&zLine[i], 0);
345	346	fSeenHttpAuth = 0;
346	347	if( g.zHttpAuth ) free(g.zHttpAuth);
347	348	g.zHttpAuth = get_httpauth();
348	349	return http_exchange(pSend, pReply, useLogin, maxRedirect);
		@@ -360,11 +361,11 @@
360	361	if( iLength<0 ){
361	362	fossil_warning("server did not reply");
362	363	goto write_err;
363	364	}
364	365	if( rc!=200 ){
365		- fossil_warning("\"location:\" missing from 302 redirect reply");
	366	+ fossil_warning("\"location:\" missing from %d redirect reply", rc);
366	367	goto write_err;
367	368	}
368	369
369	370	/*
370	371	** Extract the reply payload that follows the header
371	372

	--- 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 @@
99	99	SSL_library_init();
100	100	SSL_load_error_strings();
101	101	ERR_load_BIO_strings();
102	102	OpenSSL_add_all_algorithms();
103	103	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);
106	106
107	107	/* Set up acceptable CA root certificates */
108	108	zCaSetting = db_get("ssl-ca-location", 0);
109	109	if( zCaSetting==0 \|\| zCaSetting[0]=='\0' ){
110	110	/* CA location not specified, use platform's default certificate store */
111	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 */
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 @@
88	88	db_multi_exec("%s", zSql /safe-for-%s/);
89	89	}
90	90
91	91	/*
92	92	** 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.
94	95	*/
95	96	char const * json_timeline_query(void){
96	97	/* Field order MUST match that from json_timeline_temp_table()!!! */
97	98	static const char zBaseSql[] =
98	99	@ SELECT
99	100	@ NULL,
100	101	@ blob.rid,
101	102	@ uuid,
102		- @ CAST(strftime('%%s',event.mtime) AS INTEGER),
	103	+ @ CAST(strftime('%s',event.mtime) AS INTEGER),
103	104	@ datetime(event.mtime),
104	105	@ coalesce(ecomment, comment),
105	106	@ coalesce(euser, user),
106	107	@ blob.rid IN leaf,
107	108	@ bgcolor,
		@@ -544,12 +545,11 @@
544	545	goto error;
545	546	}
546	547
547	548	#if 0
548	549	/* 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))));
551	551	#endif
552	552	db_multi_exec("%s", blob_buffer(&sql) /safe-for-%s/);
553	553	blob_reset(&sql);
554	554	db_prepare(&q, "SELECT"
555	555	" uuid AS uuid,"
556	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.

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
		@@ -513,11 +513,12 @@
513	513	# This is useful when Tcl has been compiled statically with MinGW.
514	514	#
515	515	FOSSIL_TCL_SOURCE = 1
516	516
517	517	#### Check if the workaround for the MinGW command line handling needs to
518		-# be enabled by default.
	518	+# be enabled by default. This check may be somewhat fragile due to the
	519	+# use of "findstring".
519	520	#
520	521	ifndef MINGW_IS_32BIT_ONLY
521	522	ifeq (,$(findstring w64-mingw32,$(PREFIX)))
522	523	MINGW_IS_32BIT_ONLY = 1
523	524	endif
		@@ -526,16 +527,23 @@
526	527	#### The directories where the zlib include and library files are located.
527	528	#
528	529	ZINCDIR = $(SRCDIR)/../compat/zlib
529	530	ZLIBDIR = $(SRCDIR)/../compat/zlib
530	531
	532	+#### Make an attempt to detect if Fossil is being built for the x64 processor
	533	+# architecture. This check may be somewhat fragile due to "findstring".
	534	+#
531	535	ifndef X64
532	536	ifneq (,$(findstring x86_64-w64-mingw32,$(PREFIX)))
533	537	X64 = 1
534	538	endif
535	539	endif
536	540
	541	+#### Determine if the optimized assembly routines provided with zlib should be
	542	+# used, taking into account whether zlib is actually enabled and the target
	543	+# processor architecture.
	544	+#
537	545	ifndef X64
538	546	SSLCONFIG = mingw
539	547	ifndef FOSSIL_ENABLE_MINIZ
540	548	ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
541	549	LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
		@@ -547,10 +555,18 @@
547	555	SSLCONFIG = mingw64
548	556	ZLIBCONFIG =
549	557	LIBTARGETS =
550	558	endif
551	559
	560	+#### Disable creation of the OpenSSL shared libraries. Also, disable support
	561	+# for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
	562	+#
	563	+SSLCONFIG += no-ssl2 no-ssl3 no-shared
	564	+
	565	+#### When using zlib, make sure that OpenSSL is configured to use the zlib
	566	+# that Fossil knows about (i.e. the one within the source tree).
	567	+#
552	568	ifndef FOSSIL_ENABLE_MINIZ
553	569	SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
554	570	endif
555	571
556	572	#### The directories where the OpenSSL include and library files are located.
		@@ -1295,23 +1311,32 @@
1295	1311	SSLLIBDIR = $(SSLDIR)\out32
1296	1312	SSLLFLAGS = /nologo /opt:ref /debug
1297	1313	SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1298	1314	!if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
1299	1315	!message Using 'x64' platform for OpenSSL...
1300		-SSLCONFIG = VC-WIN64A no-asm
	1316	+# BUGBUG (OpenSSL): Apparently, using "no-ssl*" here breaks the build.
	1317	+# SSLCONFIG = VC-WIN64A no-asm no-ssl2 no-ssl3 no-shared
	1318	+SSLCONFIG = VC-WIN64A no-asm no-shared
1301	1319	SSLSETUP = ms\do_win64a.bat
1302	1320	SSLNMAKE = ms\nt.mak all
	1321	+SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
1303	1322	!elseif "$(PLATFORM)"=="ia64"
1304	1323	!message Using 'ia64' platform for OpenSSL...
1305		-SSLCONFIG = VC-WIN64I no-asm
	1324	+# BUGBUG (OpenSSL): Apparently, using "no-ssl*" here breaks the build.
	1325	+# SSLCONFIG = VC-WIN64I no-asm no-ssl2 no-ssl3 no-shared
	1326	+SSLCONFIG = VC-WIN64I no-asm no-shared
1306	1327	SSLSETUP = ms\do_win64i.bat
1307	1328	SSLNMAKE = ms\nt.mak all
	1329	+SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
1308	1330	!else
1309	1331	!message Assuming 'x86' platform for OpenSSL...
1310		-SSLCONFIG = VC-WIN32 no-asm
	1332	+# BUGBUG (OpenSSL): Apparently, using "no-ssl*" here breaks the build.
	1333	+# SSLCONFIG = VC-WIN32 no-asm no-ssl2 no-ssl3 no-shared
	1334	+SSLCONFIG = VC-WIN32 no-asm no-shared
1311	1335	SSLSETUP = ms\do_ms.bat
1312	1336	SSLNMAKE = ms\nt.mak all
	1337	+SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
1313	1338	!endif
1314	1339	!endif
1315	1340
1316	1341	!ifdef FOSSIL_ENABLE_TCL
1317	1342	TCLDIR = $(B)\compat\tcl-8.6
		@@ -1480,13 +1505,13 @@
1480	1505	@set PATH=$(PERLDIR);$(PATH)
1481	1506	!endif
1482	1507	@pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
1483	1508	@pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
1484	1509	!ifdef FOSSIL_ENABLE_WINXP
1485		- @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
	1510	+ @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS) $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
1486	1511	!else
1487		- @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) && popd
	1512	+ @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS)" && popd
1488	1513	!endif
1489	1514	!endif
1490	1515
1491	1516	!ifndef FOSSIL_ENABLE_MINIZ
1492	1517	APPTARGETS = $(APPTARGETS) zlib
1493	1518

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -513,11 +513,12 @@
513	# This is useful when Tcl has been compiled statically with MinGW.
514	#
515	FOSSIL_TCL_SOURCE = 1
516
517	#### Check if the workaround for the MinGW command line handling needs to
518	# be enabled by default.

519	#
520	ifndef MINGW_IS_32BIT_ONLY
521	ifeq (,$(findstring w64-mingw32,$(PREFIX)))
522	MINGW_IS_32BIT_ONLY = 1
523	endif
	@@ -526,16 +527,23 @@
526	#### The directories where the zlib include and library files are located.
527	#
528	ZINCDIR = $(SRCDIR)/../compat/zlib
529	ZLIBDIR = $(SRCDIR)/../compat/zlib
530



531	ifndef X64
532	ifneq (,$(findstring x86_64-w64-mingw32,$(PREFIX)))
533	X64 = 1
534	endif
535	endif
536




537	ifndef X64
538	SSLCONFIG = mingw
539	ifndef FOSSIL_ENABLE_MINIZ
540	ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
541	LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
	@@ -547,10 +555,18 @@
547	SSLCONFIG = mingw64
548	ZLIBCONFIG =
549	LIBTARGETS =
550	endif
551








552	ifndef FOSSIL_ENABLE_MINIZ
553	SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
554	endif
555
556	#### The directories where the OpenSSL include and library files are located.
	@@ -1295,23 +1311,32 @@
1295	SSLLIBDIR = $(SSLDIR)\out32
1296	SSLLFLAGS = /nologo /opt:ref /debug
1297	SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1298	!if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
1299	!message Using 'x64' platform for OpenSSL...
1300	SSLCONFIG = VC-WIN64A no-asm


1301	SSLSETUP = ms\do_win64a.bat
1302	SSLNMAKE = ms\nt.mak all

1303	!elseif "$(PLATFORM)"=="ia64"
1304	!message Using 'ia64' platform for OpenSSL...
1305	SSLCONFIG = VC-WIN64I no-asm


1306	SSLSETUP = ms\do_win64i.bat
1307	SSLNMAKE = ms\nt.mak all

1308	!else
1309	!message Assuming 'x86' platform for OpenSSL...
1310	SSLCONFIG = VC-WIN32 no-asm


1311	SSLSETUP = ms\do_ms.bat
1312	SSLNMAKE = ms\nt.mak all

1313	!endif
1314	!endif
1315
1316	!ifdef FOSSIL_ENABLE_TCL
1317	TCLDIR = $(B)\compat\tcl-8.6
	@@ -1480,13 +1505,13 @@
1480	@set PATH=$(PERLDIR);$(PATH)
1481	!endif
1482	@pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
1483	@pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
1484	!ifdef FOSSIL_ENABLE_WINXP
1485	@pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
1486	!else
1487	@pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) && popd
1488	!endif
1489	!endif
1490
1491	!ifndef FOSSIL_ENABLE_MINIZ
1492	APPTARGETS = $(APPTARGETS) zlib
1493

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -513,11 +513,12 @@
513	# This is useful when Tcl has been compiled statically with MinGW.
514	#
515	FOSSIL_TCL_SOURCE = 1
516
517	#### Check if the workaround for the MinGW command line handling needs to
518	# be enabled by default. This check may be somewhat fragile due to the
519	# use of "findstring".
520	#
521	ifndef MINGW_IS_32BIT_ONLY
522	ifeq (,$(findstring w64-mingw32,$(PREFIX)))
523	MINGW_IS_32BIT_ONLY = 1
524	endif
	@@ -526,16 +527,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	#### Make an attempt to detect if Fossil is being built for the x64 processor
533	# architecture. This check may be somewhat fragile due to "findstring".
534	#
535	ifndef X64
536	ifneq (,$(findstring x86_64-w64-mingw32,$(PREFIX)))
537	X64 = 1
538	endif
539	endif
540
541	#### Determine if the optimized assembly routines provided with zlib should be
542	# used, taking into account whether zlib is actually enabled and the target
543	# processor architecture.
544	#
545	ifndef X64
546	SSLCONFIG = mingw
547	ifndef FOSSIL_ENABLE_MINIZ
548	ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
549	LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
	@@ -547,10 +555,18 @@
555	SSLCONFIG = mingw64
556	ZLIBCONFIG =
557	LIBTARGETS =
558	endif
559
560	#### Disable creation of the OpenSSL shared libraries. Also, disable support
561	# for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
562	#
563	SSLCONFIG += no-ssl2 no-ssl3 no-shared
564
565	#### When using zlib, make sure that OpenSSL is configured to use the zlib
566	# that Fossil knows about (i.e. the one within the source tree).
567	#
568	ifndef FOSSIL_ENABLE_MINIZ
569	SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
570	endif
571
572	#### The directories where the OpenSSL include and library files are located.
	@@ -1295,23 +1311,32 @@
1311	SSLLIBDIR = $(SSLDIR)\out32
1312	SSLLFLAGS = /nologo /opt:ref /debug
1313	SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1314	!if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
1315	!message Using 'x64' platform for OpenSSL...
1316	# BUGBUG (OpenSSL): Apparently, using "no-ssl*" here breaks the build.
1317	# SSLCONFIG = VC-WIN64A no-asm no-ssl2 no-ssl3 no-shared
1318	SSLCONFIG = VC-WIN64A no-asm no-shared
1319	SSLSETUP = ms\do_win64a.bat
1320	SSLNMAKE = ms\nt.mak all
1321	SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
1322	!elseif "$(PLATFORM)"=="ia64"
1323	!message Using 'ia64' platform for OpenSSL...
1324	# BUGBUG (OpenSSL): Apparently, using "no-ssl*" here breaks the build.
1325	# SSLCONFIG = VC-WIN64I no-asm no-ssl2 no-ssl3 no-shared
1326	SSLCONFIG = VC-WIN64I no-asm no-shared
1327	SSLSETUP = ms\do_win64i.bat
1328	SSLNMAKE = ms\nt.mak all
1329	SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
1330	!else
1331	!message Assuming 'x86' platform for OpenSSL...
1332	# BUGBUG (OpenSSL): Apparently, using "no-ssl*" here breaks the build.
1333	# SSLCONFIG = VC-WIN32 no-asm no-ssl2 no-ssl3 no-shared
1334	SSLCONFIG = VC-WIN32 no-asm no-shared
1335	SSLSETUP = ms\do_ms.bat
1336	SSLNMAKE = ms\nt.mak all
1337	SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
1338	!endif
1339	!endif
1340
1341	!ifdef FOSSIL_ENABLE_TCL
1342	TCLDIR = $(B)\compat\tcl-8.6
	@@ -1480,13 +1505,13 @@
1505	@set PATH=$(PERLDIR);$(PATH)
1506	!endif
1507	@pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
1508	@pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
1509	!ifdef FOSSIL_ENABLE_WINXP
1510	@pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS) $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
1511	!else
1512	@pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS)" && popd
1513	!endif
1514	!endif
1515
1516	!ifndef FOSSIL_ENABLE_MINIZ
1517	APPTARGETS = $(APPTARGETS) zlib
1518

M src/makemake.tcl

+31 -6

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -513,11 +513,12 @@
513	513	# This is useful when Tcl has been compiled statically with MinGW.
514	514	#
515	515	FOSSIL_TCL_SOURCE = 1
516	516
517	517	#### Check if the workaround for the MinGW command line handling needs to
518		-# be enabled by default.
	518	+# be enabled by default. This check may be somewhat fragile due to the
	519	+# use of "findstring".
519	520	#
520	521	ifndef MINGW_IS_32BIT_ONLY
521	522	ifeq (,$(findstring w64-mingw32,$(PREFIX)))
522	523	MINGW_IS_32BIT_ONLY = 1
523	524	endif
		@@ -526,16 +527,23 @@
526	527	#### The directories where the zlib include and library files are located.
527	528	#
528	529	ZINCDIR = $(SRCDIR)/../compat/zlib
529	530	ZLIBDIR = $(SRCDIR)/../compat/zlib
530	531
	532	+#### Make an attempt to detect if Fossil is being built for the x64 processor
	533	+# architecture. This check may be somewhat fragile due to "findstring".
	534	+#
531	535	ifndef X64
532	536	ifneq (,$(findstring x86_64-w64-mingw32,$(PREFIX)))
533	537	X64 = 1
534	538	endif
535	539	endif
536	540
	541	+#### Determine if the optimized assembly routines provided with zlib should be
	542	+# used, taking into account whether zlib is actually enabled and the target
	543	+# processor architecture.
	544	+#
537	545	ifndef X64
538	546	SSLCONFIG = mingw
539	547	ifndef FOSSIL_ENABLE_MINIZ
540	548	ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
541	549	LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
		@@ -547,10 +555,18 @@
547	555	SSLCONFIG = mingw64
548	556	ZLIBCONFIG =
549	557	LIBTARGETS =
550	558	endif
551	559
	560	+#### Disable creation of the OpenSSL shared libraries. Also, disable support
	561	+# for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
	562	+#
	563	+SSLCONFIG += no-ssl2 no-ssl3 no-shared
	564	+
	565	+#### When using zlib, make sure that OpenSSL is configured to use the zlib
	566	+# that Fossil knows about (i.e. the one within the source tree).
	567	+#
552	568	ifndef FOSSIL_ENABLE_MINIZ
553	569	SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
554	570	endif
555	571
556	572	#### The directories where the OpenSSL include and library files are located.
		@@ -1295,23 +1311,32 @@
1295	1311	SSLLIBDIR = $(SSLDIR)\out32
1296	1312	SSLLFLAGS = /nologo /opt:ref /debug
1297	1313	SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1298	1314	!if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
1299	1315	!message Using 'x64' platform for OpenSSL...
1300		-SSLCONFIG = VC-WIN64A no-asm
	1316	+# BUGBUG (OpenSSL): Apparently, using "no-ssl*" here breaks the build.
	1317	+# SSLCONFIG = VC-WIN64A no-asm no-ssl2 no-ssl3 no-shared
	1318	+SSLCONFIG = VC-WIN64A no-asm no-shared
1301	1319	SSLSETUP = ms\do_win64a.bat
1302	1320	SSLNMAKE = ms\nt.mak all
	1321	+SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
1303	1322	!elseif "$(PLATFORM)"=="ia64"
1304	1323	!message Using 'ia64' platform for OpenSSL...
1305		-SSLCONFIG = VC-WIN64I no-asm
	1324	+# BUGBUG (OpenSSL): Apparently, using "no-ssl*" here breaks the build.
	1325	+# SSLCONFIG = VC-WIN64I no-asm no-ssl2 no-ssl3 no-shared
	1326	+SSLCONFIG = VC-WIN64I no-asm no-shared
1306	1327	SSLSETUP = ms\do_win64i.bat
1307	1328	SSLNMAKE = ms\nt.mak all
	1329	+SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
1308	1330	!else
1309	1331	!message Assuming 'x86' platform for OpenSSL...
1310		-SSLCONFIG = VC-WIN32 no-asm
	1332	+# BUGBUG (OpenSSL): Apparently, using "no-ssl*" here breaks the build.
	1333	+# SSLCONFIG = VC-WIN32 no-asm no-ssl2 no-ssl3 no-shared
	1334	+SSLCONFIG = VC-WIN32 no-asm no-shared
1311	1335	SSLSETUP = ms\do_ms.bat
1312	1336	SSLNMAKE = ms\nt.mak all
	1337	+SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
1313	1338	!endif
1314	1339	!endif
1315	1340
1316	1341	!ifdef FOSSIL_ENABLE_TCL
1317	1342	TCLDIR = $(B)\compat\tcl-8.6
		@@ -1480,13 +1505,13 @@
1480	1505	@set PATH=$(PERLDIR);$(PATH)
1481	1506	!endif
1482	1507	@pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
1483	1508	@pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
1484	1509	!ifdef FOSSIL_ENABLE_WINXP
1485		- @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
	1510	+ @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS) $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
1486	1511	!else
1487		- @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) && popd
	1512	+ @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS)" && popd
1488	1513	!endif
1489	1514	!endif
1490	1515
1491	1516	!ifndef FOSSIL_ENABLE_MINIZ
1492	1517	APPTARGETS = $(APPTARGETS) zlib
1493	1518

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -513,11 +513,12 @@
513	# This is useful when Tcl has been compiled statically with MinGW.
514	#
515	FOSSIL_TCL_SOURCE = 1
516
517	#### Check if the workaround for the MinGW command line handling needs to
518	# be enabled by default.

519	#
520	ifndef MINGW_IS_32BIT_ONLY
521	ifeq (,$(findstring w64-mingw32,$(PREFIX)))
522	MINGW_IS_32BIT_ONLY = 1
523	endif
	@@ -526,16 +527,23 @@
526	#### The directories where the zlib include and library files are located.
527	#
528	ZINCDIR = $(SRCDIR)/../compat/zlib
529	ZLIBDIR = $(SRCDIR)/../compat/zlib
530



531	ifndef X64
532	ifneq (,$(findstring x86_64-w64-mingw32,$(PREFIX)))
533	X64 = 1
534	endif
535	endif
536




537	ifndef X64
538	SSLCONFIG = mingw
539	ifndef FOSSIL_ENABLE_MINIZ
540	ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
541	LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
	@@ -547,10 +555,18 @@
547	SSLCONFIG = mingw64
548	ZLIBCONFIG =
549	LIBTARGETS =
550	endif
551








552	ifndef FOSSIL_ENABLE_MINIZ
553	SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
554	endif
555
556	#### The directories where the OpenSSL include and library files are located.
	@@ -1295,23 +1311,32 @@
1295	SSLLIBDIR = $(SSLDIR)\out32
1296	SSLLFLAGS = /nologo /opt:ref /debug
1297	SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1298	!if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
1299	!message Using 'x64' platform for OpenSSL...
1300	SSLCONFIG = VC-WIN64A no-asm


1301	SSLSETUP = ms\do_win64a.bat
1302	SSLNMAKE = ms\nt.mak all

1303	!elseif "$(PLATFORM)"=="ia64"
1304	!message Using 'ia64' platform for OpenSSL...
1305	SSLCONFIG = VC-WIN64I no-asm


1306	SSLSETUP = ms\do_win64i.bat
1307	SSLNMAKE = ms\nt.mak all

1308	!else
1309	!message Assuming 'x86' platform for OpenSSL...
1310	SSLCONFIG = VC-WIN32 no-asm


1311	SSLSETUP = ms\do_ms.bat
1312	SSLNMAKE = ms\nt.mak all

1313	!endif
1314	!endif
1315
1316	!ifdef FOSSIL_ENABLE_TCL
1317	TCLDIR = $(B)\compat\tcl-8.6
	@@ -1480,13 +1505,13 @@
1480	@set PATH=$(PERLDIR);$(PATH)
1481	!endif
1482	@pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
1483	@pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
1484	!ifdef FOSSIL_ENABLE_WINXP
1485	@pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
1486	!else
1487	@pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) && popd
1488	!endif
1489	!endif
1490
1491	!ifndef FOSSIL_ENABLE_MINIZ
1492	APPTARGETS = $(APPTARGETS) zlib
1493

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -513,11 +513,12 @@
513	# This is useful when Tcl has been compiled statically with MinGW.
514	#
515	FOSSIL_TCL_SOURCE = 1
516
517	#### Check if the workaround for the MinGW command line handling needs to
518	# be enabled by default. This check may be somewhat fragile due to the
519	# use of "findstring".
520	#
521	ifndef MINGW_IS_32BIT_ONLY
522	ifeq (,$(findstring w64-mingw32,$(PREFIX)))
523	MINGW_IS_32BIT_ONLY = 1
524	endif
	@@ -526,16 +527,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	#### Make an attempt to detect if Fossil is being built for the x64 processor
533	# architecture. This check may be somewhat fragile due to "findstring".
534	#
535	ifndef X64
536	ifneq (,$(findstring x86_64-w64-mingw32,$(PREFIX)))
537	X64 = 1
538	endif
539	endif
540
541	#### Determine if the optimized assembly routines provided with zlib should be
542	# used, taking into account whether zlib is actually enabled and the target
543	# processor architecture.
544	#
545	ifndef X64
546	SSLCONFIG = mingw
547	ifndef FOSSIL_ENABLE_MINIZ
548	ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
549	LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
	@@ -547,10 +555,18 @@
555	SSLCONFIG = mingw64
556	ZLIBCONFIG =
557	LIBTARGETS =
558	endif
559
560	#### Disable creation of the OpenSSL shared libraries. Also, disable support
561	# for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
562	#
563	SSLCONFIG += no-ssl2 no-ssl3 no-shared
564
565	#### When using zlib, make sure that OpenSSL is configured to use the zlib
566	# that Fossil knows about (i.e. the one within the source tree).
567	#
568	ifndef FOSSIL_ENABLE_MINIZ
569	SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
570	endif
571
572	#### The directories where the OpenSSL include and library files are located.
	@@ -1295,23 +1311,32 @@
1311	SSLLIBDIR = $(SSLDIR)\out32
1312	SSLLFLAGS = /nologo /opt:ref /debug
1313	SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1314	!if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
1315	!message Using 'x64' platform for OpenSSL...
1316	# BUGBUG (OpenSSL): Apparently, using "no-ssl*" here breaks the build.
1317	# SSLCONFIG = VC-WIN64A no-asm no-ssl2 no-ssl3 no-shared
1318	SSLCONFIG = VC-WIN64A no-asm no-shared
1319	SSLSETUP = ms\do_win64a.bat
1320	SSLNMAKE = ms\nt.mak all
1321	SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
1322	!elseif "$(PLATFORM)"=="ia64"
1323	!message Using 'ia64' platform for OpenSSL...
1324	# BUGBUG (OpenSSL): Apparently, using "no-ssl*" here breaks the build.
1325	# SSLCONFIG = VC-WIN64I no-asm no-ssl2 no-ssl3 no-shared
1326	SSLCONFIG = VC-WIN64I no-asm no-shared
1327	SSLSETUP = ms\do_win64i.bat
1328	SSLNMAKE = ms\nt.mak all
1329	SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
1330	!else
1331	!message Assuming 'x86' platform for OpenSSL...
1332	# BUGBUG (OpenSSL): Apparently, using "no-ssl*" here breaks the build.
1333	# SSLCONFIG = VC-WIN32 no-asm no-ssl2 no-ssl3 no-shared
1334	SSLCONFIG = VC-WIN32 no-asm no-shared
1335	SSLSETUP = ms\do_ms.bat
1336	SSLNMAKE = ms\nt.mak all
1337	SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
1338	!endif
1339	!endif
1340
1341	!ifdef FOSSIL_ENABLE_TCL
1342	TCLDIR = $(B)\compat\tcl-8.6
	@@ -1480,13 +1505,13 @@
1505	@set PATH=$(PERLDIR);$(PATH)
1506	!endif
1507	@pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
1508	@pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
1509	!ifdef FOSSIL_ENABLE_WINXP
1510	@pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS) $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
1511	!else
1512	@pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS)" && popd
1513	!endif
1514	!endif
1515
1516	!ifndef FOSSIL_ENABLE_MINIZ
1517	APPTARGETS = $(APPTARGETS) zlib
1518

M src/markdown.c

+1 -1

		--- src/markdown.c
		+++ src/markdown.c
		@@ -2155,11 +2155,11 @@
2155	2155	struct Blob ib, / input blob in markdown */
2156	2156	const struct mkd_renderer rndrer / renderer descriptor (callbacks) */
2157	2157	){
2158	2158	struct link_ref *lr;
2159	2159	struct Blob text = BLOB_INITIALIZER;
2160		- size_t i, beg, end;
	2160	+ size_t i, beg, end = 0;
2161	2161	struct render rndr;
2162	2162	char *ib_data;
2163	2163
2164	2164	/* filling the render structure */
2165	2165	if( !rndrer ) return;
2166	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;
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 @@
783	783	{ ".filetree",
784	784	"tree-view file browser",
785	785	@ margin: 1em 0;
786	786	@ line-height: 1.5;
787	787	},
	788	+ {
	789	+ ".filetree > ul",
	790	+ "tree-view top-level list",
	791	+ @ display: inline-block;
	792	+ },
788	793	{ ".filetree ul",
789	794	"tree-view lists",
790	795	@ margin: 0;
791	796	@ padding: 0;
792	797	@ list-style: none;
		@@ -832,25 +837,32 @@
832	837	},
833	838	{ ".filetree a",
834	839	"tree-view links",
835	840	@ position: relative;
836	841	@ z-index: 1;
837		- @ display: inline-block;
	842	+ @ display: table-cell;
838	843	@ min-height: 16px;
839	844	@ padding-left: 21px;
840	845	@ background-image: url(data:image/gif;base64,R0lGODlhEAAQAJEAAP\/\/\/yEhIf\/\/\/wAAACH5BAEHAAIALAAAAAAQABAAAAIvlIKpxqcfmgOUvoaqDSCxrEEfF14GqFXImJZsu73wepJzVMNxrtNTj3NATMKhpwAAOw==);
841	846	@ background-position: center left;
842	847	@ background-repeat: no-repeat;
843	848	},
	849	+ { "div.filetreeline",
	850	+ "line of a file tree",
	851	+ @ display: table;
	852	+ @ width: 100%;
	853	+ @ white-space: nowrap;
	854	+ },
844	855	{ ".filetree .dir > div.filetreeline > a",
845	856	"tree-view directory links",
846	857	@ background-image: url(data:image/gif;base64,R0lGODlhEAAQAJEAAP/WVCIiIv\/\/\/wAAACH5BAEHAAIALAAAAAAQABAAAAInlI9pwa3XYniCgQtkrAFfLXkiFo1jaXpo+jUs6b5Z/K4siDu5RPUFADs=);
847	858	},
848	859	{ "div.filetreeage",
849	860	"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;
852	864	},
853	865	{ "div.filetreeline:hover",
854	866	"Highlight the line of a file tree",
855	867	@ background-color: #eee;
856	868	},
		@@ -1232,24 +1244,35 @@
1232	1244	},
1233	1245	{ ".fileage table",
1234	1246	"The fileage table",
1235	1247	@ border-spacing: 0;
1236	1248	},
	1249	+ { ".fileage tr:hover",
	1250	+ "Mouse-over effects for the file-age table",
	1251	+ @ background-color: #eee;
	1252	+ },
1237	1253	{ ".fileage td",
1238	1254	"fileage table cells",
1239	1255	@ vertical-align: top;
1240	1256	@ text-align: left;
1241		- @ border-top: 1px solid black;
	1257	+ @ border-top: 1px solid #ddd;
	1258	+ @ padding-top: 3px;
1242	1259	},
1243	1260	{ ".fileage td:first-child",
1244	1261	"fileage first column (the age)",
1245	1262	@ white-space: nowrap;
1246	1263	},
1247		- { ".fileage td:first-child + td",
	1264	+ { ".fileage td:nth-child(2)",
1248	1265	"fileage second column (the filename)",
1249	1266	@ padding-left: 1em;
1250	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%;
1251	1274	},
1252	1275	{ 0,
1253	1276	0,
1254	1277	0
1255	1278	}
1256	1279

	--- 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 src/timeline.c

+9 -3

		--- src/timeline.c
		+++ src/timeline.c
		@@ -87,10 +87,11 @@
87	87	#define TIMELINE_FCHANGES 0x0020 /* Detail file changes */
88	88	#define TIMELINE_BRCOLOR 0x0040 /* Background color by branch name */
89	89	#define TIMELINE_UCOLOR 0x0080 /* Background color by user */
90	90	#define TIMELINE_FRENAMES 0x0100 /* Detail only file name changes */
91	91	#define TIMELINE_UNHIDE 0x0200 /* Unhide check-ins with "hidden" tag */
	92	+#define TIMELINE_SHOWRID 0x0400 /* Show RID values in addition to UUIDs */
92	93	#endif
93	94
94	95	/*
95	96	** Hash a string and use the hash to determine a background color.
96	97	*/
		@@ -404,10 +405,13 @@
404	405	}
405	406	}else if( zType[0]=='e' && tagid ){
406	407	hyperlink_to_event_tagid(tagid<0?-tagid:tagid);
407	408	}else if( (tmFlags & TIMELINE_ARTID)!=0 ){
408	409	hyperlink_to_uuid(zUuid);
	410	+ }
	411	+ if( tmFlags & TIMELINE_SHOWRID ){
	412	+ @ (%d(rid))
409	413	}
410	414	db_column_blob(pQuery, commentColumn, &comment);
411	415	if( zType[0]!='c' ){
412	416	/* Comments for anything other than a check-in are generated by
413	417	** "fossil rebuild" and expect to be rendered as text/x-fossil-wiki */
		@@ -1070,11 +1074,11 @@
1070	1074	const char zYearMonth = P("ym"); / Show checkins for the given YYYY-MM */
1071	1075	const char zYearWeek = P("yw"); / Show checkins for the given YYYY-WW (week-of-year)*/
1072	1076	int useDividers = P("nd")==0; /* Show dividers if "nd" is missing */
1073	1077	int renameOnly = P("namechng")!=0; /* Show only checkins that rename files */
1074	1078	int tagid; /* Tag ID */
1075		- int tmFlags; /* Timeline flags */
	1079	+ int tmFlags = 0; /* Timeline flags */
1076	1080	const char zThisTag = 0; / Suppress links to this tag */
1077	1081	const char zThisUser = 0; / Suppress links to this user */
1078	1082	HQuery url; /* URL for various branch links */
1079	1083	int from_rid = name_to_typed_rid(P("from"),"ci"); /* from= for paths */
1080	1084	int to_rid = name_to_typed_rid(P("to"),"ci"); /* to= for path timelines */
		@@ -1110,13 +1114,13 @@
1110	1114	){
1111	1115	zCirca = zBefore = zAfter = 0;
1112	1116	nEntry = -1;
1113	1117	}
1114	1118	if( zType[0]=='a' ){
1115		- tmFlags = TIMELINE_BRIEF \| TIMELINE_GRAPH;
	1119	+ tmFlags \|= TIMELINE_BRIEF \| TIMELINE_GRAPH;
1116	1120	}else{
1117		- tmFlags = TIMELINE_GRAPH;
	1121	+ tmFlags \|= TIMELINE_GRAPH;
1118	1122	}
1119	1123	if( nEntry>0 ) url_add_parameter(&url, "n", mprintf("%d", nEntry));
1120	1124	if( P("ng")!=0 \|\| zSearch!=0 ){
1121	1125	tmFlags &= ~TIMELINE_GRAPH;
1122	1126	url_add_parameter(&url, "ng", 0);
		@@ -1206,10 +1210,11 @@
1206	1210	}else if( (p_rid \|\| d_rid) && g.perm.Read ){
1207	1211	/* If p= or d= is present, ignore all other parameters other than n= */
1208	1212	char *zUuid;
1209	1213	int np, nd;
1210	1214
	1215	+ tmFlags \|= TIMELINE_DISJOINT;
1211	1216	if( p_rid && d_rid ){
1212	1217	if( p_rid!=d_rid ) p_rid = d_rid;
1213	1218	if( P("n")==0 ) nEntry = 10;
1214	1219	}
1215	1220	db_multi_exec(
		@@ -1552,10 +1557,11 @@
1552	1557	}
1553	1558	}
1554	1559	if( P("showsql") ){
1555	1560	@ <blockquote>%h(blob_sql_text(&sql))</blockquote>
1556	1561	}
	1562	+ if( P("showrid") ) tmFlags \|= TIMELINE_SHOWRID;
1557	1563	blob_zero(&sql);
1558	1564	db_prepare(&q, "SELECT * FROM timeline ORDER BY sortby DESC /scan/");
1559	1565	@ <h2>%b(&desc)</h2>
1560	1566	blob_reset(&desc);
1561	1567	www_print_timeline(&q, tmFlags, zThisUser, zThisTag, 0);
1562	1568

	--- src/timeline.c
	+++ src/timeline.c
	@@ -87,10 +87,11 @@
87	#define TIMELINE_FCHANGES 0x0020 /* Detail file changes */
88	#define TIMELINE_BRCOLOR 0x0040 /* Background color by branch name */
89	#define TIMELINE_UCOLOR 0x0080 /* Background color by user */
90	#define TIMELINE_FRENAMES 0x0100 /* Detail only file name changes */
91	#define TIMELINE_UNHIDE 0x0200 /* Unhide check-ins with "hidden" tag */

92	#endif
93
94	/*
95	** Hash a string and use the hash to determine a background color.
96	*/
	@@ -404,10 +405,13 @@
404	}
405	}else if( zType[0]=='e' && tagid ){
406	hyperlink_to_event_tagid(tagid<0?-tagid:tagid);
407	}else if( (tmFlags & TIMELINE_ARTID)!=0 ){
408	hyperlink_to_uuid(zUuid);



409	}
410	db_column_blob(pQuery, commentColumn, &comment);
411	if( zType[0]!='c' ){
412	/* Comments for anything other than a check-in are generated by
413	** "fossil rebuild" and expect to be rendered as text/x-fossil-wiki */
	@@ -1070,11 +1074,11 @@
1070	const char zYearMonth = P("ym"); / Show checkins for the given YYYY-MM */
1071	const char zYearWeek = P("yw"); / Show checkins for the given YYYY-WW (week-of-year)*/
1072	int useDividers = P("nd")==0; /* Show dividers if "nd" is missing */
1073	int renameOnly = P("namechng")!=0; /* Show only checkins that rename files */
1074	int tagid; /* Tag ID */
1075	int tmFlags; /* Timeline flags */
1076	const char zThisTag = 0; / Suppress links to this tag */
1077	const char zThisUser = 0; / Suppress links to this user */
1078	HQuery url; /* URL for various branch links */
1079	int from_rid = name_to_typed_rid(P("from"),"ci"); /* from= for paths */
1080	int to_rid = name_to_typed_rid(P("to"),"ci"); /* to= for path timelines */
	@@ -1110,13 +1114,13 @@
1110	){
1111	zCirca = zBefore = zAfter = 0;
1112	nEntry = -1;
1113	}
1114	if( zType[0]=='a' ){
1115	tmFlags = TIMELINE_BRIEF \| TIMELINE_GRAPH;
1116	}else{
1117	tmFlags = TIMELINE_GRAPH;
1118	}
1119	if( nEntry>0 ) url_add_parameter(&url, "n", mprintf("%d", nEntry));
1120	if( P("ng")!=0 \|\| zSearch!=0 ){
1121	tmFlags &= ~TIMELINE_GRAPH;
1122	url_add_parameter(&url, "ng", 0);
	@@ -1206,10 +1210,11 @@
1206	}else if( (p_rid \|\| d_rid) && g.perm.Read ){
1207	/* If p= or d= is present, ignore all other parameters other than n= */
1208	char *zUuid;
1209	int np, nd;
1210

1211	if( p_rid && d_rid ){
1212	if( p_rid!=d_rid ) p_rid = d_rid;
1213	if( P("n")==0 ) nEntry = 10;
1214	}
1215	db_multi_exec(
	@@ -1552,10 +1557,11 @@
1552	}
1553	}
1554	if( P("showsql") ){
1555	@ <blockquote>%h(blob_sql_text(&sql))</blockquote>
1556	}

1557	blob_zero(&sql);
1558	db_prepare(&q, "SELECT * FROM timeline ORDER BY sortby DESC /scan/");
1559	@ <h2>%b(&desc)</h2>
1560	blob_reset(&desc);
1561	www_print_timeline(&q, tmFlags, zThisUser, zThisTag, 0);
1562

	--- src/timeline.c
	+++ src/timeline.c
	@@ -87,10 +87,11 @@
87	#define TIMELINE_FCHANGES 0x0020 /* Detail file changes */
88	#define TIMELINE_BRCOLOR 0x0040 /* Background color by branch name */
89	#define TIMELINE_UCOLOR 0x0080 /* Background color by user */
90	#define TIMELINE_FRENAMES 0x0100 /* Detail only file name changes */
91	#define TIMELINE_UNHIDE 0x0200 /* Unhide check-ins with "hidden" tag */
92	#define TIMELINE_SHOWRID 0x0400 /* Show RID values in addition to UUIDs */
93	#endif
94
95	/*
96	** Hash a string and use the hash to determine a background color.
97	*/
	@@ -404,10 +405,13 @@
405	}
406	}else if( zType[0]=='e' && tagid ){
407	hyperlink_to_event_tagid(tagid<0?-tagid:tagid);
408	}else if( (tmFlags & TIMELINE_ARTID)!=0 ){
409	hyperlink_to_uuid(zUuid);
410	}
411	if( tmFlags & TIMELINE_SHOWRID ){
412	@ (%d(rid))
413	}
414	db_column_blob(pQuery, commentColumn, &comment);
415	if( zType[0]!='c' ){
416	/* Comments for anything other than a check-in are generated by
417	** "fossil rebuild" and expect to be rendered as text/x-fossil-wiki */
	@@ -1070,11 +1074,11 @@
1074	const char zYearMonth = P("ym"); / Show checkins for the given YYYY-MM */
1075	const char zYearWeek = P("yw"); / Show checkins for the given YYYY-WW (week-of-year)*/
1076	int useDividers = P("nd")==0; /* Show dividers if "nd" is missing */
1077	int renameOnly = P("namechng")!=0; /* Show only checkins that rename files */
1078	int tagid; /* Tag ID */
1079	int tmFlags = 0; /* Timeline flags */
1080	const char zThisTag = 0; / Suppress links to this tag */
1081	const char zThisUser = 0; / Suppress links to this user */
1082	HQuery url; /* URL for various branch links */
1083	int from_rid = name_to_typed_rid(P("from"),"ci"); /* from= for paths */
1084	int to_rid = name_to_typed_rid(P("to"),"ci"); /* to= for path timelines */
	@@ -1110,13 +1114,13 @@
1114	){
1115	zCirca = zBefore = zAfter = 0;
1116	nEntry = -1;
1117	}
1118	if( zType[0]=='a' ){
1119	tmFlags \|= TIMELINE_BRIEF \| TIMELINE_GRAPH;
1120	}else{
1121	tmFlags \|= TIMELINE_GRAPH;
1122	}
1123	if( nEntry>0 ) url_add_parameter(&url, "n", mprintf("%d", nEntry));
1124	if( P("ng")!=0 \|\| zSearch!=0 ){
1125	tmFlags &= ~TIMELINE_GRAPH;
1126	url_add_parameter(&url, "ng", 0);
	@@ -1206,10 +1210,11 @@
1210	}else if( (p_rid \|\| d_rid) && g.perm.Read ){
1211	/* If p= or d= is present, ignore all other parameters other than n= */
1212	char *zUuid;
1213	int np, nd;
1214
1215	tmFlags \|= TIMELINE_DISJOINT;
1216	if( p_rid && d_rid ){
1217	if( p_rid!=d_rid ) p_rid = d_rid;
1218	if( P("n")==0 ) nEntry = 10;
1219	}
1220	db_multi_exec(
	@@ -1552,10 +1557,11 @@
1557	}
1558	}
1559	if( P("showsql") ){
1560	@ <blockquote>%h(blob_sql_text(&sql))</blockquote>
1561	}
1562	if( P("showrid") ) tmFlags \|= TIMELINE_SHOWRID;
1563	blob_zero(&sql);
1564	db_prepare(&q, "SELECT * FROM timeline ORDER BY sortby DESC /scan/");
1565	@ <h2>%b(&desc)</h2>
1566	blob_reset(&desc);
1567	www_print_timeline(&q, tmFlags, zThisUser, zThisTag, 0);
1568

M win/Makefile.mingw

+17 -1

		--- win/Makefile.mingw
		+++ win/Makefile.mingw
		@@ -87,11 +87,12 @@
87	87	# This is useful when Tcl has been compiled statically with MinGW.
88	88	#
89	89	FOSSIL_TCL_SOURCE = 1
90	90
91	91	#### 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".
93	94	#
94	95	ifndef MINGW_IS_32BIT_ONLY
95	96	ifeq (,$(findstring w64-mingw32,$(PREFIX)))
96	97	MINGW_IS_32BIT_ONLY = 1
97	98	endif
		@@ -100,16 +101,23 @@
100	101	#### The directories where the zlib include and library files are located.
101	102	#
102	103	ZINCDIR = $(SRCDIR)/../compat/zlib
103	104	ZLIBDIR = $(SRCDIR)/../compat/zlib
104	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	+#
105	109	ifndef X64
106	110	ifneq (,$(findstring x86_64-w64-mingw32,$(PREFIX)))
107	111	X64 = 1
108	112	endif
109	113	endif
110	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	+#
111	119	ifndef X64
112	120	SSLCONFIG = mingw
113	121	ifndef FOSSIL_ENABLE_MINIZ
114	122	ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
115	123	LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
		@@ -121,10 +129,18 @@
121	129	SSLCONFIG = mingw64
122	130	ZLIBCONFIG =
123	131	LIBTARGETS =
124	132	endif
125	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	+#
126	142	ifndef FOSSIL_ENABLE_MINIZ
127	143	SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
128	144	endif
129	145
130	146	#### The directories where the OpenSSL include and library files are located.
131	147

	--- 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

+17 -1

		--- win/Makefile.mingw
		+++ win/Makefile.mingw
		@@ -87,11 +87,12 @@
87	87	# This is useful when Tcl has been compiled statically with MinGW.
88	88	#
89	89	FOSSIL_TCL_SOURCE = 1
90	90
91	91	#### 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".
93	94	#
94	95	ifndef MINGW_IS_32BIT_ONLY
95	96	ifeq (,$(findstring w64-mingw32,$(PREFIX)))
96	97	MINGW_IS_32BIT_ONLY = 1
97	98	endif
		@@ -100,16 +101,23 @@
100	101	#### The directories where the zlib include and library files are located.
101	102	#
102	103	ZINCDIR = $(SRCDIR)/../compat/zlib
103	104	ZLIBDIR = $(SRCDIR)/../compat/zlib
104	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	+#
105	109	ifndef X64
106	110	ifneq (,$(findstring x86_64-w64-mingw32,$(PREFIX)))
107	111	X64 = 1
108	112	endif
109	113	endif
110	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	+#
111	119	ifndef X64
112	120	SSLCONFIG = mingw
113	121	ifndef FOSSIL_ENABLE_MINIZ
114	122	ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
115	123	LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
		@@ -121,10 +129,18 @@
121	129	SSLCONFIG = mingw64
122	130	ZLIBCONFIG =
123	131	LIBTARGETS =
124	132	endif
125	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	+#
126	142	ifndef FOSSIL_ENABLE_MINIZ
127	143	SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
128	144	endif
129	145
130	146	#### The directories where the OpenSSL include and library files are located.
131	147

	--- 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 @@
87	87	# This is useful when Tcl has been compiled statically with MinGW.
88	88	#
89	89	FOSSIL_TCL_SOURCE = 1
90	90
91	91	#### 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".
93	94	#
94	95	ifndef MINGW_IS_32BIT_ONLY
95	96	ifeq (,$(findstring w64-mingw32,$(PREFIX)))
96	97	MINGW_IS_32BIT_ONLY = 1
97	98	endif
		@@ -100,16 +101,23 @@
100	101	#### The directories where the zlib include and library files are located.
101	102	#
102	103	ZINCDIR = $(SRCDIR)/../compat/zlib
103	104	ZLIBDIR = $(SRCDIR)/../compat/zlib
104	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	+#
105	109	ifndef X64
106	110	ifneq (,$(findstring x86_64-w64-mingw32,$(PREFIX)))
107	111	X64 = 1
108	112	endif
109	113	endif
110	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	+#
111	119	ifndef X64
112	120	SSLCONFIG = mingw
113	121	ifndef FOSSIL_ENABLE_MINIZ
114	122	ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
115	123	LIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
		@@ -121,10 +129,18 @@
121	129	SSLCONFIG = mingw64
122	130	ZLIBCONFIG =
123	131	LIBTARGETS =
124	132	endif
125	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	+#
126	142	ifndef FOSSIL_ENABLE_MINIZ
127	143	SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
128	144	endif
129	145
130	146	#### The directories where the OpenSSL include and library files are located.
		@@ -435,10 +451,11 @@
435	451	$(SRCDIR)/schema.c \
436	452	$(SRCDIR)/search.c \
437	453	$(SRCDIR)/setup.c \
438	454	$(SRCDIR)/sha1.c \
439	455	$(SRCDIR)/shun.c \
	456	+ $(SRCDIR)/sitemap.c \
440	457	$(SRCDIR)/skins.c \
441	458	$(SRCDIR)/sqlcmd.c \
442	459	$(SRCDIR)/stash.c \
443	460	$(SRCDIR)/stat.c \
444	461	$(SRCDIR)/style.c \
		@@ -556,10 +573,11 @@
556	573	$(OBJDIR)/schema_.c \
557	574	$(OBJDIR)/search_.c \
558	575	$(OBJDIR)/setup_.c \
559	576	$(OBJDIR)/sha1_.c \
560	577	$(OBJDIR)/shun_.c \
	578	+ $(OBJDIR)/sitemap_.c \
561	579	$(OBJDIR)/skins_.c \
562	580	$(OBJDIR)/sqlcmd_.c \
563	581	$(OBJDIR)/stash_.c \
564	582	$(OBJDIR)/stat_.c \
565	583	$(OBJDIR)/style_.c \
		@@ -674,10 +692,11 @@
674	692	$(OBJDIR)/schema.o \
675	693	$(OBJDIR)/search.o \
676	694	$(OBJDIR)/setup.o \
677	695	$(OBJDIR)/sha1.o \
678	696	$(OBJDIR)/shun.o \
	697	+ $(OBJDIR)/sitemap.o \
679	698	$(OBJDIR)/skins.o \
680	699	$(OBJDIR)/sqlcmd.o \
681	700	$(OBJDIR)/stash.o \
682	701	$(OBJDIR)/stat.o \
683	702	$(OBJDIR)/style.o \
		@@ -985,10 +1004,11 @@
985	1004	$(OBJDIR)/schema_.c:$(OBJDIR)/schema.h \
986	1005	$(OBJDIR)/search_.c:$(OBJDIR)/search.h \
987	1006	$(OBJDIR)/setup_.c:$(OBJDIR)/setup.h \
988	1007	$(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h \
989	1008	$(OBJDIR)/shun_.c:$(OBJDIR)/shun.h \
	1009	+ $(OBJDIR)/sitemap_.c:$(OBJDIR)/sitemap.h \
990	1010	$(OBJDIR)/skins_.c:$(OBJDIR)/skins.h \
991	1011	$(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h \
992	1012	$(OBJDIR)/stash_.c:$(OBJDIR)/stash.h \
993	1013	$(OBJDIR)/stat_.c:$(OBJDIR)/stat.h \
994	1014	$(OBJDIR)/style_.c:$(OBJDIR)/style.h \
		@@ -1718,10 +1738,18 @@
1718	1738
1719	1739	$(OBJDIR)/shun.o: $(OBJDIR)/shun_.c $(OBJDIR)/shun.h $(SRCDIR)/config.h
1720	1740	$(XTCC) -o $(OBJDIR)/shun.o -c $(OBJDIR)/shun_.c
1721	1741
1722	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
1723	1751
1724	1752	$(OBJDIR)/skins_.c: $(SRCDIR)/skins.c $(TRANSLATE)
1725	1753	$(TRANSLATE) $(SRCDIR)/skins.c >$@
1726	1754
1727	1755	$(OBJDIR)/skins.o: $(OBJDIR)/skins_.c $(OBJDIR)/skins.h $(SRCDIR)/config.h
1728	1756

	--- 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 @@
62	62	SSLLIBDIR = $(SSLDIR)\out32
63	63	SSLLFLAGS = /nologo /opt:ref /debug
64	64	SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
65	65	!if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
66	66	!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
68	70	SSLSETUP = ms\do_win64a.bat
69	71	SSLNMAKE = ms\nt.mak all
	72	+SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
70	73	!elseif "$(PLATFORM)"=="ia64"
71	74	!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
73	78	SSLSETUP = ms\do_win64i.bat
74	79	SSLNMAKE = ms\nt.mak all
	80	+SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
75	81	!else
76	82	!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
78	86	SSLSETUP = ms\do_ms.bat
79	87	SSLNMAKE = ms\nt.mak all
	88	+SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
80	89	!endif
81	90	!endif
82	91
83	92	!ifdef FOSSIL_ENABLE_TCL
84	93	TCLDIR = $(B)\compat\tcl-8.6
		@@ -467,13 +476,13 @@
467	476	@set PATH=$(PERLDIR);$(PATH)
468	477	!endif
469	478	@pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
470	479	@pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
471	480	!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
473	482	!else
474		- @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) && popd
	483	+ @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS)" && popd
475	484	!endif
476	485	!endif
477	486
478	487	!ifndef FOSSIL_ENABLE_MINIZ
479	488	APPTARGETS = $(APPTARGETS) zlib
480	489

	--- 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 win/Makefile.msc

+14 -5

		--- win/Makefile.msc
		+++ win/Makefile.msc
		@@ -62,23 +62,32 @@
62	62	SSLLIBDIR = $(SSLDIR)\out32
63	63	SSLLFLAGS = /nologo /opt:ref /debug
64	64	SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
65	65	!if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
66	66	!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
68	70	SSLSETUP = ms\do_win64a.bat
69	71	SSLNMAKE = ms\nt.mak all
	72	+SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
70	73	!elseif "$(PLATFORM)"=="ia64"
71	74	!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
73	78	SSLSETUP = ms\do_win64i.bat
74	79	SSLNMAKE = ms\nt.mak all
	80	+SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
75	81	!else
76	82	!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
78	86	SSLSETUP = ms\do_ms.bat
79	87	SSLNMAKE = ms\nt.mak all
	88	+SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
80	89	!endif
81	90	!endif
82	91
83	92	!ifdef FOSSIL_ENABLE_TCL
84	93	TCLDIR = $(B)\compat\tcl-8.6
		@@ -467,13 +476,13 @@
467	476	@set PATH=$(PERLDIR);$(PATH)
468	477	!endif
469	478	@pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
470	479	@pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
471	480	!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
473	482	!else
474		- @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) && popd
	483	+ @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS)" && popd
475	484	!endif
476	485	!endif
477	486
478	487	!ifndef FOSSIL_ENABLE_MINIZ
479	488	APPTARGETS = $(APPTARGETS) zlib
480	489

	--- 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 @@
405	405	can do pushes or pulls against your server. Use the <b>--port</b>
406	406	option to the server command to specify a different TCP port. If
407	407	you do not have a local source tree, use the <b>-R</b> command-line
408	408	option to specify the repository file.
409	409
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
411	411	between coworkers for doing quick pushes or pulls. But you can also
412	412	set up a permanent stand-alone server if you prefer. Just make
413	413	arrangements for fossil to be launched with appropriate arguments
414	414	after every reboot.
415	415
416	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	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 @@
5	5	blog post <a href="http://spot.livejournal.com/308370.html">
6	6	http://spot.livejournal.com/308370.html</a> (see also
7	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	8	<a href="https://www.theopensourceway.org/wiki/How_to_tell_if_a_FLOSS_project_is_doomed_to_FAIL">[2]</a>).
9	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
	10	+by adding together the individual points, the reader is supposed to be able
11	11	to judge the likelihood that the project will fail.
12	12	The point scores, and the items on the list, clearly reflect Tom's
13	13	biases and are not necessarily those of the larger open-source community.
14	14	Nevertheless, the policy of the Fossil shall be to strive for a perfect
15	15	score.</p>
16	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 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 @@
185	185	between repositories and working checkouts. A power-loss or system crash
186	186	in the middle of Git operation can damage or corrupt the Git repository.
187	187
188	188	A Fossil repository consists of a single disk file. A single Fossil
189	189	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
191	191	to damage from a power-loss or system crash - incomplete transactions
192	192	are simply rolled back after the system reboots.
193	193
194	194	<h3>3.8 Audit Trail</h3>
195	195
196	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 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 @@
70	70	need to modify the pathnames for your particular setup.
71	71	The final argument is either the name of the fossil repository to be served,
72	72	or a directory containing multiple repositories.
73	73	</p>
74	74	<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
76	76	in the file "/etc/xinetd.conf" or in a subfile of "/etc/xinetd.d".
77	77	An xinetd configuration file will appear like this:</p>
78	78	<blockquote>
79	79	<pre>
80	80	service http-alt
81	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 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

Fossil SCM

Keyboard Shortcuts