Fossil SCM

Merge the Makefile changes for OpenSSL-1.1.

jan.nijtmans 2019-05-16 08:17 branch-2.8
Commit c8bd45c1aa0d18b21218a585377dc799c61751d8b32f6897b9b277d3594d19d6
Parent 9ef58dcff25637a…
13 files changed +2 -2 +2 -2 +37 -74 +37 -74 +3 -3 +3 -3 +3 -3 +3 -3 +34 -71 +34 -71 +1 -1 +1 -1
~ Dockerfile ~ Dockerfile ~ Makefile.classic ~ src/makemake.tcl ~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc ~ win/Makefile.msc ~ www/build.wiki ~ www/build.wiki
M Dockerfile
+2 -2
--- Dockerfile
+++ Dockerfile
@@ -1,15 +1,15 @@
11
 ###
22
 # Dockerfile for Fossil
33
 ###
4
-FROM fedora:28
4
+FROM fedora:29
55
66
 ### Now install some additional parts we will need for the build
77
 RUN dnf update -y && dnf install -y gcc make tcl tcl-devel zlib-devel openssl-devel tar && dnf clean all && groupadd -r fossil -g 433 && useradd -u 431 -r -g fossil -d /opt/fossil -s /sbin/nologin -c "Fossil user" fossil
88
99
 ### If you want to build "trunk", change the next line accordingly.
10
-ENV FOSSIL_INSTALL_VERSION release
10
+ENV FOSSIL_INSTALL_VERSION branch-2.8
1111
1212
 RUN curl "https://www.fossil-scm.org/index.html/tarball/fossil-src.tar.gz?name=fossil-src&uuid=${FOSSIL_INSTALL_VERSION}" | tar zx
1313
 RUN cd fossil-src && ./configure --disable-fusefs --json --with-th1-docs --with-th1-hooks --with-tcl=1 --with-tcl-stubs --with-tcl-private-stubs
1414
 RUN cd fossil-src/src && mv main.c main.c.orig && sed s/\"now\"/0/ <main.c.orig >main.c
1515
 RUN cd fossil-src && make && strip fossil && cp fossil /usr/bin && cd .. && rm -rf fossil-src && chmod a+rx /usr/bin/fossil && mkdir -p /opt/fossil && chown fossil:fossil /opt/fossil
1616
--- Dockerfile
+++ Dockerfile
@@ -1,15 +1,15 @@
1 ###
2 # Dockerfile for Fossil
3 ###
4 FROM fedora:28
5
6 ### Now install some additional parts we will need for the build
7 RUN dnf update -y && dnf install -y gcc make tcl tcl-devel zlib-devel openssl-devel tar && dnf clean all && groupadd -r fossil -g 433 && useradd -u 431 -r -g fossil -d /opt/fossil -s /sbin/nologin -c "Fossil user" fossil
8
9 ### If you want to build "trunk", change the next line accordingly.
10 ENV FOSSIL_INSTALL_VERSION release
11
12 RUN curl "https://www.fossil-scm.org/index.html/tarball/fossil-src.tar.gz?name=fossil-src&uuid=${FOSSIL_INSTALL_VERSION}" | tar zx
13 RUN cd fossil-src && ./configure --disable-fusefs --json --with-th1-docs --with-th1-hooks --with-tcl=1 --with-tcl-stubs --with-tcl-private-stubs
14 RUN cd fossil-src/src && mv main.c main.c.orig && sed s/\"now\"/0/ <main.c.orig >main.c
15 RUN cd fossil-src && make && strip fossil && cp fossil /usr/bin && cd .. && rm -rf fossil-src && chmod a+rx /usr/bin/fossil && mkdir -p /opt/fossil && chown fossil:fossil /opt/fossil
16
--- Dockerfile
+++ Dockerfile
@@ -1,15 +1,15 @@
1 ###
2 # Dockerfile for Fossil
3 ###
4 FROM fedora:29
5
6 ### Now install some additional parts we will need for the build
7 RUN dnf update -y && dnf install -y gcc make tcl tcl-devel zlib-devel openssl-devel tar && dnf clean all && groupadd -r fossil -g 433 && useradd -u 431 -r -g fossil -d /opt/fossil -s /sbin/nologin -c "Fossil user" fossil
8
9 ### If you want to build "trunk", change the next line accordingly.
10 ENV FOSSIL_INSTALL_VERSION branch-2.8
11
12 RUN curl "https://www.fossil-scm.org/index.html/tarball/fossil-src.tar.gz?name=fossil-src&uuid=${FOSSIL_INSTALL_VERSION}" | tar zx
13 RUN cd fossil-src && ./configure --disable-fusefs --json --with-th1-docs --with-th1-hooks --with-tcl=1 --with-tcl-stubs --with-tcl-private-stubs
14 RUN cd fossil-src/src && mv main.c main.c.orig && sed s/\"now\"/0/ <main.c.orig >main.c
15 RUN cd fossil-src && make && strip fossil && cp fossil /usr/bin && cd .. && rm -rf fossil-src && chmod a+rx /usr/bin/fossil && mkdir -p /opt/fossil && chown fossil:fossil /opt/fossil
16
M Dockerfile
+2 -2
--- Dockerfile
+++ Dockerfile
@@ -1,15 +1,15 @@
11
 ###
22
 # Dockerfile for Fossil
33
 ###
4
-FROM fedora:28
4
+FROM fedora:29
55
66
 ### Now install some additional parts we will need for the build
77
 RUN dnf update -y && dnf install -y gcc make tcl tcl-devel zlib-devel openssl-devel tar && dnf clean all && groupadd -r fossil -g 433 && useradd -u 431 -r -g fossil -d /opt/fossil -s /sbin/nologin -c "Fossil user" fossil
88
99
 ### If you want to build "trunk", change the next line accordingly.
10
-ENV FOSSIL_INSTALL_VERSION release
10
+ENV FOSSIL_INSTALL_VERSION branch-2.8
1111
1212
 RUN curl "https://www.fossil-scm.org/index.html/tarball/fossil-src.tar.gz?name=fossil-src&uuid=${FOSSIL_INSTALL_VERSION}" | tar zx
1313
 RUN cd fossil-src && ./configure --disable-fusefs --json --with-th1-docs --with-th1-hooks --with-tcl=1 --with-tcl-stubs --with-tcl-private-stubs
1414
 RUN cd fossil-src/src && mv main.c main.c.orig && sed s/\"now\"/0/ <main.c.orig >main.c
1515
 RUN cd fossil-src && make && strip fossil && cp fossil /usr/bin && cd .. && rm -rf fossil-src && chmod a+rx /usr/bin/fossil && mkdir -p /opt/fossil && chown fossil:fossil /opt/fossil
