Fossil SCM

Compile openssl with option no-weak-ssl-ciphers (or -DOPENSSL_NO_WEAK_SSL_CIPHERS) Update custum Makefile.mingw

jan.nijtmans 2018-09-11 14:29 trunk

Commit 58b7b4e51c4ee49c2b43da70f8a19b4722170a440bb2f1ebf675fe3e6ec6ecf8

Parent 68f4c2b048ad1e4…

4 files changed +7 -7 +1 -1 +26 -13 +6 -6

~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc

M src/makemake.tcl

+7 -7

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -696,11 +696,11 @@
696	696	endif
697	697
698	698	#### Disable creation of the OpenSSL shared libraries. Also, disable support
699	699	# for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
700	700	#
701		-SSLCONFIG += no-ssl2 no-ssl3 no-shared
	701	+SSLCONFIG += no-ssl2 no-ssl3 no-weak-ssl-ciphers no-shared
702	702
703	703	#### When using zlib, make sure that OpenSSL is configured to use the zlib
704	704	# that Fossil knows about (i.e. the one within the source tree).
705	705	#
706	706	ifndef FOSSIL_ENABLE_MINIZ
		@@ -1578,11 +1578,11 @@
1578	1578	SSLLFLAGS = /nologo /opt:ref /debug
1579	1579	SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib crypt32.lib
1580	1580	!if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
1581	1581	!message Using 'x64' platform for OpenSSL...
1582	1582	# BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1583		-# SSLCONFIG = VC-WIN64A no-asm no-ssl2 no-ssl3
	1583	+# SSLCONFIG = VC-WIN64A no-asm no-ssl2 no-ssl3 no-weak-ssl-ciphers
1584	1584	SSLCONFIG = VC-WIN64A no-asm
1585	1585	!if $(FOSSIL_DYNAMIC_BUILD)!=0
1586	1586	SSLCONFIG = $(SSLCONFIG) shared
1587	1587	!else
1588	1588	SSLCONFIG = $(SSLCONFIG) no-shared
		@@ -1593,16 +1593,16 @@
1593	1593	!else
1594	1594	SSLNMAKE = ms\nt.mak all
1595	1595	!endif
1596	1596	# BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
1597	1597	!if $(FOSSIL_DYNAMIC_BUILD)==0
1598		-SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
	1598	+SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
1599	1599	!endif
1600	1600	!elseif "$(PLATFORM)"=="ia64"
1601	1601	!message Using 'ia64' platform for OpenSSL...
1602	1602	# BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1603		-# SSLCONFIG = VC-WIN64I no-asm no-ssl2 no-ssl3
	1603	+# SSLCONFIG = VC-WIN64I no-asm no-ssl2 no-ssl3 no-weak-ssl-ciphers
1604	1604	SSLCONFIG = VC-WIN64I no-asm
1605	1605	!if $(FOSSIL_DYNAMIC_BUILD)!=0
1606	1606	SSLCONFIG = $(SSLCONFIG) shared
1607	1607	!else
1608	1608	SSLCONFIG = $(SSLCONFIG) no-shared
		@@ -1613,16 +1613,16 @@
1613	1613	!else
1614	1614	SSLNMAKE = ms\nt.mak all
1615	1615	!endif
1616	1616	# BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
1617	1617	!if $(FOSSIL_DYNAMIC_BUILD)==0
1618		-SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
	1618	+SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
1619	1619	!endif
1620	1620	!else
1621	1621	!message Assuming 'x86' platform for OpenSSL...
1622	1622	# BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1623		-# SSLCONFIG = VC-WIN32 no-asm no-ssl2 no-ssl3
	1623	+# SSLCONFIG = VC-WIN32 no-asm no-ssl2 no-ssl3 no-weak-ssl-ciphers
1624	1624	SSLCONFIG = VC-WIN32 no-asm
1625	1625	!if $(FOSSIL_DYNAMIC_BUILD)!=0
1626	1626	SSLCONFIG = $(SSLCONFIG) shared
1627	1627	!else
1628	1628	SSLCONFIG = $(SSLCONFIG) no-shared
		@@ -1633,11 +1633,11 @@
1633	1633	!else
1634	1634	SSLNMAKE = ms\nt.mak all
1635	1635	!endif
1636	1636	# BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
1637	1637	!if $(FOSSIL_DYNAMIC_BUILD)==0
1638		-SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
	1638	+SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
1639	1639	!endif
1640	1640	!endif
1641	1641	!endif
1642	1642
1643	1643	!if $(FOSSIL_ENABLE_TCL)!=0
1644	1644

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -696,11 +696,11 @@
696	endif
697
698	#### Disable creation of the OpenSSL shared libraries. Also, disable support
699	# for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
700	#
701	SSLCONFIG += no-ssl2 no-ssl3 no-shared
702
703	#### When using zlib, make sure that OpenSSL is configured to use the zlib
704	# that Fossil knows about (i.e. the one within the source tree).
705	#
706	ifndef FOSSIL_ENABLE_MINIZ
	@@ -1578,11 +1578,11 @@
1578	SSLLFLAGS = /nologo /opt:ref /debug
1579	SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib crypt32.lib
1580	!if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
1581	!message Using 'x64' platform for OpenSSL...
1582	# BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1583	# SSLCONFIG = VC-WIN64A no-asm no-ssl2 no-ssl3
1584	SSLCONFIG = VC-WIN64A no-asm
1585	!if $(FOSSIL_DYNAMIC_BUILD)!=0
1586	SSLCONFIG = $(SSLCONFIG) shared
1587	!else
1588	SSLCONFIG = $(SSLCONFIG) no-shared
	@@ -1593,16 +1593,16 @@
1593	!else
1594	SSLNMAKE = ms\nt.mak all
1595	!endif
1596	# BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
1597	!if $(FOSSIL_DYNAMIC_BUILD)==0
1598	SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
1599	!endif
1600	!elseif "$(PLATFORM)"=="ia64"
1601	!message Using 'ia64' platform for OpenSSL...
1602	# BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1603	# SSLCONFIG = VC-WIN64I no-asm no-ssl2 no-ssl3
1604	SSLCONFIG = VC-WIN64I no-asm
1605	!if $(FOSSIL_DYNAMIC_BUILD)!=0
1606	SSLCONFIG = $(SSLCONFIG) shared
1607	!else
1608	SSLCONFIG = $(SSLCONFIG) no-shared
	@@ -1613,16 +1613,16 @@
1613	!else
1614	SSLNMAKE = ms\nt.mak all
1615	!endif
1616	# BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
1617	!if $(FOSSIL_DYNAMIC_BUILD)==0
1618	SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
1619	!endif
1620	!else
1621	!message Assuming 'x86' platform for OpenSSL...
1622	# BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1623	# SSLCONFIG = VC-WIN32 no-asm no-ssl2 no-ssl3
1624	SSLCONFIG = VC-WIN32 no-asm
1625	!if $(FOSSIL_DYNAMIC_BUILD)!=0
1626	SSLCONFIG = $(SSLCONFIG) shared
1627	!else
1628	SSLCONFIG = $(SSLCONFIG) no-shared
	@@ -1633,11 +1633,11 @@
