Fossil SCM

Upgrade to openssl 1.0.2a

jan.nijtmans 2015-03-19 21:54 trunk
Commit dabb08e9b31bb0b247b5a7dfaa6c52e3e1200274
Parent 1f797521e370c2b…
4 files changed +2 -2 +1 -1 +1 -1 +1 -1
~ src/makemake.tcl ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.msc
M src/makemake.tcl
+2 -2
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -587,11 +587,11 @@
587587
 #### The directories where the OpenSSL include and library files are located.
588588
 # The recommended usage here is to use the Sysinternals junction tool
589589
 # to create a hard link between an "openssl-1.x" sub-directory of the
590590
 # Fossil source code directory and the target OpenSSL source directory.
591591
 #
592
-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2
592
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2a
593593
 OPENSSLINCDIR = $(OPENSSLDIR)/include
594594
 OPENSSLLIBDIR = $(OPENSSLDIR)
595595
596596
 #### Either the directory where the Tcl library is installed or the Tcl
597597
 # source code directory resides (depending on the value of the macro
@@ -1320,11 +1320,11 @@
13201320
13211321
 # Uncomment to enable Tcl support
13221322
 # FOSSIL_ENABLE_TCL = 1
13231323
13241324
 !ifdef FOSSIL_ENABLE_SSL
1325
-SSLDIR = $(B)\compat\openssl-1.0.2
1325
+SSLDIR = $(B)\compat\openssl-1.0.2a
13261326
 SSLINCDIR = $(SSLDIR)\inc32
13271327
 SSLLIBDIR = $(SSLDIR)\out32
13281328
 SSLLFLAGS = /nologo /opt:ref /debug
13291329
 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
13301330
 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
13311331
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -587,11 +587,11 @@
587 #### The directories where the OpenSSL include and library files are located.
588 # The recommended usage here is to use the Sysinternals junction tool
589 # to create a hard link between an "openssl-1.x" sub-directory of the
590 # Fossil source code directory and the target OpenSSL source directory.
591 #
592 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2
593 OPENSSLINCDIR = $(OPENSSLDIR)/include
594 OPENSSLLIBDIR = $(OPENSSLDIR)
595
596 #### Either the directory where the Tcl library is installed or the Tcl
597 # source code directory resides (depending on the value of the macro
@@ -1320,11 +1320,11 @@
1320
1321 # Uncomment to enable Tcl support
1322 # FOSSIL_ENABLE_TCL = 1
1323
1324 !ifdef FOSSIL_ENABLE_SSL
1325 SSLDIR = $(B)\compat\openssl-1.0.2
1326 SSLINCDIR = $(SSLDIR)\inc32
1327 SSLLIBDIR = $(SSLDIR)\out32
1328 SSLLFLAGS = /nologo /opt:ref /debug
1329 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1330 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
1331
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -587,11 +587,11 @@
587 #### The directories where the OpenSSL include and library files are located.
588 # The recommended usage here is to use the Sysinternals junction tool
589 # to create a hard link between an "openssl-1.x" sub-directory of the
590 # Fossil source code directory and the target OpenSSL source directory.
591 #
592 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2a
593 OPENSSLINCDIR = $(OPENSSLDIR)/include
594 OPENSSLLIBDIR = $(OPENSSLDIR)
595
596 #### Either the directory where the Tcl library is installed or the Tcl
597 # source code directory resides (depending on the value of the macro
@@ -1320,11 +1320,11 @@
1320
1321 # Uncomment to enable Tcl support
1322 # FOSSIL_ENABLE_TCL = 1
1323
1324 !ifdef FOSSIL_ENABLE_SSL
1325 SSLDIR = $(B)\compat\openssl-1.0.2a
1326 SSLINCDIR = $(SSLDIR)\inc32
1327 SSLLIBDIR = $(SSLDIR)\out32
1328 SSLLFLAGS = /nologo /opt:ref /debug
1329 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
1330 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
1331
M win/Makefile.mingw
+1 -1
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -146,11 +146,11 @@
146146
 #### The directories where the OpenSSL include and library files are located.
147147
 # The recommended usage here is to use the Sysinternals junction tool
148148
 # to create a hard link between an "openssl-1.x" sub-directory of the
149149
 # Fossil source code directory and the target OpenSSL source directory.
150150
 #
151
-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2
151
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2a
152152
 OPENSSLINCDIR = $(OPENSSLDIR)/include
153153
 OPENSSLLIBDIR = $(OPENSSLDIR)
154154
155155
 #### Either the directory where the Tcl library is installed or the Tcl
156156
 # source code directory resides (depending on the value of the macro