1616
--- Dockerfile
+++ Dockerfile
@@ -1,15 +1,15 @@
1 ###
2 # Dockerfile for Fossil
3 ###
4 FROM fedora:28
5
6 ### Now install some additional parts we will need for the build
7 RUN dnf update -y && dnf install -y gcc make tcl tcl-devel zlib-devel openssl-devel tar && dnf clean all && groupadd -r fossil -g 433 && useradd -u 431 -r -g fossil -d /opt/fossil -s /sbin/nologin -c "Fossil user" fossil
8
9 ### If you want to build "trunk", change the next line accordingly.
10 ENV FOSSIL_INSTALL_VERSION release
11
12 RUN curl "https://www.fossil-scm.org/index.html/tarball/fossil-src.tar.gz?name=fossil-src&uuid=${FOSSIL_INSTALL_VERSION}" | tar zx
13 RUN cd fossil-src && ./configure --disable-fusefs --json --with-th1-docs --with-th1-hooks --with-tcl=1 --with-tcl-stubs --with-tcl-private-stubs
14 RUN cd fossil-src/src && mv main.c main.c.orig && sed s/\"now\"/0/ <main.c.orig >main.c
15 RUN cd fossil-src && make && strip fossil && cp fossil /usr/bin && cd .. && rm -rf fossil-src && chmod a+rx /usr/bin/fossil && mkdir -p /opt/fossil && chown fossil:fossil /opt/fossil
16
--- Dockerfile
+++ Dockerfile
@@ -1,15 +1,15 @@
1 ###
2 # Dockerfile for Fossil
3 ###
4 FROM fedora:29
5
6 ### Now install some additional parts we will need for the build
7 RUN dnf update -y && dnf install -y gcc make tcl tcl-devel zlib-devel openssl-devel tar && dnf clean all && groupadd -r fossil -g 433 && useradd -u 431 -r -g fossil -d /opt/fossil -s /sbin/nologin -c "Fossil user" fossil
8
9 ### If you want to build "trunk", change the next line accordingly.
10 ENV FOSSIL_INSTALL_VERSION branch-2.8
11
12 RUN curl "https://www.fossil-scm.org/index.html/tarball/fossil-src.tar.gz?name=fossil-src&uuid=${FOSSIL_INSTALL_VERSION}" | tar zx
13 RUN cd fossil-src && ./configure --disable-fusefs --json --with-th1-docs --with-th1-hooks --with-tcl=1 --with-tcl-stubs --with-tcl-private-stubs
14 RUN cd fossil-src/src && mv main.c main.c.orig && sed s/\"now\"/0/ <main.c.orig >main.c
15 RUN cd fossil-src && make && strip fossil && cp fossil /usr/bin && cd .. && rm -rf fossil-src && chmod a+rx /usr/bin/fossil && mkdir -p /opt/fossil && chown fossil:fossil /opt/fossil
16
M Makefile.classic

No diff available

M src/makemake.tcl
+37 -74
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -694,13 +694,13 @@
694694
 ZLIBCONFIG =
695695
 ZLIBTARGETS =
696696
 endif
697697
698698
 #### Disable creation of the OpenSSL shared libraries. Also, disable support
699
-# for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
699
+# for SSLv3 (i.e. thereby forcing the use of TLS).
700700
 #
701
-SSLCONFIG += no-ssl2 no-ssl3 no-weak-ssl-ciphers no-shared
701
+SSLCONFIG += no-ssl3 no-weak-ssl-ciphers no-shared
702702
703703
 #### When using zlib, make sure that OpenSSL is configured to use the zlib
704704
 # that Fossil knows about (i.e. the one within the source tree).
705705
 #
706706
 ifndef FOSSIL_ENABLE_MINIZ
@@ -710,11 +710,11 @@
710710
 #### The directories where the OpenSSL include and library files are located.
711711
 # The recommended usage here is to use the Sysinternals junction tool
712712
 # to create a hard link between an "openssl-1.x" sub-directory of the
713713
 # Fossil source code directory and the target OpenSSL source directory.
714714
 #
715
-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2q
715
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1b
716716
 OPENSSLINCDIR = $(OPENSSLDIR)/include
717717
 OPENSSLLIBDIR = $(OPENSSLDIR)
718718
719719
 #### Either the directory where the Tcl library is installed or the Tcl
720720
 # source code directory resides (depending on the value of the macro
@@ -1566,78 +1566,42 @@
15661566
 !ifndef USE_SEE
15671567
 USE_SEE = 0
15681568
 !endif
15691569
15701570
 !if $(FOSSIL_ENABLE_SSL)!=0
1571
-SSLDIR = $(B)\compat\openssl-1.0.2q
1572
-SSLINCDIR = $(SSLDIR)\inc32
1573
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
1574
-SSLLIBDIR = $(SSLDIR)\out32dll
1575
-!else
1576
-SSLLIBDIR = $(SSLDIR)\out32
1577
-!endif
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
1589
-!endif
1590
-SSLSETUP = ms\do_win64a.bat
1591
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
1592
-SSLNMAKE = ms\ntdll.mak all
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
1609
-!endif
1610
-SSLSETUP = ms\do_win64i.bat
1611
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
1612
-SSLNMAKE = ms\ntdll.mak all
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
1629
-!endif
1630
-SSLSETUP = ms\do_ms.bat
1631
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
1632
-SSLNMAKE = ms\ntdll.mak all
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
1571
+SSLDIR = $(B)\compat\openssl-1.1.1b
1572
+SSLINCDIR = $(SSLDIR)\include
1573
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
1574
+SSLLIBDIR = $(SSLDIR)
1575
+!else
1576
+SSLLIBDIR = $(SSLDIR)
1577
+!endif
1578
+SSLLFLAGS = /nologo /opt:ref /debug
1579
+SSLLIB = libssl.lib libcrypto.lib user32.lib gdi32.lib crypt32.lib
1580
+!if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
1581
+!message Using 'x64' platform for OpenSSL...
1582
+SSLCONFIG = VC-WIN64A no-asm no-ssl3 no-weak-ssl-ciphers
1583
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
1584
+SSLCONFIG = $(SSLCONFIG) shared
1585
+!else
1586
+SSLCONFIG = $(SSLCONFIG) no-shared
1587
+!endif
1588
+!elseif "$(PLATFORM)"=="ia64"
1589
+!message Using 'ia64' platform for OpenSSL...
1590
+SSLCONFIG = VC-WIN64I no-asm no-ssl3 no-weak-ssl-ciphers
1591
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
1592
+SSLCONFIG = $(SSLCONFIG) shared
1593
+!else
1594
+SSLCONFIG = $(SSLCONFIG) no-shared
1595
+!endif
1596
+!else
1597
+!message Assuming 'x86' platform for OpenSSL...
1598
+SSLCONFIG = VC-WIN32 no-asm no-ssl3 no-weak-ssl-ciphers
1599
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
1600
+SSLCONFIG = $(SSLCONFIG) shared
1601
+!else
1602
+SSLCONFIG = $(SSLCONFIG) no-shared
16391603
 !endif
16401604
 !endif
16411605
 !endif
16421606
16431607
 !if $(FOSSIL_ENABLE_TCL)!=0
@@ -1856,15 +1820,14 @@
18561820
 @echo Building OpenSSL from "$(SSLDIR)"...
18571821
 !if "$(PERLDIR)" != ""
18581822
 @set PATH=$(PERLDIR);$(PATH)
18591823
 !endif
18601824
 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
1861
- @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
18621825
 !if $(FOSSIL_ENABLE_WINXP)!=0
1863
- @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS) $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
1826
+ @pushd "$(SSLDIR)" && $(MAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(XPLDFLAGS)" && popd
18641827
 !else
1865
- @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS)" && popd
1828
+ @pushd "$(SSLDIR)" && $(MAKE) && popd
18661829
 !endif
18671830
 !endif
18681831
18691832
 !if $(FOSSIL_ENABLE_MINIZ)==0
18701833
 !if $(FOSSIL_BUILD_ZLIB)!=0
