Fossil SCM

Update openssl version number to 1.1.1e. Update custom makefile.

jan.nijtmans 2020-03-24 20:24 trunk
Commit 77a7078f74bc74a49fc132381907e05518041f0716f8bba34da53f837d3d106a
Parent 993700abaf4aa93…
5 files changed +2 -2 +1 -1 +17 -1 +1 -1 +1 -1
~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc ~ www/build.wiki
M src/makemake.tcl
+2 -2
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -713,11 +713,11 @@
713713
 #### The directories where the OpenSSL include and library files are located.
714714
 # The recommended usage here is to use the Sysinternals junction tool
715715
 # to create a hard link between an "openssl-1.x" sub-directory of the
716716
 # Fossil source code directory and the target OpenSSL source directory.
717717
 #
718
-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1d
718
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1e
719719
 OPENSSLINCDIR = $(OPENSSLDIR)/include
720720
 OPENSSLLIBDIR = $(OPENSSLDIR)
721721
722722
 #### Either the directory where the Tcl library is installed or the Tcl
723723
 # source code directory resides (depending on the value of the macro
@@ -1570,11 +1570,11 @@
15701570
 !ifndef USE_SEE
15711571
 USE_SEE = 0
15721572
 !endif
15731573
15741574
 !if $(FOSSIL_ENABLE_SSL)!=0
1575
-SSLDIR = $(B)\compat\openssl-1.1.1d
1575
+SSLDIR = $(B)\compat\openssl-1.1.1e
15761576
 SSLINCDIR = $(SSLDIR)\include
15771577
 !if $(FOSSIL_DYNAMIC_BUILD)!=0
15781578
 SSLLIBDIR = $(SSLDIR)
15791579
 !else
15801580
 SSLLIBDIR = $(SSLDIR)
15811581
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -713,11 +713,11 @@
713 #### The directories where the OpenSSL include and library files are located.
714 # The recommended usage here is to use the Sysinternals junction tool
715 # to create a hard link between an "openssl-1.x" sub-directory of the
716 # Fossil source code directory and the target OpenSSL source directory.
717 #
718 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1d
719 OPENSSLINCDIR = $(OPENSSLDIR)/include
720 OPENSSLLIBDIR = $(OPENSSLDIR)
721
722 #### Either the directory where the Tcl library is installed or the Tcl
723 # source code directory resides (depending on the value of the macro
@@ -1570,11 +1570,11 @@
1570 !ifndef USE_SEE
1571 USE_SEE = 0
1572 !endif
1573
1574 !if $(FOSSIL_ENABLE_SSL)!=0
1575 SSLDIR = $(B)\compat\openssl-1.1.1d
1576 SSLINCDIR = $(SSLDIR)\include
1577 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1578 SSLLIBDIR = $(SSLDIR)
1579 !else
1580 SSLLIBDIR = $(SSLDIR)
1581
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -713,11 +713,11 @@
713 #### The directories where the OpenSSL include and library files are located.
714 # The recommended usage here is to use the Sysinternals junction tool
715 # to create a hard link between an "openssl-1.x" sub-directory of the
716 # Fossil source code directory and the target OpenSSL source directory.
717 #
718 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1e
719 OPENSSLINCDIR = $(OPENSSLDIR)/include
720 OPENSSLLIBDIR = $(OPENSSLDIR)
721
722 #### Either the directory where the Tcl library is installed or the Tcl
723 # source code directory resides (depending on the value of the macro
@@ -1570,11 +1570,11 @@
1570 !ifndef USE_SEE
1571 USE_SEE = 0
1572 !endif
1573
1574 !if $(FOSSIL_ENABLE_SSL)!=0
1575 SSLDIR = $(B)\compat\openssl-1.1.1e
1576 SSLINCDIR = $(SSLDIR)\include
1577 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1578 SSLLIBDIR = $(SSLDIR)
1579 !else
1580 SSLLIBDIR = $(SSLDIR)
1581
M win/Makefile.mingw
+1 -1
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -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.1.1d
179
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1e
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
@@ -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.1d
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
@@ -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.1e
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
+17 -1
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -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.1.1d
179
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.1.1e
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
@@ -646,10 +646,26 @@
646646
 $(SRCDIR)/menu.js \
647647
 $(SRCDIR)/sbsdiff.js \
648648
 $(SRCDIR)/scroll.js \
649649
 $(SRCDIR)/skin.js \
650650
 $(SRCDIR)/sorttable.js \
651
+ $(SRCDIR)/sounds/0.wav \
652
+ $(SRCDIR)/sounds/1.wav \
653
+ $(SRCDIR)/sounds/2.wav \
654
+ $(SRCDIR)/sounds/3.wav \
655
+ $(SRCDIR)/sounds/4.wav \
656
+ $(SRCDIR)/sounds/5.wav \
657
+ $(SRCDIR)/sounds/6.wav \
658
+ $(SRCDIR)/sounds/7.wav \
659
+ $(SRCDIR)/sounds/8.wav \
660
+ $(SRCDIR)/sounds/9.wav \
661
+ $(SRCDIR)/sounds/a.wav \
662
+ $(SRCDIR)/sounds/b.wav \
663
+ $(SRCDIR)/sounds/c.wav \
664
+ $(SRCDIR)/sounds/d.wav \
665
+ $(SRCDIR)/sounds/e.wav \
666
+ $(SRCDIR)/sounds/f.wav \
651667
 $(SRCDIR)/tree.js \
652668
 $(SRCDIR)/useredit.js \
653669
 $(SRCDIR)/wiki.wiki
654670
655671
 TRANS_SRC = \