1633	!else
1634	SSLNMAKE = ms\nt.mak all
1635	!endif
1636	# BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
1637	!if $(FOSSIL_DYNAMIC_BUILD)==0
1638	SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
1639	!endif
1640	!endif
1641	!endif
1642
1643	!if $(FOSSIL_ENABLE_TCL)!=0
1644

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -696,11 +696,11 @@
696	endif
697
698	#### Disable creation of the OpenSSL shared libraries. Also, disable support
699	# for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
700	#
701	SSLCONFIG += no-ssl2 no-ssl3 no-weak-ssl-ciphers no-shared
702
703	#### When using zlib, make sure that OpenSSL is configured to use the zlib
704	# that Fossil knows about (i.e. the one within the source tree).
705	#
706	ifndef FOSSIL_ENABLE_MINIZ
	@@ -1578,11 +1578,11 @@
1578	SSLLFLAGS = /nologo /opt:ref /debug
1579	SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib crypt32.lib
1580	!if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
1581	!message Using 'x64' platform for OpenSSL...
1582	# BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1583	# SSLCONFIG = VC-WIN64A no-asm no-ssl2 no-ssl3 no-weak-ssl-ciphers
1584	SSLCONFIG = VC-WIN64A no-asm
1585	!if $(FOSSIL_DYNAMIC_BUILD)!=0
1586	SSLCONFIG = $(SSLCONFIG) shared
1587	!else
1588	SSLCONFIG = $(SSLCONFIG) no-shared
	@@ -1593,16 +1593,16 @@
1593	!else
1594	SSLNMAKE = ms\nt.mak all
1595	!endif
1596	# BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
1597	!if $(FOSSIL_DYNAMIC_BUILD)==0
1598	SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
1599	!endif
1600	!elseif "$(PLATFORM)"=="ia64"
1601	!message Using 'ia64' platform for OpenSSL...
1602	# BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1603	# SSLCONFIG = VC-WIN64I no-asm no-ssl2 no-ssl3 no-weak-ssl-ciphers
1604	SSLCONFIG = VC-WIN64I no-asm
1605	!if $(FOSSIL_DYNAMIC_BUILD)!=0
1606	SSLCONFIG = $(SSLCONFIG) shared
1607	!else
1608	SSLCONFIG = $(SSLCONFIG) no-shared
	@@ -1613,16 +1613,16 @@
1613	!else
1614	SSLNMAKE = ms\nt.mak all
1615	!endif
1616	# BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
1617	!if $(FOSSIL_DYNAMIC_BUILD)==0
1618	SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
1619	!endif
1620	!else
1621	!message Assuming 'x86' platform for OpenSSL...
1622	# BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
1623	# SSLCONFIG = VC-WIN32 no-asm no-ssl2 no-ssl3 no-weak-ssl-ciphers
1624	SSLCONFIG = VC-WIN32 no-asm
1625	!if $(FOSSIL_DYNAMIC_BUILD)!=0
1626	SSLCONFIG = $(SSLCONFIG) shared
1627	!else
1628	SSLCONFIG = $(SSLCONFIG) no-shared
	@@ -1633,11 +1633,11 @@
1633	!else
1634	SSLNMAKE = ms\nt.mak all
1635	!endif
1636	# BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
1637	!if $(FOSSIL_DYNAMIC_BUILD)==0
1638	SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
1639	!endif
1640	!endif
1641	!endif
1642
1643	!if $(FOSSIL_ENABLE_TCL)!=0
1644

M win/Makefile.mingw

+1 -1

		--- win/Makefile.mingw
		+++ win/Makefile.mingw
		@@ -160,11 +160,11 @@
160	160	endif
161	161
162	162	#### Disable creation of the OpenSSL shared libraries. Also, disable support
163	163	# for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
164	164	#
165		-SSLCONFIG += no-ssl2 no-ssl3 no-shared
	165	+SSLCONFIG += no-ssl2 no-ssl3 no-weak-ssl-ciphers no-shared
166	166
167	167	#### When using zlib, make sure that OpenSSL is configured to use the zlib
168	168	# that Fossil knows about (i.e. the one within the source tree).
169	169	#
170	170	ifndef FOSSIL_ENABLE_MINIZ
171	171

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -160,11 +160,11 @@
160	endif
161
162	#### Disable creation of the OpenSSL shared libraries. Also, disable support
163	# for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
164	#
165	SSLCONFIG += no-ssl2 no-ssl3 no-shared
166
167	#### When using zlib, make sure that OpenSSL is configured to use the zlib
168	# that Fossil knows about (i.e. the one within the source tree).
169	#
170	ifndef FOSSIL_ENABLE_MINIZ
171

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -160,11 +160,11 @@
160	endif
161
162	#### Disable creation of the OpenSSL shared libraries. Also, disable support
163	# for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
164	#
165	SSLCONFIG += no-ssl2 no-ssl3 no-weak-ssl-ciphers no-shared
166
167	#### When using zlib, make sure that OpenSSL is configured to use the zlib
168	# that Fossil knows about (i.e. the one within the source tree).
169	#
170	ifndef FOSSIL_ENABLE_MINIZ
171

M win/Makefile.mingw.mistachkin

+26 -13

		--- win/Makefile.mingw.mistachkin
		+++ win/Makefile.mingw.mistachkin
		@@ -160,11 +160,11 @@
160	160	endif
161	161
162	162	#### Disable creation of the OpenSSL shared libraries. Also, disable support
163	163	# for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
164	164	#
165		-SSLCONFIG += no-ssl2 no-ssl3 no-shared
	165	+SSLCONFIG += no-ssl2 no-ssl3 no-weak-ssl-ciphers no-shared
166	166
167	167	#### When using zlib, make sure that OpenSSL is configured to use the zlib
168	168	# that Fossil knows about (i.e. the one within the source tree).
169	169	#
170	170	ifndef FOSSIL_ENABLE_MINIZ
		@@ -437,10 +437,11 @@
437	437	XBCC = $(BCC) $(CFLAGS)
438	438	XTCC = $(TCC) $(CFLAGS) -I. -I$(SRCDIR)
439	439
440	440	SRC = \
441	441	$(SRCDIR)/add.c \
	442	+ $(SRCDIR)/alerts.c \
442	443	$(SRCDIR)/allrepo.c \
443	444	$(SRCDIR)/attach.c \
444	445	$(SRCDIR)/backoffice.c \
445	446	$(SRCDIR)/bag.c \
446	447	$(SRCDIR)/bisect.c \
		@@ -467,11 +468,10 @@
467	468	$(SRCDIR)/descendants.c \
468	469	$(SRCDIR)/diff.c \
469	470	$(SRCDIR)/diffcmd.c \
470	471	$(SRCDIR)/dispatch.c \
471	472	$(SRCDIR)/doc.c \
472		- $(SRCDIR)/email.c \
473	473	$(SRCDIR)/encode.c \
474	474	$(SRCDIR)/etag.c \
475	475	$(SRCDIR)/event.c \
476	476	$(SRCDIR)/export.c \
477	477	$(SRCDIR)/file.c \
		@@ -532,10 +532,11 @@
532	532	$(SRCDIR)/rss.c \
533	533	$(SRCDIR)/schema.c \
534	534	$(SRCDIR)/search.c \
535	535	$(SRCDIR)/security_audit.c \
536	536	$(SRCDIR)/setup.c \
	537	+ $(SRCDIR)/setupuser.c \
