Masato Taruishi
taru****@users*****
2005年 1月 24日 (月) 20:23:26 JST
===================================================================
RCS file: ultrapossum/module/server/db/dbdump,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- ultrapossum/module/server/db/dbdump 2004/09/30 07:00:43 1.1
+++ ultrapossum/module/server/db/dbdump 2005/01/24 11:23:26 1.1.2.1
@@ -13,13 +13,10 @@
progress "Configuring berkleydb environment for $soname... "
case "x$soname" in
- xlibdb-4.2.so)
- dump="db4.2_dump"
- archive="db4.2_archive"
- ;;
- xlibdb-4.1.so)
- dump="db4.1_dump"
- archive="db4.1_archive"
+ xlibdb-*.so)
+ ver=`echo $soname | sed 's/libdb-\(.*\).so/\1/'`
+ dump="db${ver}_dump"
+ archive="db${ver}_archive"
;;
x)
echo "E: can't recognize what version of berkley db is used" 1>&2
===================================================================
RCS file: ultrapossum/module/server/db/dbload,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- ultrapossum/module/server/db/dbload 2004/09/30 07:00:43 1.1
+++ ultrapossum/module/server/db/dbload 2005/01/24 11:23:26 1.1.2.1
@@ -20,11 +20,9 @@
progress "Configuring berkleydb environment for $soname... "
case "x$soname" in
- xlibdb-4.2.so)
- load="db4.2_load"
- ;;
- xlibdb-4.1.so)
- load="db4.1_load"
+ xlibdb-*.so)
+ ver=`echo $soname | sed 's/libdb-\(.*\).so/\1/'`
+ load="db${ver}_load"
;;
x)
echo "E: can't recognize what version of berkley db is used" 1>&2
@@ -35,7 +33,7 @@
exit 1
;;
esac
-progress "Configuring berkleydb environment for $soname... $load done"
+progress "Configuring berkleydb environment for $soname... done"
for f in `/bin/ls *.gz`
do
===================================================================
RCS file: ultrapossum/module/server/db/dbtransition,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- ultrapossum/module/server/db/dbtransition 2004/09/30 07:00:43 1.1
+++ ultrapossum/module/server/db/dbtransition 2005/01/24 11:23:26 1.1.2.1
@@ -6,10 +6,15 @@
tmpdir=/tmp/`basename $0`.$$
trap "/bin/rm -rf $tmpdir; `eval ultrapossum-config term`" 0
+soname=`getvalue $DIRECTORY/ultrapossum-environ SLAPD_BERKLEYDB_SONAME 2> /dev/null`
+if test "x$soname" = "x$SLAPD_BERKLEYDB_SONAME"; then
+ echo "No transition required: $SLAPD_BERKLEYDB_SONAME" 1>&2
+ exit 0
+fi
+
install -d $tmpdir
cd $tmpdir
$MODULEDIR/server/db/dbdump
$MODULEDIR/server/db/dbload
-