656672
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -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.1d
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
@@ -646,10 +646,26 @@
646 $(SRCDIR)/menu.js \
647 $(SRCDIR)/sbsdiff.js \
648 $(SRCDIR)/scroll.js \
649 $(SRCDIR)/skin.js \
650 $(SRCDIR)/sorttable.js \
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
651 $(SRCDIR)/tree.js \
652 $(SRCDIR)/useredit.js \
653 $(SRCDIR)/wiki.wiki
654
655 TRANS_SRC = \
656
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -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.1e
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
@@ -646,10 +646,26 @@
646 $(SRCDIR)/menu.js \
647 $(SRCDIR)/sbsdiff.js \
648 $(SRCDIR)/scroll.js \
649 $(SRCDIR)/skin.js \
650 $(SRCDIR)/sorttable.js \
651 $(SRCDIR)/sounds/0.wav \
652 $(SRCDIR)/sounds/1.wav \
653 $(SRCDIR)/sounds/2.wav \
654 $(SRCDIR)/sounds/3.wav \
655 $(SRCDIR)/sounds/4.wav \
656 $(SRCDIR)/sounds/5.wav \
657 $(SRCDIR)/sounds/6.wav \
658 $(SRCDIR)/sounds/7.wav \
659 $(SRCDIR)/sounds/8.wav \
660 $(SRCDIR)/sounds/9.wav \
661 $(SRCDIR)/sounds/a.wav \
662 $(SRCDIR)/sounds/b.wav \
663 $(SRCDIR)/sounds/c.wav \
664 $(SRCDIR)/sounds/d.wav \
665 $(SRCDIR)/sounds/e.wav \
666 $(SRCDIR)/sounds/f.wav \
667 $(SRCDIR)/tree.js \
668 $(SRCDIR)/useredit.js \
669 $(SRCDIR)/wiki.wiki
670
671 TRANS_SRC = \
672
M win/Makefile.msc
+1 -1
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -98,11 +98,11 @@
9898
 !ifndef USE_SEE
9999
 USE_SEE = 0
100100
 !endif
101101
102102
 !if $(FOSSIL_ENABLE_SSL)!=0
103
-SSLDIR = $(B)\compat\openssl-1.1.1d
103
+SSLDIR = $(B)\compat\openssl-1.1.1e
104104
 SSLINCDIR = $(SSLDIR)\include
105105
 !if $(FOSSIL_DYNAMIC_BUILD)!=0
106106
 SSLLIBDIR = $(SSLDIR)
107107
 !else
108108
 SSLLIBDIR = $(SSLDIR)
109109
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -98,11 +98,11 @@
98 !ifndef USE_SEE
99 USE_SEE = 0
100 !endif
101
102 !if $(FOSSIL_ENABLE_SSL)!=0
103 SSLDIR = $(B)\compat\openssl-1.1.1d
104 SSLINCDIR = $(SSLDIR)\include
105 !if $(FOSSIL_DYNAMIC_BUILD)!=0
106 SSLLIBDIR = $(SSLDIR)
107 !else
108 SSLLIBDIR = $(SSLDIR)
109
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -98,11 +98,11 @@
98 !ifndef USE_SEE
99 USE_SEE = 0
100 !endif
101
102 !if $(FOSSIL_ENABLE_SSL)!=0
103 SSLDIR = $(B)\compat\openssl-1.1.1e
104 SSLINCDIR = $(SSLDIR)\include
105 !if $(FOSSIL_DYNAMIC_BUILD)!=0
106 SSLLIBDIR = $(SSLDIR)
107 !else
108 SSLLIBDIR = $(SSLDIR)
109
M www/build.wiki
+1 -1
--- www/build.wiki
+++ www/build.wiki
@@ -161,11 +161,11 @@
161161
 the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
162162
 first <a href="https://www.openssl.org/source/">download the official
163163
 source code for OpenSSL</a> and extract it to an appropriately named
164164
 "<b>openssl-X.Y.ZA</b>" subdirectory within the local
165165
 [/tree?ci=trunk&name=compat | compat] directory (e.g.
166
-"<b>compat/openssl-1.1.1d</b>"), then make sure that some recent
166
+"<b>compat/openssl-1.1.1e</b>"), then make sure that some recent
167167
 <a href="http://www.perl.org/">Perl</a> binaries are installed locally,
168168
 and finally run one of the following commands:
169169
 <blockquote><pre>
170170
 nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
171171
 </pre></blockquote>
172172
--- www/build.wiki
+++ www/build.wiki
@@ -161,11 +161,11 @@
161 the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
162 first <a href="https://www.openssl.org/source/">download the official
163 source code for OpenSSL</a> and extract it to an appropriately named
164 "<b>openssl-X.Y.ZA</b>" subdirectory within the local
165 [/tree?ci=trunk&name=compat | compat] directory (e.g.
166 "<b>compat/openssl-1.1.1d</b>"), then make sure that some recent
167 <a href="http://www.perl.org/">Perl</a> binaries are installed locally,
168 and finally run one of the following commands:
169 <blockquote><pre>
170 nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
171 </pre></blockquote>
172
--- www/build.wiki
+++ www/build.wiki
@@ -161,11 +161,11 @@
161 the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
162 first <a href="https://www.openssl.org/source/">download the official
163 source code for OpenSSL</a> and extract it to an appropriately named
164 "<b>openssl-X.Y.ZA</b>" subdirectory within the local
165 [/tree?ci=trunk&name=compat | compat] directory (e.g.
166 "<b>compat/openssl-1.1.1e</b>"), then make sure that some recent
167 <a href="http://www.perl.org/">Perl</a> binaries are installed locally,
168 and finally run one of the following commands:
169 <blockquote><pre>
170 nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
171 </pre></blockquote>
172

Keyboard Shortcuts

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