537	538	$(SRCDIR)/sha1.c \
538	539	$(SRCDIR)/sha1hard.c \
539	540	$(SRCDIR)/sha3.c \
540	541	$(SRCDIR)/shun.c \
541	542	$(SRCDIR)/sitemap.c \
		@@ -599,10 +600,11 @@
599	600	$(SRCDIR)/../skins/bootstrap/header.txt \
600	601	$(SRCDIR)/../skins/default/css.txt \
601	602	$(SRCDIR)/../skins/default/details.txt \
602	603	$(SRCDIR)/../skins/default/footer.txt \
603	604	$(SRCDIR)/../skins/default/header.txt \
	605	+ $(SRCDIR)/../skins/default/js.txt \
604	606	$(SRCDIR)/../skins/eagle/css.txt \
605	607	$(SRCDIR)/../skins/eagle/details.txt \
606	608	$(SRCDIR)/../skins/eagle/footer.txt \
607	609	$(SRCDIR)/../skins/eagle/header.txt \
608	610	$(SRCDIR)/../skins/enhanced1/css.txt \
		@@ -645,10 +647,11 @@
645	647	$(SRCDIR)/useredit.js \
646	648	$(SRCDIR)/wiki.wiki
647	649
648	650	TRANS_SRC = \
649	651	$(OBJDIR)/add_.c \
	652	+ $(OBJDIR)/alerts_.c \
650	653	$(OBJDIR)/allrepo_.c \
651	654	$(OBJDIR)/attach_.c \
652	655	$(OBJDIR)/backoffice_.c \
653	656	$(OBJDIR)/bag_.c \
654	657	$(OBJDIR)/bisect_.c \
		@@ -675,11 +678,10 @@
675	678	$(OBJDIR)/descendants_.c \
676	679	$(OBJDIR)/diff_.c \
677	680	$(OBJDIR)/diffcmd_.c \
678	681	$(OBJDIR)/dispatch_.c \
679	682	$(OBJDIR)/doc_.c \
680		- $(OBJDIR)/email_.c \
681	683	$(OBJDIR)/encode_.c \
682	684	$(OBJDIR)/etag_.c \
683	685	$(OBJDIR)/event_.c \
684	686	$(OBJDIR)/export_.c \
685	687	$(OBJDIR)/file_.c \
		@@ -740,10 +742,11 @@
740	742	$(OBJDIR)/rss_.c \
741	743	$(OBJDIR)/schema_.c \
742	744	$(OBJDIR)/search_.c \
743	745	$(OBJDIR)/security_audit_.c \
744	746	$(OBJDIR)/setup_.c \
	747	+ $(OBJDIR)/setupuser_.c \
745	748	$(OBJDIR)/sha1_.c \
746	749	$(OBJDIR)/sha1hard_.c \
747	750	$(OBJDIR)/sha3_.c \
748	751	$(OBJDIR)/shun_.c \
749	752	$(OBJDIR)/sitemap_.c \
		@@ -781,10 +784,11 @@
781	784	$(OBJDIR)/xfersetup_.c \
782	785	$(OBJDIR)/zip_.c
783	786
784	787	OBJ = \
785	788	$(OBJDIR)/add.o \
	789	+ $(OBJDIR)/alerts.o \
786	790	$(OBJDIR)/allrepo.o \
787	791	$(OBJDIR)/attach.o \
788	792	$(OBJDIR)/backoffice.o \
789	793	$(OBJDIR)/bag.o \
790	794	$(OBJDIR)/bisect.o \
		@@ -811,11 +815,10 @@
811	815	$(OBJDIR)/descendants.o \
812	816	$(OBJDIR)/diff.o \
813	817	$(OBJDIR)/diffcmd.o \
814	818	$(OBJDIR)/dispatch.o \
815	819	$(OBJDIR)/doc.o \
816		- $(OBJDIR)/email.o \
817	820	$(OBJDIR)/encode.o \
818	821	$(OBJDIR)/etag.o \
819	822	$(OBJDIR)/event.o \
820	823	$(OBJDIR)/export.o \
821	824	$(OBJDIR)/file.o \
		@@ -876,10 +879,11 @@
876	879	$(OBJDIR)/rss.o \
877	880	$(OBJDIR)/schema.o \
878	881	$(OBJDIR)/search.o \
879	882	$(OBJDIR)/security_audit.o \
880	883	$(OBJDIR)/setup.o \
	884	+ $(OBJDIR)/setupuser.o \
881	885	$(OBJDIR)/sha1.o \
882	886	$(OBJDIR)/sha1hard.o \
883	887	$(OBJDIR)/sha3.o \
884	888	$(OBJDIR)/shun.o \
885	889	$(OBJDIR)/sitemap.o \
		@@ -1136,10 +1140,11 @@
