Fossil SCM

(cherry-pick): Upgrade to openssl 1.0.2m

jan.nijtmans 2017-11-10 10:30 UTC branch-2.4
Commit 3003decb4e92d988a7d1f078510634cb097e9c29ea52b1d61638fe7a2f2c44fc
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -676,11 +676,11 @@
676676
#### The directories where the OpenSSL include and library files are located.
677677
# The recommended usage here is to use the Sysinternals junction tool
678678
# to create a hard link between an "openssl-1.x" sub-directory of the
679679
# Fossil source code directory and the target OpenSSL source directory.
680680
#
681
-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2l
681
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2m
682682
OPENSSLINCDIR = $(OPENSSLDIR)/include
683683
OPENSSLLIBDIR = $(OPENSSLDIR)
684684
685685
#### Either the directory where the Tcl library is installed or the Tcl
686686
# source code directory resides (depending on the value of the macro
@@ -1507,11 +1507,11 @@
15071507
!ifndef USE_SEE
15081508
USE_SEE = 0
15091509
!endif
15101510
15111511
!if $(FOSSIL_ENABLE_SSL)!=0
1512
-SSLDIR = $(B)\compat\openssl-1.0.2l
1512
+SSLDIR = $(B)\compat\openssl-1.0.2m
15131513
SSLINCDIR = $(SSLDIR)\inc32
15141514
!if $(FOSSIL_DYNAMIC_BUILD)!=0
15151515
SSLLIBDIR = $(SSLDIR)\out32dll
15161516
!else
15171517
SSLLIBDIR = $(SSLDIR)\out32
15181518
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -676,11 +676,11 @@
676 #### The directories where the OpenSSL include and library files are located.
677 # The recommended usage here is to use the Sysinternals junction tool
678 # to create a hard link between an "openssl-1.x" sub-directory of the
679 # Fossil source code directory and the target OpenSSL source directory.
680 #
681 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2l
682 OPENSSLINCDIR = $(OPENSSLDIR)/include
683 OPENSSLLIBDIR = $(OPENSSLDIR)
684
685 #### Either the directory where the Tcl library is installed or the Tcl
686 # source code directory resides (depending on the value of the macro
@@ -1507,11 +1507,11 @@
1507 !ifndef USE_SEE
1508 USE_SEE = 0
1509 !endif
1510
1511 !if $(FOSSIL_ENABLE_SSL)!=0
1512 SSLDIR = $(B)\compat\openssl-1.0.2l
1513 SSLINCDIR = $(SSLDIR)\inc32
1514 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1515 SSLLIBDIR = $(SSLDIR)\out32dll
1516 !else
1517 SSLLIBDIR = $(SSLDIR)\out32
1518
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -676,11 +676,11 @@
676 #### The directories where the OpenSSL include and library files are located.
677 # The recommended usage here is to use the Sysinternals junction tool
678 # to create a hard link between an "openssl-1.x" sub-directory of the
679 # Fossil source code directory and the target OpenSSL source directory.
680 #
681 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2m
682 OPENSSLINCDIR = $(OPENSSLDIR)/include
683 OPENSSLLIBDIR = $(OPENSSLDIR)
684
685 #### Either the directory where the Tcl library is installed or the Tcl
686 # source code directory resides (depending on the value of the macro
@@ -1507,11 +1507,11 @@
1507 !ifndef USE_SEE
1508 USE_SEE = 0
1509 !endif
1510
1511 !if $(FOSSIL_ENABLE_SSL)!=0
1512 SSLDIR = $(B)\compat\openssl-1.0.2m
1513 SSLINCDIR = $(SSLDIR)\inc32
1514 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1515 SSLLIBDIR = $(SSLDIR)\out32dll
1516 !else
1517 SSLLIBDIR = $(SSLDIR)\out32
1518
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -676,11 +676,11 @@
676676
#### The directories where the OpenSSL include and library files are located.
677677
# The recommended usage here is to use the Sysinternals junction tool
678678
# to create a hard link between an "openssl-1.x" sub-directory of the
679679
# Fossil source code directory and the target OpenSSL source directory.
680680
#
681
-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2l
681
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2m
682682
OPENSSLINCDIR = $(OPENSSLDIR)/include
683683
OPENSSLLIBDIR = $(OPENSSLDIR)
684684
685685
#### Either the directory where the Tcl library is installed or the Tcl
686686
# source code directory resides (depending on the value of the macro
@@ -1507,11 +1507,11 @@
15071507
!ifndef USE_SEE
15081508
USE_SEE = 0
15091509
!endif
15101510
15111511
!if $(FOSSIL_ENABLE_SSL)!=0
1512
-SSLDIR = $(B)\compat\openssl-1.0.2l
1512
+SSLDIR = $(B)\compat\openssl-1.0.2m
15131513
SSLINCDIR = $(SSLDIR)\inc32
15141514
!if $(FOSSIL_DYNAMIC_BUILD)!=0
15151515
SSLLIBDIR = $(SSLDIR)\out32dll
15161516
!else
15171517
SSLLIBDIR = $(SSLDIR)\out32
15181518
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -676,11 +676,11 @@
676 #### The directories where the OpenSSL include and library files are located.
677 # The recommended usage here is to use the Sysinternals junction tool
678 # to create a hard link between an "openssl-1.x" sub-directory of the
679 # Fossil source code directory and the target OpenSSL source directory.
680 #
681 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2l
682 OPENSSLINCDIR = $(OPENSSLDIR)/include
683 OPENSSLLIBDIR = $(OPENSSLDIR)
684
685 #### Either the directory where the Tcl library is installed or the Tcl
686 # source code directory resides (depending on the value of the macro
@@ -1507,11 +1507,11 @@
1507 !ifndef USE_SEE
1508 USE_SEE = 0
1509 !endif
1510
1511 !if $(FOSSIL_ENABLE_SSL)!=0
1512 SSLDIR = $(B)\compat\openssl-1.0.2l
1513 SSLINCDIR = $(SSLDIR)\inc32
1514 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1515 SSLLIBDIR = $(SSLDIR)\out32dll
1516 !else
1517 SSLLIBDIR = $(SSLDIR)\out32
1518
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -676,11 +676,11 @@
676 #### The directories where the OpenSSL include and library files are located.
677 # The recommended usage here is to use the Sysinternals junction tool
678 # to create a hard link between an "openssl-1.x" sub-directory of the
679 # Fossil source code directory and the target OpenSSL source directory.
680 #
681 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2m
682 OPENSSLINCDIR = $(OPENSSLDIR)/include
683 OPENSSLLIBDIR = $(OPENSSLDIR)
684
685 #### Either the directory where the Tcl library is installed or the Tcl
686 # source code directory resides (depending on the value of the macro
@@ -1507,11 +1507,11 @@
1507 !ifndef USE_SEE
1508 USE_SEE = 0
1509 !endif
1510
1511 !if $(FOSSIL_ENABLE_SSL)!=0
1512 SSLDIR = $(B)\compat\openssl-1.0.2m
1513 SSLINCDIR = $(SSLDIR)\inc32
1514 !if $(FOSSIL_DYNAMIC_BUILD)!=0
1515 SSLLIBDIR = $(SSLDIR)\out32dll
1516 !else
1517 SSLLIBDIR = $(SSLDIR)\out32
1518
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -170,11 +170,11 @@
170170
#### The directories where the OpenSSL include and library files are located.
171171
# The recommended usage here is to use the Sysinternals junction tool
172172
# to create a hard link between an "openssl-1.x" sub-directory of the
173173
# Fossil source code directory and the target OpenSSL source directory.
174174
#
175
-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2l
175
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2m
176176
OPENSSLINCDIR = $(OPENSSLDIR)/include
177177
OPENSSLLIBDIR = $(OPENSSLDIR)
178178
179179
#### Either the directory where the Tcl library is installed or the Tcl
180180
# source code directory resides (depending on the value of the macro
181181
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -170,11 +170,11 @@
170 #### The directories where the OpenSSL include and library files are located.
171 # The recommended usage here is to use the Sysinternals junction tool
172 # to create a hard link between an "openssl-1.x" sub-directory of the
173 # Fossil source code directory and the target OpenSSL source directory.
174 #
175 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2l
176 OPENSSLINCDIR = $(OPENSSLDIR)/include
177 OPENSSLLIBDIR = $(OPENSSLDIR)
178
179 #### Either the directory where the Tcl library is installed or the Tcl
180 # source code directory resides (depending on the value of the macro
181
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -170,11 +170,11 @@
170 #### The directories where the OpenSSL include and library files are located.
171 # The recommended usage here is to use the Sysinternals junction tool
172 # to create a hard link between an "openssl-1.x" sub-directory of the
173 # Fossil source code directory and the target OpenSSL source directory.
174 #
175 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2m
176 OPENSSLINCDIR = $(OPENSSLDIR)/include
177 OPENSSLLIBDIR = $(OPENSSLDIR)
178
179 #### Either the directory where the Tcl library is installed or the Tcl
180 # source code directory resides (depending on the value of the macro
181
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -170,11 +170,11 @@
170170
#### The directories where the OpenSSL include and library files are located.
171171
# The recommended usage here is to use the Sysinternals junction tool
172172
# to create a hard link between an "openssl-1.x" sub-directory of the
173173
# Fossil source code directory and the target OpenSSL source directory.
174174
#
175
-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2l
175
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2m
176176
OPENSSLINCDIR = $(OPENSSLDIR)/include
177177
OPENSSLLIBDIR = $(OPENSSLDIR)
178178
179179
#### Either the directory where the Tcl library is installed or the Tcl
180180
# source code directory resides (depending on the value of the macro
181181
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -170,11 +170,11 @@
170 #### The directories where the OpenSSL include and library files are located.
171 # The recommended usage here is to use the Sysinternals junction tool
172 # to create a hard link between an "openssl-1.x" sub-directory of the
173 # Fossil source code directory and the target OpenSSL source directory.
174 #
175 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2l
176 OPENSSLINCDIR = $(OPENSSLDIR)/include
177 OPENSSLLIBDIR = $(OPENSSLDIR)
178
179 #### Either the directory where the Tcl library is installed or the Tcl
180 # source code directory resides (depending on the value of the macro
181
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -170,11 +170,11 @@
170 #### The directories where the OpenSSL include and library files are located.
171 # The recommended usage here is to use the Sysinternals junction tool
172 # to create a hard link between an "openssl-1.x" sub-directory of the
173 # Fossil source code directory and the target OpenSSL source directory.
174 #
175 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2m
176 OPENSSLINCDIR = $(OPENSSLDIR)/include
177 OPENSSLLIBDIR = $(OPENSSLDIR)
178
179 #### Either the directory where the Tcl library is installed or the Tcl
180 # source code directory resides (depending on the value of the macro
181
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -170,11 +170,11 @@
170170
#### The directories where the OpenSSL include and library files are located.
171171
# The recommended usage here is to use the Sysinternals junction tool
172172
# to create a hard link between an "openssl-1.x" sub-directory of the
173173
# Fossil source code directory and the target OpenSSL source directory.
174174
#
175
-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2l
175
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2m
176176
OPENSSLINCDIR = $(OPENSSLDIR)/include
177177
OPENSSLLIBDIR = $(OPENSSLDIR)
178178
179179
#### Either the directory where the Tcl library is installed or the Tcl
180180
# source code directory resides (depending on the value of the macro
181181
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -170,11 +170,11 @@
170 #### The directories where the OpenSSL include and library files are located.
171 # The recommended usage here is to use the Sysinternals junction tool
172 # to create a hard link between an "openssl-1.x" sub-directory of the
173 # Fossil source code directory and the target OpenSSL source directory.
174 #
175 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2l
176 OPENSSLINCDIR = $(OPENSSLDIR)/include
177 OPENSSLLIBDIR = $(OPENSSLDIR)
178
179 #### Either the directory where the Tcl library is installed or the Tcl
180 # source code directory resides (depending on the value of the macro
181
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -170,11 +170,11 @@
170 #### The directories where the OpenSSL include and library files are located.
171 # The recommended usage here is to use the Sysinternals junction tool
172 # to create a hard link between an "openssl-1.x" sub-directory of the
173 # Fossil source code directory and the target OpenSSL source directory.
174 #
175 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2m
176 OPENSSLINCDIR = $(OPENSSLDIR)/include
177 OPENSSLLIBDIR = $(OPENSSLDIR)
178
179 #### Either the directory where the Tcl library is installed or the Tcl
180 # source code directory resides (depending on the value of the macro
181
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -170,11 +170,11 @@
170170
#### The directories where the OpenSSL include and library files are located.
171171
# The recommended usage here is to use the Sysinternals junction tool
172172
# to create a hard link between an "openssl-1.x" sub-directory of the
173173
# Fossil source code directory and the target OpenSSL source directory.
174174
#
175
-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2l
175
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2m
176176
OPENSSLINCDIR = $(OPENSSLDIR)/include
177177
OPENSSLLIBDIR = $(OPENSSLDIR)
178178
179179
#### Either the directory where the Tcl library is installed or the Tcl
180180
# source code directory resides (depending on the value of the macro
181181
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -170,11 +170,11 @@
170 #### The directories where the OpenSSL include and library files are located.
171 # The recommended usage here is to use the Sysinternals junction tool
172 # to create a hard link between an "openssl-1.x" sub-directory of the
173 # Fossil source code directory and the target OpenSSL source directory.
174 #
175 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2l
176 OPENSSLINCDIR = $(OPENSSLDIR)/include
177 OPENSSLLIBDIR = $(OPENSSLDIR)
178
179 #### Either the directory where the Tcl library is installed or the Tcl
180 # source code directory resides (depending on the value of the macro
181
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -170,11 +170,11 @@
170 #### The directories where the OpenSSL include and library files are located.
171 # The recommended usage here is to use the Sysinternals junction tool
172 # to create a hard link between an "openssl-1.x" sub-directory of the
173 # Fossil source code directory and the target OpenSSL source directory.
174 #
175 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2m
176 OPENSSLINCDIR = $(OPENSSLDIR)/include
177 OPENSSLLIBDIR = $(OPENSSLDIR)
178
179 #### Either the directory where the Tcl library is installed or the Tcl
180 # source code directory resides (depending on the value of the macro
181
--- 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.0.2l
103
+SSLDIR = $(B)\compat\openssl-1.0.2m
104104
SSLINCDIR = $(SSLDIR)\inc32
105105
!if $(FOSSIL_DYNAMIC_BUILD)!=0
106106
SSLLIBDIR = $(SSLDIR)\out32dll
107107
!else
108108
SSLLIBDIR = $(SSLDIR)\out32
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.0.2l
104 SSLINCDIR = $(SSLDIR)\inc32
105 !if $(FOSSIL_DYNAMIC_BUILD)!=0
106 SSLLIBDIR = $(SSLDIR)\out32dll
107 !else
108 SSLLIBDIR = $(SSLDIR)\out32
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.0.2m
104 SSLINCDIR = $(SSLDIR)\inc32
105 !if $(FOSSIL_DYNAMIC_BUILD)!=0
106 SSLLIBDIR = $(SSLDIR)\out32dll
107 !else
108 SSLLIBDIR = $(SSLDIR)\out32
109
--- 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.0.2l
103
+SSLDIR = $(B)\compat\openssl-1.0.2m
104104
SSLINCDIR = $(SSLDIR)\inc32
105105
!if $(FOSSIL_DYNAMIC_BUILD)!=0
106106
SSLLIBDIR = $(SSLDIR)\out32dll
107107
!else
108108
SSLLIBDIR = $(SSLDIR)\out32
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.0.2l
104 SSLINCDIR = $(SSLDIR)\inc32
105 !if $(FOSSIL_DYNAMIC_BUILD)!=0
106 SSLLIBDIR = $(SSLDIR)\out32dll
107 !else
108 SSLLIBDIR = $(SSLDIR)\out32
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.0.2m
104 SSLINCDIR = $(SSLDIR)\inc32
105 !if $(FOSSIL_DYNAMIC_BUILD)!=0
106 SSLLIBDIR = $(SSLDIR)\out32dll
107 !else
108 SSLLIBDIR = $(SSLDIR)\out32
109
+1 -1
--- www/build.wiki
+++ www/build.wiki
@@ -136,11 +136,11 @@
136136
the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
137137
first <a href="https://www.openssl.org/source/">download the official
138138
source code for OpenSSL</a> and extract it to an appropriately named
139139
"<b>openssl-X.Y.ZA</b>" subdirectory within the local
140140
[/tree?ci=trunk&name=compat | compat] directory (e.g.
141
-"<b>compat/openssl-1.0.2l</b>"), then make sure that some recent
141
+"<b>compat/openssl-1.0.2m</b>"), then make sure that some recent
142142
<a href="http://www.perl.org/">Perl</a> binaries are installed locally,
143143
and finally run one of the following commands:
144144
<blockquote><pre>
145145
nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
146146
</pre></blockquote>
147147
--- www/build.wiki
+++ www/build.wiki
@@ -136,11 +136,11 @@
136 the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
137 first <a href="https://www.openssl.org/source/">download the official
138 source code for OpenSSL</a> and extract it to an appropriately named
139 "<b>openssl-X.Y.ZA</b>" subdirectory within the local
140 [/tree?ci=trunk&name=compat | compat] directory (e.g.
141 "<b>compat/openssl-1.0.2l</b>"), then make sure that some recent
142 <a href="http://www.perl.org/">Perl</a> binaries are installed locally,
143 and finally run one of the following commands:
144 <blockquote><pre>
145 nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
146 </pre></blockquote>
147
--- www/build.wiki
+++ www/build.wiki
@@ -136,11 +136,11 @@
136 the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
137 first <a href="https://www.openssl.org/source/">download the official
138 source code for OpenSSL</a> and extract it to an appropriately named
139 "<b>openssl-X.Y.ZA</b>" subdirectory within the local
140 [/tree?ci=trunk&name=compat | compat] directory (e.g.
141 "<b>compat/openssl-1.0.2m</b>"), then make sure that some recent
142 <a href="http://www.perl.org/">Perl</a> binaries are installed locally,
143 and finally run one of the following commands:
144 <blockquote><pre>
145 nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
146 </pre></blockquote>
147

Keyboard Shortcuts

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