Fossil

Changes On Branch openssl-version
Login
Patch Unified Diff

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

Changes In Branch openssl-version Excluding Merge-Ins

This is equivalent to a diff from f5cb12df5a to 97400cab66

2025-02-20
14:48
For --with-openssl=PATH, the libraries should be found in the PATH directory, not in the PATH/lib subdirectory. ... (check-in: 304503ed24 user: drh tags: trunk)
14:46
Bring the merge-info-html branch up to date with trunk, step 2 of 2. ... (check-in: c2b1c2c9fa user: stephan tags: merge-info-html)
14:29
Fix the OpenSSL version number display. On second through, maybe this isn't a good fix... ... (Closed-Leaf check-in: 97400cab66 user: drh tags: openssl-version)
13:36
Enhance the "fossil merge-info --tk" application with a new menu that will bring up detailed two-way diffs between source components. This involves various diff subsystem upgrades, including: (1) Add the "fdiff" command. (Not actually needed here, but useful.) (2) Add --label options on diff commands. (3) Add --tkdebug on diff commands for debugging. (4) Improvements to column titles in two-way diffs. ... (check-in: f5cb12df5a user: drh tags: trunk)
13:29
Omit the tearoff from the 2-way diff menu on the merge-info app. ... (Closed-Leaf check-in: f9648f8946 user: drh tags: merge-info)
2025-02-19
17:10
Add the --debug option to "fossil merge-info --tk". Document that and the --script option. ... (check-in: 97aee327ef user: drh tags: trunk)

Changes to src/main.c.
︙︙
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219

  if( eVerbose<=0 ) return;

  blob_appendf(pOut, "Compiled on %s %s using %s (%d-bit)\n",
               __DATE__, __TIME__, COMPILER_NAME, sizeof(void*)*8);
  blob_appendf(pOut, "SQLite %s %.30s\n", sqlite3_libversion(),
               sqlite3_sourceid());
#if defined(FOSSIL_ENABLE_SSL)
  blob_appendf(pOut, "SSL (%s)\n", SSLeay_version(SSLEAY_VERSION));
#endif
  blob_appendf(pOut, "zlib %s, loaded %s\n", ZLIB_VERSION, zlibVersion());
#if defined(FOSSIL_HAVE_FUSEFS)
  blob_appendf(pOut, "libfuse %s, loaded %s\n", fusefs_inc_version(),
               fusefs_lib_version());
#endif
#if defined(FOSSIL_ENABLE_TCL)








|








1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219

  if( eVerbose<=0 ) return;

  blob_appendf(pOut, "Compiled on %s %s using %s (%d-bit)\n",
               __DATE__, __TIME__, COMPILER_NAME, sizeof(void*)*8);
  blob_appendf(pOut, "SQLite %s %.30s\n", sqlite3_libversion(),
               sqlite3_sourceid());
#if defined(FOSSIL_ENABLE_SSL)
  blob_appendf(pOut, "SSL (%s)\n", OPENSSL_VERSION_TEXT);
#endif
  blob_appendf(pOut, "zlib %s, loaded %s\n", ZLIB_VERSION, zlibVersion());
#if defined(FOSSIL_HAVE_FUSEFS)
  blob_appendf(pOut, "libfuse %s, loaded %s\n", fusefs_inc_version(),
               fusefs_lib_version());
#endif
#if defined(FOSSIL_ENABLE_TCL)
︙︙