1136	1140	$(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES)
1137	1141	$(MKBUILTIN) --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
1138	1142
1139	1143	$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(OBJDIR)/default_css.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h
1140	1144	$(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
	1145	+ $(OBJDIR)/alerts_.c:$(OBJDIR)/alerts.h \
1141	1146	$(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
1142	1147	$(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
1143	1148	$(OBJDIR)/backoffice_.c:$(OBJDIR)/backoffice.h \
1144	1149	$(OBJDIR)/bag_.c:$(OBJDIR)/bag.h \
1145	1150	$(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h \
		@@ -1166,11 +1171,10 @@
1166	1171	$(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h \
1167	1172	$(OBJDIR)/diff_.c:$(OBJDIR)/diff.h \
1168	1173	$(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h \
1169	1174	$(OBJDIR)/dispatch_.c:$(OBJDIR)/dispatch.h \
1170	1175	$(OBJDIR)/doc_.c:$(OBJDIR)/doc.h \
1171		- $(OBJDIR)/email_.c:$(OBJDIR)/email.h \
1172	1176	$(OBJDIR)/encode_.c:$(OBJDIR)/encode.h \
1173	1177	$(OBJDIR)/etag_.c:$(OBJDIR)/etag.h \
1174	1178	$(OBJDIR)/event_.c:$(OBJDIR)/event.h \
1175	1179	$(OBJDIR)/export_.c:$(OBJDIR)/export.h \
1176	1180	$(OBJDIR)/file_.c:$(OBJDIR)/file.h \
		@@ -1231,10 +1235,11 @@
1231	1235	$(OBJDIR)/rss_.c:$(OBJDIR)/rss.h \
1232	1236	$(OBJDIR)/schema_.c:$(OBJDIR)/schema.h \
1233	1237	$(OBJDIR)/search_.c:$(OBJDIR)/search.h \
1234	1238	$(OBJDIR)/security_audit_.c:$(OBJDIR)/security_audit.h \
1235	1239	$(OBJDIR)/setup_.c:$(OBJDIR)/setup.h \
	1240	+ $(OBJDIR)/setupuser_.c:$(OBJDIR)/setupuser.h \
1236	1241	$(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h \
1237	1242	$(OBJDIR)/sha1hard_.c:$(OBJDIR)/sha1hard.h \
1238	1243	$(OBJDIR)/sha3_.c:$(OBJDIR)/sha3.h \
1239	1244	$(OBJDIR)/shun_.c:$(OBJDIR)/shun.h \
1240	1245	$(OBJDIR)/sitemap_.c:$(OBJDIR)/sitemap.h \
		@@ -1285,10 +1290,18 @@
1285	1290
1286	1291	$(OBJDIR)/add.o: $(OBJDIR)/add_.c $(OBJDIR)/add.h $(SRCDIR)/config.h
1287	1292	$(XTCC) -o $(OBJDIR)/add.o -c $(OBJDIR)/add_.c
1288	1293
1289	1294	$(OBJDIR)/add.h: $(OBJDIR)/headers
	1295	+
	1296	+$(OBJDIR)/alerts_.c: $(SRCDIR)/alerts.c $(TRANSLATE)
	1297	+ $(TRANSLATE) $(SRCDIR)/alerts.c >$@
	1298	+
	1299	+$(OBJDIR)/alerts.o: $(OBJDIR)/alerts_.c $(OBJDIR)/alerts.h $(SRCDIR)/config.h
	1300	+ $(XTCC) -o $(OBJDIR)/alerts.o -c $(OBJDIR)/alerts_.c
	1301	+
	1302	+$(OBJDIR)/alerts.h: $(OBJDIR)/headers
1290	1303
1291	1304	$(OBJDIR)/allrepo_.c: $(SRCDIR)/allrepo.c $(TRANSLATE)
1292	1305	$(TRANSLATE) $(SRCDIR)/allrepo.c >$@
1293	1306
1294	1307	$(OBJDIR)/allrepo.o: $(OBJDIR)/allrepo_.c $(OBJDIR)/allrepo.h $(SRCDIR)/config.h
		@@ -1526,18 +1539,10 @@
1526	1539	$(OBJDIR)/doc.o: $(OBJDIR)/doc_.c $(OBJDIR)/doc.h $(SRCDIR)/config.h
1527	1540	$(XTCC) -o $(OBJDIR)/doc.o -c $(OBJDIR)/doc_.c
1528	1541
1529	1542	$(OBJDIR)/doc.h: $(OBJDIR)/headers
1530	1543
1531		-$(OBJDIR)/email_.c: $(SRCDIR)/email.c $(TRANSLATE)
1532		- $(TRANSLATE) $(SRCDIR)/email.c >$@
1533		-
1534		-$(OBJDIR)/email.o: $(OBJDIR)/email_.c $(OBJDIR)/email.h $(SRCDIR)/config.h
1535		- $(XTCC) -o $(OBJDIR)/email.o -c $(OBJDIR)/email_.c
1536		-
1537		-$(OBJDIR)/email.h: $(OBJDIR)/headers
1538		-
1539	1544	$(OBJDIR)/encode_.c: $(SRCDIR)/encode.c $(TRANSLATE)
1540	1545	$(TRANSLATE) $(SRCDIR)/encode.c >$@
1541	1546
1542	1547	$(OBJDIR)/encode.o: $(OBJDIR)/encode_.c $(OBJDIR)/encode.h $(SRCDIR)/config.h
1543	1548	$(XTCC) -o $(OBJDIR)/encode.o -c $(OBJDIR)/encode_.c
		@@ -2045,10 +2050,18 @@
2045	2050
2046	2051	$(OBJDIR)/setup.o: $(OBJDIR)/setup_.c $(OBJDIR)/setup.h $(SRCDIR)/config.h
2047	2052	$(XTCC) -o $(OBJDIR)/setup.o -c $(OBJDIR)/setup_.c
2048	2053
2049	2054	$(OBJDIR)/setup.h: $(OBJDIR)/headers
	2055	+
	2056	+$(OBJDIR)/setupuser_.c: $(SRCDIR)/setupuser.c $(TRANSLATE)
	2057	+ $(TRANSLATE) $(SRCDIR)/setupuser.c >$@
	2058	+
	2059	+$(OBJDIR)/setupuser.o: $(OBJDIR)/setupuser_.c $(OBJDIR)/setupuser.h $(SRCDIR)/config.h
	2060	+ $(XTCC) -o $(OBJDIR)/setupuser.o -c $(OBJDIR)/setupuser_.c
	2061	+
	2062	+$(OBJDIR)/setupuser.h: $(OBJDIR)/headers
2050	2063
2051	2064	$(OBJDIR)/sha1_.c: $(SRCDIR)/sha1.c $(TRANSLATE)
2052	2065	$(TRANSLATE) $(SRCDIR)/sha1.c >$@
2053	2066
2054	2067	$(OBJDIR)/sha1.o: $(OBJDIR)/sha1_.c $(OBJDIR)/sha1.h $(SRCDIR)/config.h
2055	2068

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -160,11 +160,11 @@
160	endif
161
162	#### Disable creation of the OpenSSL shared libraries. Also, disable support
163	# for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
164	#
165	SSLCONFIG += no-ssl2 no-ssl3 no-shared
166
167	#### When using zlib, make sure that OpenSSL is configured to use the zlib
168	# that Fossil knows about (i.e. the one within the source tree).
169	#
170	ifndef FOSSIL_ENABLE_MINIZ
	@@ -437,10 +437,11 @@
437	XBCC = $(BCC) $(CFLAGS)
438	XTCC = $(TCC) $(CFLAGS) -I. -I$(SRCDIR)
439
440	SRC = \
441	$(SRCDIR)/add.c \

442	$(SRCDIR)/allrepo.c \
443	$(SRCDIR)/attach.c \
444	$(SRCDIR)/backoffice.c \
445	$(SRCDIR)/bag.c \
446	$(SRCDIR)/bisect.c \
	@@ -467,11 +468,10 @@
467	$(SRCDIR)/descendants.c \
468	$(SRCDIR)/diff.c \
469	$(SRCDIR)/diffcmd.c \
470	$(SRCDIR)/dispatch.c \
471	$(SRCDIR)/doc.c \
472	$(SRCDIR)/email.c \
473	$(SRCDIR)/encode.c \
474	$(SRCDIR)/etag.c \
475	$(SRCDIR)/event.c \
476	$(SRCDIR)/export.c \
477	$(SRCDIR)/file.c \
	@@ -532,10 +532,11 @@
532	$(SRCDIR)/rss.c \
533	$(SRCDIR)/schema.c \
534	$(SRCDIR)/search.c \
535	$(SRCDIR)/security_audit.c \
536	$(SRCDIR)/setup.c \

537	$(SRCDIR)/sha1.c \
538	$(SRCDIR)/sha1hard.c \
539	$(SRCDIR)/sha3.c \
540	$(SRCDIR)/shun.c \
541	$(SRCDIR)/sitemap.c \
	@@ -599,10 +600,11 @@
599	$(SRCDIR)/../skins/bootstrap/header.txt \
600	$(SRCDIR)/../skins/default/css.txt \
601	$(SRCDIR)/../skins/default/details.txt \
602	$(SRCDIR)/../skins/default/footer.txt \
603	$(SRCDIR)/../skins/default/header.txt \

604	$(SRCDIR)/../skins/eagle/css.txt \
605	$(SRCDIR)/../skins/eagle/details.txt \
606	$(SRCDIR)/../skins/eagle/footer.txt \
607	$(SRCDIR)/../skins/eagle/header.txt \
608	$(SRCDIR)/../skins/enhanced1/css.txt \
	@@ -645,10 +647,11 @@
645	$(SRCDIR)/useredit.js \
646	$(SRCDIR)/wiki.wiki
647
648	TRANS_SRC = \
649	$(OBJDIR)/add_.c \

650	$(OBJDIR)/allrepo_.c \
651	$(OBJDIR)/attach_.c \
652	$(OBJDIR)/backoffice_.c \
653	$(OBJDIR)/bag_.c \
654	$(OBJDIR)/bisect_.c \
	@@ -675,11 +678,10 @@
675	$(OBJDIR)/descendants_.c \
676	$(OBJDIR)/diff_.c \
677	$(OBJDIR)/diffcmd_.c \
678	$(OBJDIR)/dispatch_.c \
679	$(OBJDIR)/doc_.c \
680	$(OBJDIR)/email_.c \
681	$(OBJDIR)/encode_.c \
682	$(OBJDIR)/etag_.c \
683	$(OBJDIR)/event_.c \
684	$(OBJDIR)/export_.c \
685	$(OBJDIR)/file_.c \
	@@ -740,10 +742,11 @@
740	$(OBJDIR)/rss_.c \
741	$(OBJDIR)/schema_.c \
742	$(OBJDIR)/search_.c \
743	$(OBJDIR)/security_audit_.c \
744	$(OBJDIR)/setup_.c \

745	$(OBJDIR)/sha1_.c \
746	$(OBJDIR)/sha1hard_.c \
747	$(OBJDIR)/sha3_.c \
748	$(OBJDIR)/shun_.c \
749	$(OBJDIR)/sitemap_.c \
	@@ -781,10 +784,11 @@
781	$(OBJDIR)/xfersetup_.c \
782	$(OBJDIR)/zip_.c
783
784	OBJ = \
785	$(OBJDIR)/add.o \

786	$(OBJDIR)/allrepo.o \
787	$(OBJDIR)/attach.o \
788	$(OBJDIR)/backoffice.o \
789	$(OBJDIR)/bag.o \
790	$(OBJDIR)/bisect.o \
	@@ -811,11 +815,10 @@
811	$(OBJDIR)/descendants.o \
812	$(OBJDIR)/diff.o \
813	$(OBJDIR)/diffcmd.o \
814	$(OBJDIR)/dispatch.o \
815	$(OBJDIR)/doc.o \
816	$(OBJDIR)/email.o \
817	$(OBJDIR)/encode.o \
818	$(OBJDIR)/etag.o \
819	$(OBJDIR)/event.o \
820	$(OBJDIR)/export.o \
821	$(OBJDIR)/file.o \
	@@ -876,10 +879,11 @@
876	$(OBJDIR)/rss.o \
877	$(OBJDIR)/schema.o \
878	$(OBJDIR)/search.o \
879	$(OBJDIR)/security_audit.o \
880	$(OBJDIR)/setup.o \

881	$(OBJDIR)/sha1.o \
882	$(OBJDIR)/sha1hard.o \
883	$(OBJDIR)/sha3.o \
884	$(OBJDIR)/shun.o \
885	$(OBJDIR)/sitemap.o \
	@@ -1136,10 +1140,11 @@
1136	$(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES)
1137	$(MKBUILTIN) --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
1138
1139	$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(OBJDIR)/default_css.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h
1140	$(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \

1141	$(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
1142	$(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
1143	$(OBJDIR)/backoffice_.c:$(OBJDIR)/backoffice.h \
1144	$(OBJDIR)/bag_.c:$(OBJDIR)/bag.h \
1145	$(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h \
	@@ -1166,11 +1171,10 @@
1166	$(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h \
1167	$(OBJDIR)/diff_.c:$(OBJDIR)/diff.h \
1168	$(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h \
1169	$(OBJDIR)/dispatch_.c:$(OBJDIR)/dispatch.h \
1170	$(OBJDIR)/doc_.c:$(OBJDIR)/doc.h \
1171	$(OBJDIR)/email_.c:$(OBJDIR)/email.h \
1172	$(OBJDIR)/encode_.c:$(OBJDIR)/encode.h \
1173	$(OBJDIR)/etag_.c:$(OBJDIR)/etag.h \
1174	$(OBJDIR)/event_.c:$(OBJDIR)/event.h \
1175	$(OBJDIR)/export_.c:$(OBJDIR)/export.h \
1176	$(OBJDIR)/file_.c:$(OBJDIR)/file.h \
	@@ -1231,10 +1235,11 @@
1231	$(OBJDIR)/rss_.c:$(OBJDIR)/rss.h \
1232	$(OBJDIR)/schema_.c:$(OBJDIR)/schema.h \
1233	$(OBJDIR)/search_.c:$(OBJDIR)/search.h \
1234	$(OBJDIR)/security_audit_.c:$(OBJDIR)/security_audit.h \
1235	$(OBJDIR)/setup_.c:$(OBJDIR)/setup.h \

1236	$(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h \
1237	$(OBJDIR)/sha1hard_.c:$(OBJDIR)/sha1hard.h \
1238	$(OBJDIR)/sha3_.c:$(OBJDIR)/sha3.h \
1239	$(OBJDIR)/shun_.c:$(OBJDIR)/shun.h \
1240	$(OBJDIR)/sitemap_.c:$(OBJDIR)/sitemap.h \
	@@ -1285,10 +1290,18 @@
1285
1286	$(OBJDIR)/add.o: $(OBJDIR)/add_.c $(OBJDIR)/add.h $(SRCDIR)/config.h
1287	$(XTCC) -o $(OBJDIR)/add.o -c $(OBJDIR)/add_.c
1288
1289	$(OBJDIR)/add.h: $(OBJDIR)/headers








1290
1291	$(OBJDIR)/allrepo_.c: $(SRCDIR)/allrepo.c $(TRANSLATE)
1292	$(TRANSLATE) $(SRCDIR)/allrepo.c >$@
1293
1294	$(OBJDIR)/allrepo.o: $(OBJDIR)/allrepo_.c $(OBJDIR)/allrepo.h $(SRCDIR)/config.h
	@@ -1526,18 +1539,10 @@
1526	$(OBJDIR)/doc.o: $(OBJDIR)/doc_.c $(OBJDIR)/doc.h $(SRCDIR)/config.h
1527	$(XTCC) -o $(OBJDIR)/doc.o -c $(OBJDIR)/doc_.c
1528
1529	$(OBJDIR)/doc.h: $(OBJDIR)/headers
1530
1531	$(OBJDIR)/email_.c: $(SRCDIR)/email.c $(TRANSLATE)
1532	$(TRANSLATE) $(SRCDIR)/email.c >$@
1533
1534	$(OBJDIR)/email.o: $(OBJDIR)/email_.c $(OBJDIR)/email.h $(SRCDIR)/config.h
1535	$(XTCC) -o $(OBJDIR)/email.o -c $(OBJDIR)/email_.c
1536
1537	$(OBJDIR)/email.h: $(OBJDIR)/headers
1538
1539	$(OBJDIR)/encode_.c: $(SRCDIR)/encode.c $(TRANSLATE)
1540	$(TRANSLATE) $(SRCDIR)/encode.c >$@
1541
1542	$(OBJDIR)/encode.o: $(OBJDIR)/encode_.c $(OBJDIR)/encode.h $(SRCDIR)/config.h
1543	$(XTCC) -o $(OBJDIR)/encode.o -c $(OBJDIR)/encode_.c
	@@ -2045,10 +2050,18 @@
2045
2046	$(OBJDIR)/setup.o: $(OBJDIR)/setup_.c $(OBJDIR)/setup.h $(SRCDIR)/config.h
2047	$(XTCC) -o $(OBJDIR)/setup.o -c $(OBJDIR)/setup_.c
2048
2049	$(OBJDIR)/setup.h: $(OBJDIR)/headers








2050
2051	$(OBJDIR)/sha1_.c: $(SRCDIR)/sha1.c $(TRANSLATE)
2052	$(TRANSLATE) $(SRCDIR)/sha1.c >$@
2053
2054	$(OBJDIR)/sha1.o: $(OBJDIR)/sha1_.c $(OBJDIR)/sha1.h $(SRCDIR)/config.h
2055

	--- win/Makefile.mingw.mistachkin
	+++ win/Makefile.mingw.mistachkin
	@@ -160,11 +160,11 @@
160	endif
161
162	#### Disable creation of the OpenSSL shared libraries. Also, disable support
163	# for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
164	#
165	SSLCONFIG += no-ssl2 no-ssl3 no-weak-ssl-ciphers no-shared
166
167	#### When using zlib, make sure that OpenSSL is configured to use the zlib
168	# that Fossil knows about (i.e. the one within the source tree).
169	#
170	ifndef FOSSIL_ENABLE_MINIZ
	@@ -437,10 +437,11 @@
437	XBCC = $(BCC) $(CFLAGS)
438	XTCC = $(TCC) $(CFLAGS) -I. -I$(SRCDIR)
439
440	SRC = \
441	$(SRCDIR)/add.c \
442	$(SRCDIR)/alerts.c \
443	$(SRCDIR)/allrepo.c \
444	$(SRCDIR)/attach.c \
445	$(SRCDIR)/backoffice.c \
446	$(SRCDIR)/bag.c \
447	$(SRCDIR)/bisect.c \
	@@ -467,11 +468,10 @@
468	$(SRCDIR)/descendants.c \
469	$(SRCDIR)/diff.c \
470	$(SRCDIR)/diffcmd.c \
471	$(SRCDIR)/dispatch.c \
472	$(SRCDIR)/doc.c \

473	$(SRCDIR)/encode.c \
474	$(SRCDIR)/etag.c \
475	$(SRCDIR)/event.c \
476	$(SRCDIR)/export.c \
477	$(SRCDIR)/file.c \
	@@ -532,10 +532,11 @@
532	$(SRCDIR)/rss.c \
533	$(SRCDIR)/schema.c \
534	$(SRCDIR)/search.c \
535	$(SRCDIR)/security_audit.c \
536	$(SRCDIR)/setup.c \
537	$(SRCDIR)/setupuser.c \
538	$(SRCDIR)/sha1.c \
539	$(SRCDIR)/sha1hard.c \
540	$(SRCDIR)/sha3.c \
541	$(SRCDIR)/shun.c \
542	$(SRCDIR)/sitemap.c \
	@@ -599,10 +600,11 @@
600	$(SRCDIR)/../skins/bootstrap/header.txt \
601	$(SRCDIR)/../skins/default/css.txt \
602	$(SRCDIR)/../skins/default/details.txt \
603	$(SRCDIR)/../skins/default/footer.txt \
604	$(SRCDIR)/../skins/default/header.txt \
605	$(SRCDIR)/../skins/default/js.txt \
606	$(SRCDIR)/../skins/eagle/css.txt \
607	$(SRCDIR)/../skins/eagle/details.txt \
608	$(SRCDIR)/../skins/eagle/footer.txt \
609	$(SRCDIR)/../skins/eagle/header.txt \
610	$(SRCDIR)/../skins/enhanced1/css.txt \
	@@ -645,10 +647,11 @@
647	$(SRCDIR)/useredit.js \
648	$(SRCDIR)/wiki.wiki
649
650	TRANS_SRC = \
651	$(OBJDIR)/add_.c \
652	$(OBJDIR)/alerts_.c \
653	$(OBJDIR)/allrepo_.c \
654	$(OBJDIR)/attach_.c \
655	$(OBJDIR)/backoffice_.c \
656	$(OBJDIR)/bag_.c \
657	$(OBJDIR)/bisect_.c \
	@@ -675,11 +678,10 @@
678	$(OBJDIR)/descendants_.c \
679	$(OBJDIR)/diff_.c \
680	$(OBJDIR)/diffcmd_.c \
681	$(OBJDIR)/dispatch_.c \
682	$(OBJDIR)/doc_.c \

683	$(OBJDIR)/encode_.c \
684	$(OBJDIR)/etag_.c \
685	$(OBJDIR)/event_.c \
686	$(OBJDIR)/export_.c \
687	$(OBJDIR)/file_.c \
	@@ -740,10 +742,11 @@
742	$(OBJDIR)/rss_.c \
743	$(OBJDIR)/schema_.c \
744	$(OBJDIR)/search_.c \
745	$(OBJDIR)/security_audit_.c \
746	$(OBJDIR)/setup_.c \
747	$(OBJDIR)/setupuser_.c \
748	$(OBJDIR)/sha1_.c \
749	$(OBJDIR)/sha1hard_.c \
750	$(OBJDIR)/sha3_.c \
751	$(OBJDIR)/shun_.c \
752	$(OBJDIR)/sitemap_.c \
	@@ -781,10 +784,11 @@
784	$(OBJDIR)/xfersetup_.c \
785	$(OBJDIR)/zip_.c
786
787	OBJ = \
788	$(OBJDIR)/add.o \
789	$(OBJDIR)/alerts.o \
790	$(OBJDIR)/allrepo.o \
791	$(OBJDIR)/attach.o \
792	$(OBJDIR)/backoffice.o \
793	$(OBJDIR)/bag.o \
794	$(OBJDIR)/bisect.o \
	@@ -811,11 +815,10 @@
815	$(OBJDIR)/descendants.o \
816	$(OBJDIR)/diff.o \
817	$(OBJDIR)/diffcmd.o \
818	$(OBJDIR)/dispatch.o \
819	$(OBJDIR)/doc.o \

820	$(OBJDIR)/encode.o \
821	$(OBJDIR)/etag.o \
822	$(OBJDIR)/event.o \
823	$(OBJDIR)/export.o \
824	$(OBJDIR)/file.o \
	@@ -876,10 +879,11 @@
879	$(OBJDIR)/rss.o \
880	$(OBJDIR)/schema.o \
881	$(OBJDIR)/search.o \
882	$(OBJDIR)/security_audit.o \
883	$(OBJDIR)/setup.o \
884	$(OBJDIR)/setupuser.o \
885	$(OBJDIR)/sha1.o \
886	$(OBJDIR)/sha1hard.o \
887	$(OBJDIR)/sha3.o \
888	$(OBJDIR)/shun.o \
889	$(OBJDIR)/sitemap.o \
	@@ -1136,10 +1140,11 @@
1140	$(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES)
1141	$(MKBUILTIN) --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
1142
1143	$(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(OBJDIR)/default_css.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h
1144	$(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
1145	$(OBJDIR)/alerts_.c:$(OBJDIR)/alerts.h \
1146	$(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
1147	$(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
1148	$(OBJDIR)/backoffice_.c:$(OBJDIR)/backoffice.h \
1149	$(OBJDIR)/bag_.c:$(OBJDIR)/bag.h \
1150	$(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h \
	@@ -1166,11 +1171,10 @@
1171	$(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h \
1172	$(OBJDIR)/diff_.c:$(OBJDIR)/diff.h \
1173	$(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h \
1174	$(OBJDIR)/dispatch_.c:$(OBJDIR)/dispatch.h \
1175	$(OBJDIR)/doc_.c:$(OBJDIR)/doc.h \

1176	$(OBJDIR)/encode_.c:$(OBJDIR)/encode.h \
1177	$(OBJDIR)/etag_.c:$(OBJDIR)/etag.h \
1178	$(OBJDIR)/event_.c:$(OBJDIR)/event.h \
1179	$(OBJDIR)/export_.c:$(OBJDIR)/export.h \
1180	$(OBJDIR)/file_.c:$(OBJDIR)/file.h \
	@@ -1231,10 +1235,11 @@
1235	$(OBJDIR)/rss_.c:$(OBJDIR)/rss.h \
1236	$(OBJDIR)/schema_.c:$(OBJDIR)/schema.h \
1237	$(OBJDIR)/search_.c:$(OBJDIR)/search.h \
1238	$(OBJDIR)/security_audit_.c:$(OBJDIR)/security_audit.h \
1239	$(OBJDIR)/setup_.c:$(OBJDIR)/setup.h \
1240	$(OBJDIR)/setupuser_.c:$(OBJDIR)/setupuser.h \
1241	$(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h \
1242	$(OBJDIR)/sha1hard_.c:$(OBJDIR)/sha1hard.h \
1243	$(OBJDIR)/sha3_.c:$(OBJDIR)/sha3.h \
1244	$(OBJDIR)/shun_.c:$(OBJDIR)/shun.h \
1245	$(OBJDIR)/sitemap_.c:$(OBJDIR)/sitemap.h \
	@@ -1285,10 +1290,18 @@
1290
1291	$(OBJDIR)/add.o: $(OBJDIR)/add_.c $(OBJDIR)/add.h $(SRCDIR)/config.h
1292	$(XTCC) -o $(OBJDIR)/add.o -c $(OBJDIR)/add_.c
1293
1294	$(OBJDIR)/add.h: $(OBJDIR)/headers
1295
1296	$(OBJDIR)/alerts_.c: $(SRCDIR)/alerts.c $(TRANSLATE)
1297	$(TRANSLATE) $(SRCDIR)/alerts.c >$@
1298
1299	$(OBJDIR)/alerts.o: $(OBJDIR)/alerts_.c $(OBJDIR)/alerts.h $(SRCDIR)/config.h
1300	$(XTCC) -o $(OBJDIR)/alerts.o -c $(OBJDIR)/alerts_.c
1301
1302	$(OBJDIR)/alerts.h: $(OBJDIR)/headers
1303
1304	$(OBJDIR)/allrepo_.c: $(SRCDIR)/allrepo.c $(TRANSLATE)
1305	$(TRANSLATE) $(SRCDIR)/allrepo.c >$@
1306
1307	$(OBJDIR)/allrepo.o: $(OBJDIR)/allrepo_.c $(OBJDIR)/allrepo.h $(SRCDIR)/config.h
	@@ -1526,18 +1539,10 @@
1539	$(OBJDIR)/doc.o: $(OBJDIR)/doc_.c $(OBJDIR)/doc.h $(SRCDIR)/config.h
1540	$(XTCC) -o $(OBJDIR)/doc.o -c $(OBJDIR)/doc_.c
1541
1542	$(OBJDIR)/doc.h: $(OBJDIR)/headers
1543








1544	$(OBJDIR)/encode_.c: $(SRCDIR)/encode.c $(TRANSLATE)
1545	$(TRANSLATE) $(SRCDIR)/encode.c >$@
1546
1547	$(OBJDIR)/encode.o: $(OBJDIR)/encode_.c $(OBJDIR)/encode.h $(SRCDIR)/config.h
1548	$(XTCC) -o $(OBJDIR)/encode.o -c $(OBJDIR)/encode_.c
	@@ -2045,10 +2050,18 @@
2050
2051	$(OBJDIR)/setup.o: $(OBJDIR)/setup_.c $(OBJDIR)/setup.h $(SRCDIR)/config.h
2052	$(XTCC) -o $(OBJDIR)/setup.o -c $(OBJDIR)/setup_.c
2053
2054	$(OBJDIR)/setup.h: $(OBJDIR)/headers
2055
2056	$(OBJDIR)/setupuser_.c: $(SRCDIR)/setupuser.c $(TRANSLATE)
2057	$(TRANSLATE) $(SRCDIR)/setupuser.c >$@
2058
2059	$(OBJDIR)/setupuser.o: $(OBJDIR)/setupuser_.c $(OBJDIR)/setupuser.h $(SRCDIR)/config.h
2060	$(XTCC) -o $(OBJDIR)/setupuser.o -c $(OBJDIR)/setupuser_.c
2061
2062	$(OBJDIR)/setupuser.h: $(OBJDIR)/headers
2063
2064	$(OBJDIR)/sha1_.c: $(SRCDIR)/sha1.c $(TRANSLATE)
2065	$(TRANSLATE) $(SRCDIR)/sha1.c >$@
2066
2067	$(OBJDIR)/sha1.o: $(OBJDIR)/sha1_.c $(OBJDIR)/sha1.h $(SRCDIR)/config.h
2068

M win/Makefile.msc

+6 -6

		--- win/Makefile.msc
		+++ win/Makefile.msc
		@@ -110,11 +110,11 @@
110	110	SSLLFLAGS = /nologo /opt:ref /debug
111	111	SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib crypt32.lib
112	112	!if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
113	113	!message Using 'x64' platform for OpenSSL...
114	114	# BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
115		-# SSLCONFIG = VC-WIN64A no-asm no-ssl2 no-ssl3
	115	+# SSLCONFIG = VC-WIN64A no-asm no-ssl2 no-ssl3 no-weak-ssl-ciphers
116	116	SSLCONFIG = VC-WIN64A no-asm
117	117	!if $(FOSSIL_DYNAMIC_BUILD)!=0
118	118	SSLCONFIG = $(SSLCONFIG) shared
119	119	!else
120	120	SSLCONFIG = $(SSLCONFIG) no-shared
		@@ -125,16 +125,16 @@
125	125	!else
126	126	SSLNMAKE = ms\nt.mak all
127	127	!endif
128	128	# BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
129	129	!if $(FOSSIL_DYNAMIC_BUILD)==0
130		-SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
	130	+SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
131	131	!endif
132	132	!elseif "$(PLATFORM)"=="ia64"
133	133	!message Using 'ia64' platform for OpenSSL...
134	134	# BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
135		-# SSLCONFIG = VC-WIN64I no-asm no-ssl2 no-ssl3
	135	+# SSLCONFIG = VC-WIN64I no-asm no-ssl2 no-ssl3 no-weak-ssl-ciphers
136	136	SSLCONFIG = VC-WIN64I no-asm
137	137	!if $(FOSSIL_DYNAMIC_BUILD)!=0
138	138	SSLCONFIG = $(SSLCONFIG) shared
139	139	!else
140	140	SSLCONFIG = $(SSLCONFIG) no-shared
		@@ -145,16 +145,16 @@
145	145	!else
146	146	SSLNMAKE = ms\nt.mak all
147	147	!endif
148	148	# BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
149	149	!if $(FOSSIL_DYNAMIC_BUILD)==0
150		-SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
	150	+SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
151	151	!endif
152	152	!else
153	153	!message Assuming 'x86' platform for OpenSSL...
154	154	# BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
155		-# SSLCONFIG = VC-WIN32 no-asm no-ssl2 no-ssl3
	155	+# SSLCONFIG = VC-WIN32 no-asm no-ssl2 no-ssl3 no-weak-ssl-ciphers
156	156	SSLCONFIG = VC-WIN32 no-asm
157	157	!if $(FOSSIL_DYNAMIC_BUILD)!=0
158	158	SSLCONFIG = $(SSLCONFIG) shared
159	159	!else
160	160	SSLCONFIG = $(SSLCONFIG) no-shared
		@@ -165,11 +165,11 @@
165	165	!else
166	166	SSLNMAKE = ms\nt.mak all
167	167	!endif
168	168	# BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
169	169	!if $(FOSSIL_DYNAMIC_BUILD)==0
170		-SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
	170	+SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
171	171	!endif
172	172	!endif
173	173	!endif
174	174
175	175	!if $(FOSSIL_ENABLE_TCL)!=0
176	176

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -110,11 +110,11 @@
110	SSLLFLAGS = /nologo /opt:ref /debug
111	SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib crypt32.lib
112	!if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
113	!message Using 'x64' platform for OpenSSL...
114	# BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
115	# SSLCONFIG = VC-WIN64A no-asm no-ssl2 no-ssl3
116	SSLCONFIG = VC-WIN64A no-asm
117	!if $(FOSSIL_DYNAMIC_BUILD)!=0
118	SSLCONFIG = $(SSLCONFIG) shared
119	!else
120	SSLCONFIG = $(SSLCONFIG) no-shared
	@@ -125,16 +125,16 @@
125	!else
126	SSLNMAKE = ms\nt.mak all
127	!endif
128	# BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
129	!if $(FOSSIL_DYNAMIC_BUILD)==0
130	SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
131	!endif
132	!elseif "$(PLATFORM)"=="ia64"
133	!message Using 'ia64' platform for OpenSSL...
134	# BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
135	# SSLCONFIG = VC-WIN64I no-asm no-ssl2 no-ssl3
136	SSLCONFIG = VC-WIN64I no-asm
137	!if $(FOSSIL_DYNAMIC_BUILD)!=0
138	SSLCONFIG = $(SSLCONFIG) shared
139	!else
140	SSLCONFIG = $(SSLCONFIG) no-shared
	@@ -145,16 +145,16 @@
145	!else
146	SSLNMAKE = ms\nt.mak all
147	!endif
148	# BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
149	!if $(FOSSIL_DYNAMIC_BUILD)==0
150	SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
151	!endif
152	!else
153	!message Assuming 'x86' platform for OpenSSL...
154	# BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
155	# SSLCONFIG = VC-WIN32 no-asm no-ssl2 no-ssl3
156	SSLCONFIG = VC-WIN32 no-asm
157	!if $(FOSSIL_DYNAMIC_BUILD)!=0
158	SSLCONFIG = $(SSLCONFIG) shared
159	!else
160	SSLCONFIG = $(SSLCONFIG) no-shared
	@@ -165,11 +165,11 @@
165	!else
166	SSLNMAKE = ms\nt.mak all
167	!endif
168	# BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
169	!if $(FOSSIL_DYNAMIC_BUILD)==0
170	SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3
171	!endif
172	!endif
173	!endif
174
175	!if $(FOSSIL_ENABLE_TCL)!=0
176

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -110,11 +110,11 @@
110	SSLLFLAGS = /nologo /opt:ref /debug
111	SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib crypt32.lib
112	!if "$(PLATFORM)"=="amd64" \|\| "$(PLATFORM)"=="x64"
113	!message Using 'x64' platform for OpenSSL...
114	# BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
115	# SSLCONFIG = VC-WIN64A no-asm no-ssl2 no-ssl3 no-weak-ssl-ciphers
116	SSLCONFIG = VC-WIN64A no-asm
117	!if $(FOSSIL_DYNAMIC_BUILD)!=0
118	SSLCONFIG = $(SSLCONFIG) shared
119	!else
120	SSLCONFIG = $(SSLCONFIG) no-shared
	@@ -125,16 +125,16 @@
125	!else
126	SSLNMAKE = ms\nt.mak all
127	!endif
128	# BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
129	!if $(FOSSIL_DYNAMIC_BUILD)==0
130	SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
131	!endif
132	!elseif "$(PLATFORM)"=="ia64"
133	!message Using 'ia64' platform for OpenSSL...
134	# BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
135	# SSLCONFIG = VC-WIN64I no-asm no-ssl2 no-ssl3 no-weak-ssl-ciphers
136	SSLCONFIG = VC-WIN64I no-asm
137	!if $(FOSSIL_DYNAMIC_BUILD)!=0
138	SSLCONFIG = $(SSLCONFIG) shared
139	!else
140	SSLCONFIG = $(SSLCONFIG) no-shared
	@@ -145,16 +145,16 @@
145	!else
146	SSLNMAKE = ms\nt.mak all
147	!endif
148	# BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
149	!if $(FOSSIL_DYNAMIC_BUILD)==0
150	SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
151	!endif
152	!else
153	!message Assuming 'x86' platform for OpenSSL...
154	# BUGBUG (OpenSSL): Using "no-ssl*" here breaks the build.
155	# SSLCONFIG = VC-WIN32 no-asm no-ssl2 no-ssl3 no-weak-ssl-ciphers
156	SSLCONFIG = VC-WIN32 no-asm
157	!if $(FOSSIL_DYNAMIC_BUILD)!=0
158	SSLCONFIG = $(SSLCONFIG) shared
159	!else
160	SSLCONFIG = $(SSLCONFIG) no-shared
	@@ -165,11 +165,11 @@
165	!else
166	SSLNMAKE = ms\nt.mak all
167	!endif
168	# BUGBUG (OpenSSL): Using "OPENSSL_NO_SSL*" here breaks dynamic builds.
169	!if $(FOSSIL_DYNAMIC_BUILD)==0
170	SSLCFLAGS = -DOPENSSL_NO_SSL2 -DOPENSSL_NO_SSL3 -DOPENSSL_NO_WEAK_SSL_CIPHERS
171	!endif
172	!endif
173	!endif
174
175	!if $(FOSSIL_ENABLE_TCL)!=0
176

Fossil SCM

Keyboard Shortcuts