Menu

#61 Windows DOTVERSION was not updated for 1.6.7

open
nobody
None
5
2015-07-09
2015-07-09
No

In reviewing the diffs between the old 1.6.4 tar-ball and the new 1.6.7 one, I noticed that makefile.vc was out of date:

diff -uNr tls1.6.4/win/makefile.vc /tmp/dist/tls1.6.7/win/makefile.vc
--- tls1.6.4/win/makefile.vc    2014-12-08 19:10:28.000000000 +0000
+++ /tmp/dist/tls1.6.7/win/makefile.vc  2015-06-06 10:07:08.000000000 +0100
@@ -18,7 +18,7 @@
 # Copyright (c) 2003-2006 Pat Thoyts
 #
 #-------------------------------------------------------------------------
-# RCS: @(#)$Id: makefile.vc,v 1.11 2014/12/08 19:09:06 andreas_kupries Exp $
+# RCS: @(#)$Id: makefile.vc,v 1.14 2015/06/06 09:07:08 apnadkarni Exp $
 #-------------------------------------------------------------------------

 # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR)
@@ -164,7 +164,7 @@
 #PROJECT_REQUIRES_TK=1
 !include "rules.vc"

-DOTVERSION      = 1.6.4
+DOTVERSION      = 1.6.6
 VERSION         = $(DOTVERSION:.=)
 STUBPREFIX      = $(PROJECT)stub

@@ -192,13 +192,13 @@
 SSL_LIB_DIR     = $(OPENSSL)\lib
 !endif

-SSL_LIBS        =-libpath:"$(SSL_LIB_DIR)" ssleay32s.lib libeay32s.lib
+SSL_LIBS        =-libpath:"$(SSL_LIB_DIR)" ssleay32.lib libeay32.lib

 SSL_CFLAGS      =-DNO_IDEA=1 -DNO_RC5=1

-!if !exist("$(SSL_LIB_DIR)\ssleay32s.lib")
+!if !exist("$(SSL_LIB_DIR)\ssleay32.lib")
 MSG = ^
-Failed to locate "$(SSL_LIB_DIR)\ssleay32s.lib"
+Failed to locate "$(SSL_LIB_DIR)\ssleay32.lib"
 You must provide the path to your OpenSSL library....
 !error $(MSG)
 !endif

Discussion