18711834
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -694,13 +694,13 @@
694 ZLIBCONFIG =
695 ZLIBTARGETS =
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
@@ -710,11 +710,11 @@
710 #### The directories where the OpenSSL include and library files are located.
711 # The recommended usage here is to use the Sysinternals junction tool
712 # to create a hard link between an "openssl-1.x" sub-directory of the
713 # Fossil source code directory and the target OpenSSL source directory.
714 #
715 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2q
716 OPENSSLINCDIR = $(OPENSSLDIR)/include
717 OPENSSLLIBDIR = $(OPENSSLDIR)
718
719 #### Either the directory where the Tcl library is installed or the Tcl
720 # source code directory resides (depending on the value of the macro
@@ -1566,78 +1566,42 @@
1566 !ifndef USE_SEE
1567 USE_SEE = 0
1568 !endif
1569
1570 !if $(FOSSIL_ENABLE_SSL)!=0
1571 SSLDIR = $(B)\compat\openssl-1.0.2q
1572 SSLINCDIR = $(SSLDIR)\inc32
1573 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1574 SSLLIBDIR = $(SSLDIR)\out32dll
1575 !else
1576 SSLLIBDIR = $(SSLDIR)\out32
1577 !endif
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
1589 !endif
1590 SSLSETUP = ms\do_win64a.bat
1591 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1592 SSLNMAKE = ms\ntdll.mak all
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
1609 !endif
1610 SSLSETUP = ms\do_win64i.bat
1611 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1612 SSLNMAKE = ms\ntdll.mak all
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
1629 !endif
1630 SSLSETUP = ms\do_ms.bat
1631 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1632 SSLNMAKE = ms\ntdll.mak all
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
@@ -1856,15 +1820,14 @@
1856 @echo Building OpenSSL from "$(SSLDIR)"...
1857 !if "$(PERLDIR)" != ""
1858 @set PATH=$(PERLDIR);$(PATH)
1859 !endif
1860 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
1861 @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
1862 !if $(FOSSIL_ENABLE_WINXP)!=0
1863 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS) $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
1864 !else
1865 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS)" && popd
1866 !endif
1867 !endif
1868
1869 !if $(FOSSIL_ENABLE_MINIZ)==0
1870 !if $(FOSSIL_BUILD_ZLIB)!=0
1871
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -694,13 +694,13 @@
694 ZLIBCONFIG =
695 ZLIBTARGETS =
696 endif
697
698 #### Disable creation of the OpenSSL shared libraries. Also, disable support
699 # for SSLv3 (i.e. thereby forcing the use of TLS).
700 #
701 SSLCONFIG += 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
@@ -710,11 +710,11 @@
710 #### The directories where the OpenSSL include and library files are located.
711 # The recommended usage here is to use the Sysinternals junction tool
712 # to create a hard link between an "openssl-1.x" sub-directory of the
713 # Fossil source code directory and the target OpenSSL source directory.
714 #
715 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1b
716 OPENSSLINCDIR = $(OPENSSLDIR)/include
717 OPENSSLLIBDIR = $(OPENSSLDIR)
718
719 #### Either the directory where the Tcl library is installed or the Tcl
720 # source code directory resides (depending on the value of the macro
@@ -1566,78 +1566,42 @@
1566 !ifndef USE_SEE
1567 USE_SEE = 0
1568 !endif
1569
1570 !if $(FOSSIL_ENABLE_SSL)!=0
1571 SSLDIR = $(B)\compat\openssl-1.1.1b
1572 SSLINCDIR = $(SSLDIR)\include
1573 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1574 SSLLIBDIR = $(SSLDIR)
1575 !else
1576 SSLLIBDIR = $(SSLDIR)
1577 !endif
1578 SSLLFLAGS = /nologo /opt:ref /debug
1579 SSLLIB = libssl.lib libcrypto.lib user32.lib gdi32.lib crypt32.lib
1580 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
1581 !message Using 'x64' platform for OpenSSL...
1582 SSLCONFIG = VC-WIN64A no-asm no-ssl3 no-weak-ssl-ciphers
1583 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1584 SSLCONFIG = $(SSLCONFIG) shared
1585 !else
1586 SSLCONFIG = $(SSLCONFIG) no-shared
1587 !endif
1588 !elseif "$(PLATFORM)"=="ia64"
1589 !message Using 'ia64' platform for OpenSSL...
1590 SSLCONFIG = VC-WIN64I no-asm no-ssl3 no-weak-ssl-ciphers
1591 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1592 SSLCONFIG = $(SSLCONFIG) shared
1593 !else
1594 SSLCONFIG = $(SSLCONFIG) no-shared
1595 !endif
1596 !else
1597 !message Assuming 'x86' platform for OpenSSL...
1598 SSLCONFIG = VC-WIN32 no-asm no-ssl3 no-weak-ssl-ciphers
1599 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1600 SSLCONFIG = $(SSLCONFIG) shared
1601 !else
1602 SSLCONFIG = $(SSLCONFIG) no-shared
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1603 !endif
1604 !endif
1605 !endif
1606
1607 !if $(FOSSIL_ENABLE_TCL)!=0
@@ -1856,15 +1820,14 @@
1820 @echo Building OpenSSL from "$(SSLDIR)"...
1821 !if "$(PERLDIR)" != ""
1822 @set PATH=$(PERLDIR);$(PATH)
1823 !endif
1824 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
 
1825 !if $(FOSSIL_ENABLE_WINXP)!=0
1826 @pushd "$(SSLDIR)" && $(MAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(XPLDFLAGS)" && popd
1827 !else
1828 @pushd "$(SSLDIR)" && $(MAKE) && popd
1829 !endif
1830 !endif
1831
1832 !if $(FOSSIL_ENABLE_MINIZ)==0
1833 !if $(FOSSIL_BUILD_ZLIB)!=0
1834
M src/makemake.tcl
+37 -74
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -694,13 +694,13 @@
694694
 ZLIBCONFIG =
695695
 ZLIBTARGETS =
696696
 endif
697697
698698
 #### Disable creation of the OpenSSL shared libraries. Also, disable support
699
-# for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
699
+# for SSLv3 (i.e. thereby forcing the use of TLS).
700700
 #
701
-SSLCONFIG += no-ssl2 no-ssl3 no-weak-ssl-ciphers no-shared
701
+SSLCONFIG += no-ssl3 no-weak-ssl-ciphers no-shared
702702
703703
 #### When using zlib, make sure that OpenSSL is configured to use the zlib
704704
 # that Fossil knows about (i.e. the one within the source tree).
705705
 #
706706
 ifndef FOSSIL_ENABLE_MINIZ
@@ -710,11 +710,11 @@
710710
 #### The directories where the OpenSSL include and library files are located.
711711
 # The recommended usage here is to use the Sysinternals junction tool
712712
 # to create a hard link between an "openssl-1.x" sub-directory of the
713713
 # Fossil source code directory and the target OpenSSL source directory.
714714
 #
715
-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2q
715
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1b
716716
 OPENSSLINCDIR = $(OPENSSLDIR)/include
717717
 OPENSSLLIBDIR = $(OPENSSLDIR)
718718
719719
 #### Either the directory where the Tcl library is installed or the Tcl
720720
 # source code directory resides (depending on the value of the macro
@@ -1566,78 +1566,42 @@
15661566
 !ifndef USE_SEE
15671567
 USE_SEE = 0
15681568
 !endif
15691569
15701570
 !if $(FOSSIL_ENABLE_SSL)!=0
1571
-SSLDIR = $(B)\compat\openssl-1.0.2q
1572
-SSLINCDIR = $(SSLDIR)\inc32
1573
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
1574
-SSLLIBDIR = $(SSLDIR)\out32dll
1575
-!else
1576
-SSLLIBDIR = $(SSLDIR)\out32
1577
-!endif
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
1589
-!endif
1590
-SSLSETUP = ms\do_win64a.bat
1591
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
1592
-SSLNMAKE = ms\ntdll.mak all
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
1609
-!endif
1610
-SSLSETUP = ms\do_win64i.bat
1611
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
1612
-SSLNMAKE = ms\ntdll.mak all
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
1629
-!endif
1630
-SSLSETUP = ms\do_ms.bat
1631
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
1632
-SSLNMAKE = ms\ntdll.mak all
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
1571
+SSLDIR = $(B)\compat\openssl-1.1.1b
1572
+SSLINCDIR = $(SSLDIR)\include
1573
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
1574
+SSLLIBDIR = $(SSLDIR)
1575
+!else
1576
+SSLLIBDIR = $(SSLDIR)
1577
+!endif
1578
+SSLLFLAGS = /nologo /opt:ref /debug
1579
+SSLLIB = libssl.lib libcrypto.lib user32.lib gdi32.lib crypt32.lib
1580
+!if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
1581
+!message Using 'x64' platform for OpenSSL...
1582
+SSLCONFIG = VC-WIN64A no-asm no-ssl3 no-weak-ssl-ciphers
1583
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
1584
+SSLCONFIG = $(SSLCONFIG) shared
1585
+!else
1586
+SSLCONFIG = $(SSLCONFIG) no-shared
1587
+!endif
1588
+!elseif "$(PLATFORM)"=="ia64"
1589
+!message Using 'ia64' platform for OpenSSL...
1590
+SSLCONFIG = VC-WIN64I no-asm no-ssl3 no-weak-ssl-ciphers
1591
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
1592
+SSLCONFIG = $(SSLCONFIG) shared
1593
+!else
1594
+SSLCONFIG = $(SSLCONFIG) no-shared
1595
+!endif
1596
+!else
1597
+!message Assuming 'x86' platform for OpenSSL...
1598
+SSLCONFIG = VC-WIN32 no-asm no-ssl3 no-weak-ssl-ciphers
1599
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
1600
+SSLCONFIG = $(SSLCONFIG) shared
1601
+!else
1602
+SSLCONFIG = $(SSLCONFIG) no-shared
16391603
 !endif
16401604
 !endif
16411605
 !endif
16421606
16431607
 !if $(FOSSIL_ENABLE_TCL)!=0
@@ -1856,15 +1820,14 @@
18561820
 @echo Building OpenSSL from "$(SSLDIR)"...
18571821
 !if "$(PERLDIR)" != ""
18581822
 @set PATH=$(PERLDIR);$(PATH)
18591823
 !endif
18601824
 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
1861
- @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
18621825
 !if $(FOSSIL_ENABLE_WINXP)!=0
1863
- @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS) $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
1826
+ @pushd "$(SSLDIR)" && $(MAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(XPLDFLAGS)" && popd
18641827
 !else
1865
- @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS)" && popd
1828
+ @pushd "$(SSLDIR)" && $(MAKE) && popd
18661829
 !endif
