Fossil

Check-in [0c860dd9]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Update referenced OpenSSL version.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 0c860dd9e75e9e0bb5cf3af3c958a86c05652dac
User & Date: mistachkin 2016-01-28 19:48:30
Context
2016-01-28
20:18
Correct some TH1 command syntax comments. check-in: 2948c3fe user: mistachkin tags: trunk
19:48
Update referenced OpenSSL version. check-in: 0c860dd9 user: mistachkin tags: trunk
05:37
Minor style and comment cleanup. Add verify_all_options() to several TH1 test commands. Add 'test-th-source' test command, with test. check-in: f141fbea user: mistachkin tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/makemake.tcl.

   615    615   endif
   616    616   
   617    617   #### The directories where the OpenSSL include and library files are located.
   618    618   #    The recommended usage here is to use the Sysinternals junction tool
   619    619   #    to create a hard link between an "openssl-1.x" sub-directory of the
   620    620   #    Fossil source code directory and the target OpenSSL source directory.
   621    621   #
   622         -OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2e
          622  +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2f
   623    623   OPENSSLINCDIR = $(OPENSSLDIR)/include
   624    624   OPENSSLLIBDIR = $(OPENSSLDIR)
   625    625   
   626    626   #### Either the directory where the Tcl library is installed or the Tcl
   627    627   #    source code directory resides (depending on the value of the macro
   628    628   #    FOSSIL_TCL_SOURCE).  If this points to the Tcl install directory,
   629    629   #    this directory must have "include" and "lib" sub-directories.  If
................................................................................
  1404   1404   
  1405   1405   # Enable support for Windows XP with Visual Studio 201x?
  1406   1406   !ifndef FOSSIL_ENABLE_WINXP
  1407   1407   FOSSIL_ENABLE_WINXP = 0
  1408   1408   !endif
  1409   1409   
  1410   1410   !if $(FOSSIL_ENABLE_SSL)!=0
  1411         -SSLDIR    = $(B)\compat\openssl-1.0.2e
         1411  +SSLDIR    = $(B)\compat\openssl-1.0.2f
  1412   1412   SSLINCDIR = $(SSLDIR)\inc32
  1413   1413   !if $(FOSSIL_DYNAMIC_BUILD)!=0
  1414   1414   SSLLIBDIR = $(SSLDIR)\out32dll
  1415   1415   !else
  1416   1416   SSLLIBDIR = $(SSLDIR)\out32
  1417   1417   !endif
  1418   1418   SSLLFLAGS = /nologo /opt:ref /debug

Changes to win/Makefile.mingw.

   156    156   endif
   157    157   
   158    158   #### The directories where the OpenSSL include and library files are located.
   159    159   #    The recommended usage here is to use the Sysinternals junction tool
   160    160   #    to create a hard link between an "openssl-1.x" sub-directory of the
   161    161   #    Fossil source code directory and the target OpenSSL source directory.
   162    162   #
   163         -OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2e
          163  +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2f
   164    164   OPENSSLINCDIR = $(OPENSSLDIR)/include
   165    165   OPENSSLLIBDIR = $(OPENSSLDIR)
   166    166   
   167    167   #### Either the directory where the Tcl library is installed or the Tcl
   168    168   #    source code directory resides (depending on the value of the macro
   169    169   #    FOSSIL_TCL_SOURCE).  If this points to the Tcl install directory,
   170    170   #    this directory must have "include" and "lib" sub-directories.  If

Changes to win/Makefile.mingw.mistachkin.

   156    156   endif
   157    157   
   158    158   #### The directories where the OpenSSL include and library files are located.
   159    159   #    The recommended usage here is to use the Sysinternals junction tool
   160    160   #    to create a hard link between an "openssl-1.x" sub-directory of the
   161    161   #    Fossil source code directory and the target OpenSSL source directory.
   162    162   #
   163         -OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2e
          163  +OPENSSLDIR = $(SRCDIR)/../compat/openssl-1.0.2f
   164    164   OPENSSLINCDIR = $(OPENSSLDIR)/include
   165    165   OPENSSLLIBDIR = $(OPENSSLDIR)
   166    166   
   167    167   #### Either the directory where the Tcl library is installed or the Tcl
   168    168   #    source code directory resides (depending on the value of the macro
   169    169   #    FOSSIL_TCL_SOURCE).  If this points to the Tcl install directory,
   170    170   #    this directory must have "include" and "lib" sub-directories.  If

Changes to win/Makefile.msc.

    91     91   
    92     92   # Enable support for Windows XP with Visual Studio 201x?
    93     93   !ifndef FOSSIL_ENABLE_WINXP
    94     94   FOSSIL_ENABLE_WINXP = 0
    95     95   !endif
    96     96   
    97     97   !if $(FOSSIL_ENABLE_SSL)!=0
    98         -SSLDIR    = $(B)\compat\openssl-1.0.2e
           98  +SSLDIR    = $(B)\compat\openssl-1.0.2f
    99     99   SSLINCDIR = $(SSLDIR)\inc32
   100    100   !if $(FOSSIL_DYNAMIC_BUILD)!=0
   101    101   SSLLIBDIR = $(SSLDIR)\out32dll
   102    102   !else
   103    103   SSLLIBDIR = $(SSLDIR)\out32
   104    104   !endif
   105    105   SSLLFLAGS = /nologo /opt:ref /debug

Changes to www/build.wiki.

   133    133   file "<b>win\buildmsvc.bat</b>" may be used and it will attempt to
   134    134   detect and use the latest installed version of MSVC.<br><br>To enable
   135    135   the optional <a href="https://www.openssl.org/">OpenSSL</a> support,
   136    136   first <a href="https://www.openssl.org/source/">download the official
   137    137   source code for OpenSSL</a> and extract it to an appropriately named
   138    138   "<b>openssl-X.Y.ZA</b>" subdirectory within the local
   139    139   [/tree?ci=trunk&name=compat | compat] directory (e.g.
   140         -"<b>compat/openssl-1.0.2e</b>"), then make sure that some recent
          140  +"<b>compat/openssl-1.0.2f</b>"), then make sure that some recent
   141    141   <a href="http://www.perl.org/">Perl</a> binaries are installed locally,
   142    142   and finally run one of the following commands:
   143    143   <blockquote><pre>
   144    144   nmake /f Makefile.msc FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin
   145    145   </pre></blockquote>
   146    146   <blockquote><pre>
   147    147   buildmsvc.bat FOSSIL_ENABLE_SSL=1 FOSSIL_BUILD_SSL=1 PERLDIR=C:\full\path\to\Perl\bin