From 1b68d5eb0ccf36adc2ddc3545e89811c794dec49 Mon Sep 17 00:00:00 2001 From: Matthias Andree Date: Mon, 23 May 2016 20:18:24 +0000 Subject: Update to 6.2.23. Add TCL option. Cleanup. Changes submitted by gahr@: Enable a new TCL option, adding a pkgIndex.tcl file. Modernize Makefile. [1] Changes by mandree@: Fix installation of TCL API docs if TCL option is enabled. Update to new upstream release 6.2.23. Install the upgrade61.sh script if SQL option is enabled, with additional fixes distributed as a patch to avoid licensing concerns. Add an UPDATING entry. Add changes in Mk/Uses/bdb.mk. db5 parts of PR 208740 to be committed in a separate transaction later. PR: 208740 Submitted by: gahr@ --- databases/db6/files/patch-lang_sql_upgrade61.sh | 27 +++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 databases/db6/files/patch-lang_sql_upgrade61.sh (limited to 'databases/db6/files/patch-lang_sql_upgrade61.sh') diff --git a/databases/db6/files/patch-lang_sql_upgrade61.sh b/databases/db6/files/patch-lang_sql_upgrade61.sh new file mode 100644 index 000000000000..0867a8ba9332 --- /dev/null +++ b/databases/db6/files/patch-lang_sql_upgrade61.sh @@ -0,0 +1,27 @@ +--- ../lang/sql/upgrade61.sh 2016-03-28 21:45:53.000000000 +0200 ++++ ../../db6-upgrade61.sh 2016-05-23 21:55:49.741020000 +0200 +@@ -1,12 +1,19 @@ + #!/bin/sh + # This script upgrades SQL databases from BDB 5.0 to early 6.1 + # to late 6.1 and up by reindexing them. ++# ++# Originally provided by Oracle as part of the Oracle BerkeleyDB ++# 12.1.6.* tarballs. + # ++# Bugfixed for proper quoting and error checking ++# by Matthias Andree + +-for var in $@ ++rc=0 ++for var in "$@" + do +- echo Recovering database $var +- db_recover -f -h ${var}-journal +- echo Reindexing database $var +- echo .quit | dbsql -cmd REINDEX $var ++ echo "Recovering database $var" ++ db_recover-%%BDBVER%% -f -h "${var}-journal" || { rc=1 ; continue ; } ++ echo "Reindexing database $var" ++ echo .quit | dbsql-%%BDBVER%% -cmd REINDEX "$var" || rc=1 + done ++exit $rc -- cgit v1.2.3