18671830
 !endif
18681831
18691832
 !if $(FOSSIL_ENABLE_MINIZ)==0
18701833
 !if $(FOSSIL_BUILD_ZLIB)!=0
18711834
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -694,13 +694,13 @@
694 ZLIBCONFIG =
695 ZLIBTARGETS =
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
@@ -710,11 +710,11 @@
710 #### The directories where the OpenSSL include and library files are located.
711 # The recommended usage here is to use the Sysinternals junction tool
712 # to create a hard link between an "openssl-1.x" sub-directory of the
713 # Fossil source code directory and the target OpenSSL source directory.
714 #
715 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2q
716 OPENSSLINCDIR = $(OPENSSLDIR)/include
717 OPENSSLLIBDIR = $(OPENSSLDIR)
718
719 #### Either the directory where the Tcl library is installed or the Tcl
720 # source code directory resides (depending on the value of the macro
@@ -1566,78 +1566,42 @@
1566 !ifndef USE_SEE
1567 USE_SEE = 0
1568 !endif
1569
1570 !if $(FOSSIL_ENABLE_SSL)!=0
1571 SSLDIR = $(B)\compat\openssl-1.0.2q
1572 SSLINCDIR = $(SSLDIR)\inc32
1573 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1574 SSLLIBDIR = $(SSLDIR)\out32dll
1575 !else
1576 SSLLIBDIR = $(SSLDIR)\out32
1577 !endif
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
1589 !endif
1590 SSLSETUP = ms\do_win64a.bat
1591 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1592 SSLNMAKE = ms\ntdll.mak all
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
1609 !endif
1610 SSLSETUP = ms\do_win64i.bat
1611 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1612 SSLNMAKE = ms\ntdll.mak all
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
1629 !endif
1630 SSLSETUP = ms\do_ms.bat
1631 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1632 SSLNMAKE = ms\ntdll.mak all
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
@@ -1856,15 +1820,14 @@
1856 @echo Building OpenSSL from "$(SSLDIR)"...
1857 !if "$(PERLDIR)" != ""
1858 @set PATH=$(PERLDIR);$(PATH)
1859 !endif
1860 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
1861 @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
1862 !if $(FOSSIL_ENABLE_WINXP)!=0
1863 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS) $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
1864 !else
1865 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS)" && popd
1866 !endif
1867 !endif
1868
1869 !if $(FOSSIL_ENABLE_MINIZ)==0
1870 !if $(FOSSIL_BUILD_ZLIB)!=0
1871
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -694,13 +694,13 @@
694 ZLIBCONFIG =
695 ZLIBTARGETS =
696 endif
697
698 #### Disable creation of the OpenSSL shared libraries. Also, disable support
699 # for SSLv3 (i.e. thereby forcing the use of TLS).
700 #
701 SSLCONFIG += 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
@@ -710,11 +710,11 @@
710 #### The directories where the OpenSSL include and library files are located.
711 # The recommended usage here is to use the Sysinternals junction tool
712 # to create a hard link between an "openssl-1.x" sub-directory of the
713 # Fossil source code directory and the target OpenSSL source directory.
714 #
715 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1b
716 OPENSSLINCDIR = $(OPENSSLDIR)/include
717 OPENSSLLIBDIR = $(OPENSSLDIR)
718
719 #### Either the directory where the Tcl library is installed or the Tcl
720 # source code directory resides (depending on the value of the macro
@@ -1566,78 +1566,42 @@
1566 !ifndef USE_SEE
1567 USE_SEE = 0
1568 !endif
1569
1570 !if $(FOSSIL_ENABLE_SSL)!=0
1571 SSLDIR = $(B)\compat\openssl-1.1.1b
1572 SSLINCDIR = $(SSLDIR)\include
1573 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1574 SSLLIBDIR = $(SSLDIR)
1575 !else
1576 SSLLIBDIR = $(SSLDIR)
1577 !endif
1578 SSLLFLAGS = /nologo /opt:ref /debug
1579 SSLLIB = libssl.lib libcrypto.lib user32.lib gdi32.lib crypt32.lib
1580 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
1581 !message Using 'x64' platform for OpenSSL...
1582 SSLCONFIG = VC-WIN64A no-asm no-ssl3 no-weak-ssl-ciphers
1583 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1584 SSLCONFIG = $(SSLCONFIG) shared
1585 !else
1586 SSLCONFIG = $(SSLCONFIG) no-shared
1587 !endif
1588 !elseif "$(PLATFORM)"=="ia64"
1589 !message Using 'ia64' platform for OpenSSL...
1590 SSLCONFIG = VC-WIN64I no-asm no-ssl3 no-weak-ssl-ciphers
1591 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1592 SSLCONFIG = $(SSLCONFIG) shared
1593 !else
1594 SSLCONFIG = $(SSLCONFIG) no-shared
1595 !endif
1596 !else
1597 !message Assuming 'x86' platform for OpenSSL...
1598 SSLCONFIG = VC-WIN32 no-asm no-ssl3 no-weak-ssl-ciphers
1599 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1600 SSLCONFIG = $(SSLCONFIG) shared
1601 !else
1602 SSLCONFIG = $(SSLCONFIG) no-shared
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1603 !endif
1604 !endif
1605 !endif
1606
1607 !if $(FOSSIL_ENABLE_TCL)!=0
@@ -1856,15 +1820,14 @@
1820 @echo Building OpenSSL from "$(SSLDIR)"...
1821 !if "$(PERLDIR)" != ""
1822 @set PATH=$(PERLDIR);$(PATH)
1823 !endif
1824 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
 