157157
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -146,11 +146,11 @@
146 #### The directories where the OpenSSL include and library files are located.
147 # The recommended usage here is to use the Sysinternals junction tool
148 # to create a hard link between an "openssl-1.x" sub-directory of the
149 # Fossil source code directory and the target OpenSSL source directory.
150 #
151 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2
152 OPENSSLINCDIR = $(OPENSSLDIR)/include
153 OPENSSLLIBDIR = $(OPENSSLDIR)
154
155 #### Either the directory where the Tcl library is installed or the Tcl
156 # source code directory resides (depending on the value of the macro
157
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -146,11 +146,11 @@
146 #### The directories where the OpenSSL include and library files are located.
147 # The recommended usage here is to use the Sysinternals junction tool
148 # to create a hard link between an "openssl-1.x" sub-directory of the
149 # Fossil source code directory and the target OpenSSL source directory.
150 #
151 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2a
152 OPENSSLINCDIR = $(OPENSSLDIR)/include
153 OPENSSLLIBDIR = $(OPENSSLDIR)
154
155 #### Either the directory where the Tcl library is installed or the Tcl
156 # source code directory resides (depending on the value of the macro
157
M win/Makefile.mingw.mistachkin
+1 -1
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -146,11 +146,11 @@
146146
 #### The directories where the OpenSSL include and library files are located.
147147
 # The recommended usage here is to use the Sysinternals junction tool
148148
 # to create a hard link between an "openssl-1.x" sub-directory of the
149149
 # Fossil source code directory and the target OpenSSL source directory.
150150
 #
151
-OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2
151
+OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2a
152152
 OPENSSLINCDIR = $(OPENSSLDIR)/include
153153
 OPENSSLLIBDIR = $(OPENSSLDIR)
154154
155155
 #### Either the directory where the Tcl library is installed or the Tcl
156156
 # source code directory resides (depending on the value of the macro
157157
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -146,11 +146,11 @@
146 #### The directories where the OpenSSL include and library files are located.
147 # The recommended usage here is to use the Sysinternals junction tool
148 # to create a hard link between an "openssl-1.x" sub-directory of the
149 # Fossil source code directory and the target OpenSSL source directory.
150 #
151 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2
152 OPENSSLINCDIR = $(OPENSSLDIR)/include
153 OPENSSLLIBDIR = $(OPENSSLDIR)
154
155 #### Either the directory where the Tcl library is installed or the Tcl
156 # source code directory resides (depending on the value of the macro
157
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -146,11 +146,11 @@
146 #### The directories where the OpenSSL include and library files are located.
147 # The recommended usage here is to use the Sysinternals junction tool
148 # to create a hard link between an "openssl-1.x" sub-directory of the
149 # Fossil source code directory and the target OpenSSL source directory.
150 #
151 OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2a
152 OPENSSLINCDIR = $(OPENSSLDIR)/include
153 OPENSSLLIBDIR = $(OPENSSLDIR)
154
155 #### Either the directory where the Tcl library is installed or the Tcl
156 # source code directory resides (depending on the value of the macro
157
M win/Makefile.msc
+1 -1
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -55,11 +55,11 @@
5555
5656
 # Uncomment to enable Tcl support
5757
 # FOSSIL_ENABLE_TCL = 1
5858
5959
 !ifdef FOSSIL_ENABLE_SSL
60
-SSLDIR = $(B)\compat\openssl-1.0.2
60
+SSLDIR = $(B)\compat\openssl-1.0.2a
6161
 SSLINCDIR = $(SSLDIR)\inc32
6262
 SSLLIBDIR = $(SSLDIR)\out32
6363
 SSLLFLAGS = /nologo /opt:ref /debug
6464
 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
6565
 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
6666
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -55,11 +55,11 @@
55
56 # Uncomment to enable Tcl support
57 # FOSSIL_ENABLE_TCL = 1
58
59 !ifdef FOSSIL_ENABLE_SSL
60 SSLDIR = $(B)\compat\openssl-1.0.2
61 SSLINCDIR = $(SSLDIR)\inc32
62 SSLLIBDIR = $(SSLDIR)\out32
63 SSLLFLAGS = /nologo /opt:ref /debug
64 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
65 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
66
--- win/Makefile.msc
+++ win/Makefile.msc
@@ -55,11 +55,11 @@
55
56 # Uncomment to enable Tcl support
57 # FOSSIL_ENABLE_TCL = 1
58
59 !ifdef FOSSIL_ENABLE_SSL
60 SSLDIR = $(B)\compat\openssl-1.0.2a
61 SSLINCDIR = $(SSLDIR)\inc32
62 SSLLIBDIR = $(SSLDIR)\out32
63 SSLLFLAGS = /nologo /opt:ref /debug
64 SSLLIB = ssleay32.lib libeay32.lib user32.lib gdi32.lib
65 !if "$(PLATFORM)"=="amd64" || "$(PLATFORM)"=="x64"
66

Keyboard Shortcuts

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