1825 !if $(FOSSIL_ENABLE_WINXP)!=0
1826 @pushd "$(SSLDIR)" && $(MAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(XPLDFLAGS)" && popd
1827 !else
1828 @pushd "$(SSLDIR)" && $(MAKE) && popd
1829 !endif
1830 !endif
1831
1832 !if $(FOSSIL_ENABLE_MINIZ)==0
1833 !if $(FOSSIL_BUILD_ZLIB)!=0
1834
M win/Makefile.mingw
+3 -3
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -158,13 +158,13 @@
158158
 ZLIBCONFIG =
159159
 ZLIBTARGETS =
160160
 endif
161161
162162
 #### Disable creation of the OpenSSL shared libraries. Also, disable support
163
-# for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
163
+# for SSLv3 (i.e. thereby forcing the use of TLS).
164164
 #
165
-SSLCONFIG += no-ssl2 no-ssl3 no-weak-ssl-ciphers no-shared
165
+SSLCONFIG += no-ssl3 no-weak-ssl-ciphers no-shared
166166
167167
 #### When using zlib, make sure that OpenSSL is configured to use the zlib
168168
 # that Fossil knows about (i.e. the one within the source tree).
169169
 #
170170
 ifndef FOSSIL_ENABLE_MINIZ
@@ -174,11 +174,11 @@
174174
 #### The directories where the OpenSSL include and library files are located.
175175
 # The recommended usage here is to use the Sysinternals junction tool
176176
 # to create a hard link between an "openssl-1.x" sub-directory of the
177177
 # Fossil source code directory and the target OpenSSL source directory.
178178
 #
179
-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2q
179
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1b
180180
 OPENSSLINCDIR = $(OPENSSLDIR)/include
181181
 OPENSSLLIBDIR = $(OPENSSLDIR)
182182
183183
 #### Either the directory where the Tcl library is installed or the Tcl
184184
 # source code directory resides (depending on the value of the macro
185185
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -158,13 +158,13 @@
158 ZLIBCONFIG =
159 ZLIBTARGETS =
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
@@ -174,11 +174,11 @@
174 #### The directories where the OpenSSL include and library files are located.
175 # The recommended usage here is to use the Sysinternals junction tool
176 # to create a hard link between an "openssl-1.x" sub-directory of the
177 # Fossil source code directory and the target OpenSSL source directory.
178 #
179 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2q
180 OPENSSLINCDIR = $(OPENSSLDIR)/include
181 OPENSSLLIBDIR = $(OPENSSLDIR)
182
183 #### Either the directory where the Tcl library is installed or the Tcl
184 # source code directory resides (depending on the value of the macro
185
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -158,13 +158,13 @@
158 ZLIBCONFIG =
159 ZLIBTARGETS =
160 endif
161
162 #### Disable creation of the OpenSSL shared libraries. Also, disable support
163 # for SSLv3 (i.e. thereby forcing the use of TLS).
164 #
165 SSLCONFIG += 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
@@ -174,11 +174,11 @@
174 #### The directories where the OpenSSL include and library files are located.
175 # The recommended usage here is to use the Sysinternals junction tool
176 # to create a hard link between an "openssl-1.x" sub-directory of the
177 # Fossil source code directory and the target OpenSSL source directory.
178 #
179 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1b
180 OPENSSLINCDIR = $(OPENSSLDIR)/include
181 OPENSSLLIBDIR = $(OPENSSLDIR)
182
183 #### Either the directory where the Tcl library is installed or the Tcl
184 # source code directory resides (depending on the value of the macro
185
M win/Makefile.mingw
+3 -3
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -158,13 +158,13 @@
158158
 ZLIBCONFIG =
159159
 ZLIBTARGETS =
160160
 endif
161161
162162
 #### Disable creation of the OpenSSL shared libraries. Also, disable support
163
-# for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
163
+# for SSLv3 (i.e. thereby forcing the use of TLS).
164164
 #
165
-SSLCONFIG += no-ssl2 no-ssl3 no-weak-ssl-ciphers no-shared
165
+SSLCONFIG += no-ssl3 no-weak-ssl-ciphers no-shared
166166
167167
 #### When using zlib, make sure that OpenSSL is configured to use the zlib
168168
 # that Fossil knows about (i.e. the one within the source tree).
169169
 #
170170
 ifndef FOSSIL_ENABLE_MINIZ
@@ -174,11 +174,11 @@
174174
 #### The directories where the OpenSSL include and library files are located.
175175
 # The recommended usage here is to use the Sysinternals junction tool
176176
 # to create a hard link between an "openssl-1.x" sub-directory of the
177177
 # Fossil source code directory and the target OpenSSL source directory.
178178
 #
179
-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2q
179
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1b
180180
 OPENSSLINCDIR = $(OPENSSLDIR)/include
181181
 OPENSSLLIBDIR = $(OPENSSLDIR)
182182
183183
 #### Either the directory where the Tcl library is installed or the Tcl
184184
 # source code directory resides (depending on the value of the macro
185185
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -158,13 +158,13 @@
158 ZLIBCONFIG =
159 ZLIBTARGETS =
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
@@ -174,11 +174,11 @@
174 #### The directories where the OpenSSL include and library files are located.
175 # The recommended usage here is to use the Sysinternals junction tool
176 # to create a hard link between an "openssl-1.x" sub-directory of the
177 # Fossil source code directory and the target OpenSSL source directory.
178 #
179 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2q
180 OPENSSLINCDIR = $(OPENSSLDIR)/include
181 OPENSSLLIBDIR = $(OPENSSLDIR)
182
183 #### Either the directory where the Tcl library is installed or the Tcl
184 # source code directory resides (depending on the value of the macro
185
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -158,13 +158,13 @@
158 ZLIBCONFIG =
159 ZLIBTARGETS =
160 endif
161
162 #### Disable creation of the OpenSSL shared libraries. Also, disable support
163 # for SSLv3 (i.e. thereby forcing the use of TLS).
164 #
165 SSLCONFIG += 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
@@ -174,11 +174,11 @@
174 #### The directories where the OpenSSL include and library files are located.
175 # The recommended usage here is to use the Sysinternals junction tool
176 # to create a hard link between an "openssl-1.x" sub-directory of the
177 # Fossil source code directory and the target OpenSSL source directory.
178 #
179 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1b
180 OPENSSLINCDIR = $(OPENSSLDIR)/include
181 OPENSSLLIBDIR = $(OPENSSLDIR)
182
183 #### Either the directory where the Tcl library is installed or the Tcl
184 # source code directory resides (depending on the value of the macro
185
M win/Makefile.mingw.mistachkin
+3 -3
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -158,13 +158,13 @@
158158
 ZLIBCONFIG =
159159
 ZLIBTARGETS =
160160
 endif
161161
162162
 #### Disable creation of the OpenSSL shared libraries. Also, disable support
163
-# for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
163
+# for SSLv3 (i.e. thereby forcing the use of TLS).
164164
 #
165
-SSLCONFIG += no-ssl2 no-ssl3 no-weak-ssl-ciphers no-shared
165
+SSLCONFIG += no-ssl3 no-weak-ssl-ciphers no-shared
166166
167167
 #### When using zlib, make sure that OpenSSL is configured to use the zlib
168168
 # that Fossil knows about (i.e. the one within the source tree).
169169
 #
170170
 ifndef FOSSIL_ENABLE_MINIZ
@@ -174,11 +174,11 @@
174174
 #### The directories where the OpenSSL include and library files are located.
175175
 # The recommended usage here is to use the Sysinternals junction tool
176176
 # to create a hard link between an "openssl-1.x" sub-directory of the
177177
 # Fossil source code directory and the target OpenSSL source directory.
178178
 #
179
-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2q
179
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1b
180180
 OPENSSLINCDIR = $(OPENSSLDIR)/include
181181
 OPENSSLLIBDIR = $(OPENSSLDIR)
182182
183183
 #### Either the directory where the Tcl library is installed or the Tcl
184184
 # source code directory resides (depending on the value of the macro
185185
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -158,13 +158,13 @@
158 ZLIBCONFIG =
159 ZLIBTARGETS =
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
@@ -174,11 +174,11 @@
174 #### The directories where the OpenSSL include and library files are located.
175 # The recommended usage here is to use the Sysinternals junction tool
176 # to create a hard link between an "openssl-1.x" sub-directory of the
177 # Fossil source code directory and the target OpenSSL source directory.
178 #
179 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2q
180 OPENSSLINCDIR = $(OPENSSLDIR)/include
181 OPENSSLLIBDIR = $(OPENSSLDIR)
182
183 #### Either the directory where the Tcl library is installed or the Tcl
184 # source code directory resides (depending on the value of the macro
185
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -158,13 +158,13 @@
158 ZLIBCONFIG =
159 ZLIBTARGETS =
160 endif
161
162 #### Disable creation of the OpenSSL shared libraries. Also, disable support
163 # for SSLv3 (i.e. thereby forcing the use of TLS).
164 #
165 SSLCONFIG += 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
@@ -174,11 +174,11 @@
174 #### The directories where the OpenSSL include and library files are located.
175 # The recommended usage here is to use the Sysinternals junction tool
176 # to create a hard link between an "openssl-1.x" sub-directory of the
177 # Fossil source code directory and the target OpenSSL source directory.
178 #
179 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1b
180 OPENSSLINCDIR = $(OPENSSLDIR)/include
181 OPENSSLLIBDIR = $(OPENSSLDIR)
182
183 #### Either the directory where the Tcl library is installed or the Tcl
184 # source code directory resides (depending on the value of the macro
185
M win/Makefile.mingw.mistachkin
+3 -3
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -158,13 +158,13 @@
158158
 ZLIBCONFIG =
159159
 ZLIBTARGETS =
160160
 endif
161161
162162
 #### Disable creation of the OpenSSL shared libraries. Also, disable support
163
-# for both SSLv2 and SSLv3 (i.e. thereby forcing the use of TLS).
163
+# for SSLv3 (i.e. thereby forcing the use of TLS).
164164
 #
165
-SSLCONFIG += no-ssl2 no-ssl3 no-weak-ssl-ciphers no-shared
165
+SSLCONFIG += no-ssl3 no-weak-ssl-ciphers no-shared
166166
167167
 #### When using zlib, make sure that OpenSSL is configured to use the zlib
168168
 # that Fossil knows about (i.e. the one within the source tree).
169169
 #
170170
 ifndef FOSSIL_ENABLE_MINIZ
@@ -174,11 +174,11 @@
174174
 #### The directories where the OpenSSL include and library files are located.
175175
 # The recommended usage here is to use the Sysinternals junction tool
176176
 # to create a hard link between an "openssl-1.x" sub-directory of the
177177
 # Fossil source code directory and the target OpenSSL source directory.
178178
 #
179
-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2q
179
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1b
180180
 OPENSSLINCDIR = $(OPENSSLDIR)/include
181181
 OPENSSLLIBDIR = $(OPENSSLDIR)
182182
183183
 #### Either the directory where the Tcl library is installed or the Tcl
184184
 # source code directory resides (depending on the value of the macro
185185
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -158,13 +158,13 @@
158 ZLIBCONFIG =
159 ZLIBTARGETS =
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
@@ -174,11 +174,11 @@
174 #### The directories where the OpenSSL include and library files are located.
175 # The recommended usage here is to use the Sysinternals junction tool
176 # to create a hard link between an "openssl-1.x" sub-directory of the
177 # Fossil source code directory and the target OpenSSL source directory.
178 #
179 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2q
180 OPENSSLINCDIR = $(OPENSSLDIR)/include
181 OPENSSLLIBDIR = $(OPENSSLDIR)
182
183 #### Either the directory where the Tcl library is installed or the Tcl
184 # source code directory resides (depending on the value of the macro
185
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -158,13 +158,13 @@
158 ZLIBCONFIG =
159 ZLIBTARGETS =
160 endif
161
162 #### Disable creation of the OpenSSL shared libraries. Also, disable support
163 # for SSLv3 (i.e. thereby forcing the use of TLS).
164 #
165 SSLCONFIG += 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
@@ -174,11 +174,11 @@
174 #### The directories where the OpenSSL include and library files are located.
175 # The recommended usage here is to use the Sysinternals junction tool
176 # to create a hard link between an "openssl-1.x" sub-directory of the
177 # Fossil source code directory and the target OpenSSL source directory.
178 #
179 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1b
180 OPENSSLINCDIR = $(OPENSSLDIR)/include
181 OPENSSLLIBDIR = $(OPENSSLDIR)
182
183 #### Either the directory where the Tcl library is installed or the Tcl
184 # source code directory resides (depending on the value of the macro
185
M win/Makefile.msc
+34 -71
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -98,78 +98,42 @@
9898
 !ifndef USE_SEE
9999
 USE_SEE = 0
100100
 !endif
101101
102102
 !if $(FOSSIL_ENABLE_SSL)!=0
103
-SSLDIR = $(B)\compat\openssl-1.0.2q
104
-SSLINCDIR = $(SSLDIR)\inc32
105
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
106
-SSLLIBDIR = $(SSLDIR)\out32dll
107
-!else
108
-SSLLIBDIR = $(SSLDIR)\out32
109
-!endif
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
121
-!endif
122
-SSLSETUP = ms\do_win64a.bat
123
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
124
-SSLNMAKE = ms\ntdll.mak all
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
141
-!endif
142
-SSLSETUP = ms\do_win64i.bat
143
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
144
-SSLNMAKE = ms\ntdll.mak all
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
161
-!endif
162
-SSLSETUP = ms\do_ms.bat
163
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
164
-SSLNMAKE = ms\ntdll.mak all
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
103
+SSLDIR = $(B)\compat\openssl-1.1.1b
104
+SSLINCDIR = $(SSLDIR)\include
105
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
106
+SSLLIBDIR = $(SSLDIR)
107
+!else
108
+SSLLIBDIR = $(SSLDIR)
109
+!endif
110
+SSLLFLAGS = /nologo /opt:ref /debug
111
+SSLLIB = libssl.lib libcrypto.lib user32.lib gdi32.lib crypt32.lib
112
+!if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
113
+!message Using 'x64' platform for OpenSSL...
114
+SSLCONFIG = VC-WIN64A no-asm no-ssl3 no-weak-ssl-ciphers
115
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
116
+SSLCONFIG = $(SSLCONFIG) shared
117
+!else
118
+SSLCONFIG = $(SSLCONFIG) no-shared
119
+!endif
120
+!elseif "$(PLATFORM)"=="ia64"
121
+!message Using 'ia64' platform for OpenSSL...
122
+SSLCONFIG = VC-WIN64I no-asm no-ssl3 no-weak-ssl-ciphers
123
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
124
+SSLCONFIG = $(SSLCONFIG) shared
125
+!else
126
+SSLCONFIG = $(SSLCONFIG) no-shared
127
+!endif
128
+!else
129
+!message Assuming 'x86' platform for OpenSSL...
130
+SSLCONFIG = VC-WIN32 no-asm no-ssl3 no-weak-ssl-ciphers
131
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
132
+SSLCONFIG = $(SSLCONFIG) shared
133
+!else
134
+SSLCONFIG = $(SSLCONFIG) no-shared
171135
 !endif
172136
 !endif
173137
 !endif
174138
175139
 !if $(FOSSIL_ENABLE_TCL)!=0
@@ -758,15 +722,14 @@
758722
 @echo Building OpenSSL from "$(SSLDIR)"...
759723
 !if "$(PERLDIR)" != ""
760724
 @set PATH=$(PERLDIR);$(PATH)
761725
 !endif
762726
 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
763
- @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
764727
 !if $(FOSSIL_ENABLE_WINXP)!=0
765
- @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS) $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
728
+ @pushd "$(SSLDIR)" && $(MAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(XPLDFLAGS)" && popd
766729
 !else
767
- @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS)" && popd
730
+ @pushd "$(SSLDIR)" && $(MAKE) && popd
768731
 !endif
769732
 !endif
770733
771734
 !if $(FOSSIL_ENABLE_MINIZ)==0
772735
 !if $(FOSSIL_BUILD_ZLIB)!=0
773736
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -98,78 +98,42 @@
98 !ifndef USE_SEE
99 USE_SEE = 0
100 !endif
101
102 !if $(FOSSIL_ENABLE_SSL)!=0
103 SSLDIR = $(B)\compat\openssl-1.0.2q
104 SSLINCDIR = $(SSLDIR)\inc32
105 !if $(FOSSIL_DYNAMIC_BUILD)!=0
106 SSLLIBDIR = $(SSLDIR)\out32dll
107 !else
108 SSLLIBDIR = $(SSLDIR)\out32
109 !endif
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
121 !endif
122 SSLSETUP = ms\do_win64a.bat
123 !if $(FOSSIL_DYNAMIC_BUILD)!=0
124 SSLNMAKE = ms\ntdll.mak all
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
141 !endif
142 SSLSETUP = ms\do_win64i.bat
143 !if $(FOSSIL_DYNAMIC_BUILD)!=0
144 SSLNMAKE = ms\ntdll.mak all
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
161 !endif
162 SSLSETUP = ms\do_ms.bat
163 !if $(FOSSIL_DYNAMIC_BUILD)!=0
164 SSLNMAKE = ms\ntdll.mak all
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
@@ -758,15 +722,14 @@
758 @echo Building OpenSSL from "$(SSLDIR)"...
759 !if "$(PERLDIR)" != ""
760 @set PATH=$(PERLDIR);$(PATH)
761 !endif
762 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
763 @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
764 !if $(FOSSIL_ENABLE_WINXP)!=0
765 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS) $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
766 !else
767 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS)" && popd
768 !endif
769 !endif
770
771 !if $(FOSSIL_ENABLE_MINIZ)==0
772 !if $(FOSSIL_BUILD_ZLIB)!=0
773
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -98,78 +98,42 @@
98 !ifndef USE_SEE
99 USE_SEE = 0
100 !endif
101
102 !if $(FOSSIL_ENABLE_SSL)!=0
103 SSLDIR = $(B)\compat\openssl-1.1.1b
104 SSLINCDIR = $(SSLDIR)\include
105 !if $(FOSSIL_DYNAMIC_BUILD)!=0
106 SSLLIBDIR = $(SSLDIR)
107 !else
108 SSLLIBDIR = $(SSLDIR)
109 !endif
110 SSLLFLAGS = /nologo /opt:ref /debug
111 SSLLIB = libssl.lib libcrypto.lib user32.lib gdi32.lib crypt32.lib
112 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
113 !message Using 'x64' platform for OpenSSL...
114 SSLCONFIG = VC-WIN64A no-asm no-ssl3 no-weak-ssl-ciphers
115 !if $(FOSSIL_DYNAMIC_BUILD)!=0
116 SSLCONFIG = $(SSLCONFIG) shared
117 !else
118 SSLCONFIG = $(SSLCONFIG) no-shared
119 !endif
120 !elseif "$(PLATFORM)"=="ia64"
121 !message Using 'ia64' platform for OpenSSL...
122 SSLCONFIG = VC-WIN64I no-asm no-ssl3 no-weak-ssl-ciphers
123 !if $(FOSSIL_DYNAMIC_BUILD)!=0
124 SSLCONFIG = $(SSLCONFIG) shared
125 !else
126 SSLCONFIG = $(SSLCONFIG) no-shared
127 !endif
128 !else
129 !message Assuming 'x86' platform for OpenSSL...
130 SSLCONFIG = VC-WIN32 no-asm no-ssl3 no-weak-ssl-ciphers
131 !if $(FOSSIL_DYNAMIC_BUILD)!=0
132 SSLCONFIG = $(SSLCONFIG) shared
133 !else
134 SSLCONFIG = $(SSLCONFIG) no-shared
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
135 !endif
136 !endif
137 !endif
138
139 !if $(FOSSIL_ENABLE_TCL)!=0
@@ -758,15 +722,14 @@
722 @echo Building OpenSSL from "$(SSLDIR)"...
723 !if "$(PERLDIR)" != ""
724 @set PATH=$(PERLDIR);$(PATH)
725 !endif
726 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
 
727 !if $(FOSSIL_ENABLE_WINXP)!=0
728 @pushd "$(SSLDIR)" && $(MAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(XPLDFLAGS)" && popd
729 !else
730 @pushd "$(SSLDIR)" && $(MAKE) && popd
731 !endif
732 !endif
733
734 !if $(FOSSIL_ENABLE_MINIZ)==0
735 !if $(FOSSIL_BUILD_ZLIB)!=0
736
M win/Makefile.msc
+34 -71
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -98,78 +98,42 @@
9898
 !ifndef USE_SEE
9999
 USE_SEE = 0
100100
 !endif
101101
102102
 !if $(FOSSIL_ENABLE_SSL)!=0
103
-SSLDIR = $(B)\compat\openssl-1.0.2q
104
-SSLINCDIR = $(SSLDIR)\inc32
105
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
106
-SSLLIBDIR = $(SSLDIR)\out32dll
107
-!else
108
-SSLLIBDIR = $(SSLDIR)\out32
109
-!endif
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
121
-!endif
122
-SSLSETUP = ms\do_win64a.bat
123
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
124
-SSLNMAKE = ms\ntdll.mak all
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
141
-!endif
142
-SSLSETUP = ms\do_win64i.bat
143
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
144
-SSLNMAKE = ms\ntdll.mak all
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
161
-!endif
162
-SSLSETUP = ms\do_ms.bat
163
-!if $(FOSSIL_DYNAMIC_BUILD)!=0
164
-SSLNMAKE = ms\ntdll.mak all
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
103
+SSLDIR = $(B)\compat\openssl-1.1.1b
104
+SSLINCDIR = $(SSLDIR)\include
105
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
106
+SSLLIBDIR = $(SSLDIR)
107
+!else
108
+SSLLIBDIR = $(SSLDIR)
109
+!endif
110
+SSLLFLAGS = /nologo /opt:ref /debug
111
+SSLLIB = libssl.lib libcrypto.lib user32.lib gdi32.lib crypt32.lib
112
+!if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
113
+!message Using 'x64' platform for OpenSSL...
114
+SSLCONFIG = VC-WIN64A no-asm no-ssl3 no-weak-ssl-ciphers
115
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
116
+SSLCONFIG = $(SSLCONFIG) shared
117
+!else
118
+SSLCONFIG = $(SSLCONFIG) no-shared
119
+!endif
120
+!elseif "$(PLATFORM)"=="ia64"
121
+!message Using 'ia64' platform for OpenSSL...
122
+SSLCONFIG = VC-WIN64I no-asm no-ssl3 no-weak-ssl-ciphers
123
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
124
+SSLCONFIG = $(SSLCONFIG) shared
125
+!else
126
+SSLCONFIG = $(SSLCONFIG) no-shared
127
+!endif
128
+!else
129
+!message Assuming 'x86' platform for OpenSSL...
130
+SSLCONFIG = VC-WIN32 no-asm no-ssl3 no-weak-ssl-ciphers
131
+!if $(FOSSIL_DYNAMIC_BUILD)!=0
132
+SSLCONFIG = $(SSLCONFIG) shared
133
+!else
134
+SSLCONFIG = $(SSLCONFIG) no-shared
171135
 !endif
172136
 !endif
173137
 !endif
174138
175139
 !if $(FOSSIL_ENABLE_TCL)!=0
@@ -758,15 +722,14 @@
758722
 @echo Building OpenSSL from "$(SSLDIR)"...
759723
 !if "$(PERLDIR)" != ""
760724
 @set PATH=$(PERLDIR);$(PATH)
761725
 !endif
762726
 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
763
- @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
764727
 !if $(FOSSIL_ENABLE_WINXP)!=0
765
- @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS) $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
728
+ @pushd "$(SSLDIR)" && $(MAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(XPLDFLAGS)" && popd
766729
 !else
767
- @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS)" && popd
730
+ @pushd "$(SSLDIR)" && $(MAKE) && popd
768731
 !endif
769732
 !endif
770733
771734
 !if $(FOSSIL_ENABLE_MINIZ)==0
772735
 !if $(FOSSIL_BUILD_ZLIB)!=0
773736
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -98,78 +98,42 @@
98 !ifndef USE_SEE
99 USE_SEE = 0
100 !endif
101
102 !if $(FOSSIL_ENABLE_SSL)!=0
103 SSLDIR = $(B)\compat\openssl-1.0.2q
104 SSLINCDIR = $(SSLDIR)\inc32
105 !if $(FOSSIL_DYNAMIC_BUILD)!=0
106 SSLLIBDIR = $(SSLDIR)\out32dll
107 !else
108 SSLLIBDIR = $(SSLDIR)\out32
109 !endif
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
121 !endif
122 SSLSETUP = ms\do_win64a.bat
123 !if $(FOSSIL_DYNAMIC_BUILD)!=0
124 SSLNMAKE = ms\ntdll.mak all
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
141 !endif
142 SSLSETUP = ms\do_win64i.bat
143 !if $(FOSSIL_DYNAMIC_BUILD)!=0
144 SSLNMAKE = ms\ntdll.mak all
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
161 !endif
162 SSLSETUP = ms\do_ms.bat
163 !if $(FOSSIL_DYNAMIC_BUILD)!=0
164 SSLNMAKE = ms\ntdll.mak all
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
@@ -758,15 +722,14 @@
758 @echo Building OpenSSL from "$(SSLDIR)"...
759 !if "$(PERLDIR)" != ""
760 @set PATH=$(PERLDIR);$(PATH)
761 !endif
762 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
763 @pushd "$(SSLDIR)" && call $(SSLSETUP) && popd
764 !if $(FOSSIL_ENABLE_WINXP)!=0
765 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS) $(XPCFLAGS)" "LFLAGS=$(SSLLFLAGS) $(XPLDFLAGS)" && popd
766 !else
767 @pushd "$(SSLDIR)" && $(MAKE) /f $(SSLNMAKE) "CC=cl $(SSLCFLAGS)" && popd
768 !endif
769 !endif
770
771 !if $(FOSSIL_ENABLE_MINIZ)==0
772 !if $(FOSSIL_BUILD_ZLIB)!=0
773
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -98,78 +98,42 @@
98 !ifndef USE_SEE
99 USE_SEE = 0
100 !endif
101
102 !if $(FOSSIL_ENABLE_SSL)!=0
103 SSLDIR = $(B)\compat\openssl-1.1.1b
104 SSLINCDIR = $(SSLDIR)\include
105 !if $(FOSSIL_DYNAMIC_BUILD)!=0
106 SSLLIBDIR = $(SSLDIR)
107 !else
108 SSLLIBDIR = $(SSLDIR)
109 !endif
110 SSLLFLAGS = /nologo /opt:ref /debug
111 SSLLIB = libssl.lib libcrypto.lib user32.lib gdi32.lib crypt32.lib
112 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
113 !message Using 'x64' platform for OpenSSL...
114 SSLCONFIG = VC-WIN64A no-asm no-ssl3 no-weak-ssl-ciphers
115 !if $(FOSSIL_DYNAMIC_BUILD)!=0
116 SSLCONFIG = $(SSLCONFIG) shared
117 !else
118 SSLCONFIG = $(SSLCONFIG) no-shared
119 !endif
120 !elseif "$(PLATFORM)"=="ia64"
121 !message Using 'ia64' platform for OpenSSL...
122 SSLCONFIG = VC-WIN64I no-asm no-ssl3 no-weak-ssl-ciphers
123 !if $(FOSSIL_DYNAMIC_BUILD)!=0
124 SSLCONFIG = $(SSLCONFIG) shared
125 !else
126 SSLCONFIG = $(SSLCONFIG) no-shared
127 !endif
128 !else
129 !message Assuming 'x86' platform for OpenSSL...
130 SSLCONFIG = VC-WIN32 no-asm no-ssl3 no-weak-ssl-ciphers
131 !if $(FOSSIL_DYNAMIC_BUILD)!=0
132 SSLCONFIG = $(SSLCONFIG) shared
133 !else
134 SSLCONFIG = $(SSLCONFIG) no-shared
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
135 !endif
136 !endif
137 !endif
138
139 !if $(FOSSIL_ENABLE_TCL)!=0
@@ -758,15 +722,14 @@
722 @echo Building OpenSSL from "$(SSLDIR)"...
723 !if "$(PERLDIR)" != ""
724 @set PATH=$(PERLDIR);$(PATH)
725 !endif
726 @pushd "$(SSLDIR)" && $(PERL) Configure $(SSLCONFIG) && popd
 
727 !if $(FOSSIL_ENABLE_WINXP)!=0
728 @pushd "$(SSLDIR)" && $(MAKE) "CC=cl $(XPCFLAGS)" "LFLAGS=$(XPLDFLAGS)" && popd
729 !else
730 @pushd "$(SSLDIR)" && $(MAKE) && popd
731 !endif
732 !endif
733
734 !if $(FOSSIL_ENABLE_MINIZ)==0
735 !if $(FOSSIL_BUILD_ZLIB)!=0
736
M www/build.wiki
+1 -1
--- www/build.wiki
+++ www/build.wiki
@@ -157,11 +157,11 @@
157157
 the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
158158
 first <a href="https://www.openssl.org/source/">download the official
159159
 source code for OpenSSL</a> and extract it to an appropriately named
160160
 "<b>openssl-X.Y.ZA</b>" subdirectory within the local
161161
 [/tree?ci=trunk&name=compat | compat] directory (e.g.
162
-"<b>compat/openssl-1.0.2q</b>"), then make sure that some recent
162
+"<b>compat/openssl-1.1.1b</b>"), then make sure that some recent
163163
 <a href="http://www.perl.org/">Perl</a> binaries are installed locally,
164164
 and finally run one of the following commands:
165165
 <blockquote><pre>
166166
 nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
167167
 </pre></blockquote>
168168
--- www/build.wiki
+++ www/build.wiki
@@ -157,11 +157,11 @@
157 the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
158 first <a href="https://www.openssl.org/source/">download the official
159 source code for OpenSSL</a> and extract it to an appropriately named
160 "<b>openssl-X.Y.ZA</b>" subdirectory within the local
161 [/tree?ci=trunk&name=compat | compat] directory (e.g.
162 "<b>compat/openssl-1.0.2q</b>"), then make sure that some recent
163 <a href="http://www.perl.org/">Perl</a> binaries are installed locally,
164 and finally run one of the following commands:
165 <blockquote><pre>
166 nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
167 </pre></blockquote>
168
--- www/build.wiki
+++ www/build.wiki
@@ -157,11 +157,11 @@
157 the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
158 first <a href="https://www.openssl.org/source/">download the official
159 source code for OpenSSL</a> and extract it to an appropriately named
160 "<b>openssl-X.Y.ZA</b>" subdirectory within the local
161 [/tree?ci=trunk&name=compat | compat] directory (e.g.
162 "<b>compat/openssl-1.1.1b</b>"), then make sure that some recent
163 <a href="http://www.perl.org/">Perl</a> binaries are installed locally,
164 and finally run one of the following commands:
165 <blockquote><pre>
166 nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
167 </pre></blockquote>
168
M www/build.wiki
+1 -1
--- www/build.wiki
+++ www/build.wiki
@@ -157,11 +157,11 @@
157157
 the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
158158
 first <a href="https://www.openssl.org/source/">download the official
159159
 source code for OpenSSL</a> and extract it to an appropriately named
160160
 "<b>openssl-X.Y.ZA</b>" subdirectory within the local
161161
 [/tree?ci=trunk&name=compat | compat] directory (e.g.
162
-"<b>compat/openssl-1.0.2q</b>"), then make sure that some recent
162
+"<b>compat/openssl-1.1.1b</b>"), then make sure that some recent
163163
 <a href="http://www.perl.org/">Perl</a> binaries are installed locally,
164164
 and finally run one of the following commands:
165165
 <blockquote><pre>
166166
 nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
167167
 </pre></blockquote>
168168
--- www/build.wiki
+++ www/build.wiki
@@ -157,11 +157,11 @@
157 the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
158 first <a href="https://www.openssl.org/source/">download the official
159 source code for OpenSSL</a> and extract it to an appropriately named
160 "<b>openssl-X.Y.ZA</b>" subdirectory within the local
161 [/tree?ci=trunk&name=compat | compat] directory (e.g.
162 "<b>compat/openssl-1.0.2q</b>"), then make sure that some recent
163 <a href="http://www.perl.org/">Perl</a> binaries are installed locally,
164 and finally run one of the following commands:
165 <blockquote><pre>
166 nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
167 </pre></blockquote>
168
--- www/build.wiki
+++ www/build.wiki
@@ -157,11 +157,11 @@
157 the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
158 first <a href="https://www.openssl.org/source/">download the official
159 source code for OpenSSL</a> and extract it to an appropriately named
160 "<b>openssl-X.Y.ZA</b>" subdirectory within the local
161 [/tree?ci=trunk&name=compat | compat] directory (e.g.
162 "<b>compat/openssl-1.1.1b</b>"), then make sure that some recent
163 <a href="http://www.perl.org/">Perl</a> binaries are installed locally,
164 and finally run one of the following commands:
165 <blockquote><pre>
166 nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
167 </pre></blockquote>
168

Keyboard Shortcuts

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