From 2a038b2b94c0435aedcf82cb7eb7580c344bd399 Mon Sep 17 00:00:00 2001 From: Randy McMurchy Date: Sat, 7 Jan 2006 18:17:08 +0000 Subject: [PATCH] Updated to Berkeley DB-4.4.16, added a patch to the Python instructions to support the new BDB, updated the Heimdal instructions to account for the changed library file names git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@5535 af4574ff-66df-0310-9fd7-8a98e5e911e0 --- general.ent | 2 +- general/prog/python.xml | 21 ++++--- introduction/welcome/changelog.xml | 5 ++ postlfs/security/heimdal.xml | 6 +- server/databases/db.xml | 97 ++++++++++++++++-------------- 5 files changed, 75 insertions(+), 56 deletions(-) diff --git a/general.ent b/general.ent index bb7503f932..1a695ca690 100644 --- a/general.ent +++ b/general.ent @@ -304,7 +304,7 @@ - + diff --git a/general/prog/python.xml b/general/prog/python.xml index d589397e01..c58f827248 100644 --- a/general/prog/python.xml +++ b/general/prog/python.xml @@ -5,11 +5,11 @@ %general-entities; - - - - - + + + + + ]> @@ -66,15 +66,19 @@ Required patch: + + Required patch: + Python Dependencies Optional , - , - and - + , and + + @@ -85,6 +89,7 @@ commands: patch -Np1 -i ../Python-&Python-version;-gdbm-1.patch && +patch -Np1 -i ../Python-&Python-version;-db44-1.patch && ./configure --prefix=/usr --enable-shared && make diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index deec6b1519..8e5c50f036 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -44,6 +44,11 @@ January 7th, 2006 + + [randy] - Updated to Berkeley DB-4.4.16, added a patch to the + Python instructions to support the new BDB, updated the Heimdal + instructions to account for the changed library file names. + [randy] - Updated to GIMP-2.2.10. diff --git a/postlfs/security/heimdal.xml b/postlfs/security/heimdal.xml index 439c8dd192..298701df39 100644 --- a/postlfs/security/heimdal.xml +++ b/postlfs/security/heimdal.xml @@ -188,9 +188,9 @@ mv -v /bin/su /bin/su.shadow && mv -v /usr/bin/{login,su} /bin && ln -v -sf ../../bin/login /usr/bin && mv -v /usr/lib/lib{otp,kafs,krb5,asn1,roken,crypto}.so.* \ - /usr/lib/libdb-4.3.so /lib && -ln -v -sf ../../lib/libdb-4.3.so /usr/lib/libdb.so && -ln -v -sf ../../lib/libdb-4.3.so /usr/lib/libdb-4.so && + /usr/lib/libdb-4.4.so /lib && +ln -v -sf ../../lib/libdb-4.4.so /usr/lib/libdb.so && +ln -v -sf ../../lib/libdb-4.4.so /usr/lib/libdb-4.so && for SYMLINK in otp.so.0.1.3 kafs.so.0.4.1 krb5.so.17.4.0 \ asn1.so.6.1.0 roken.so.16.1.0 crypto.so.0.9.7 do diff --git a/server/databases/db.xml b/server/databases/db.xml index 972a89c5ab..a9b81d5894 100644 --- a/server/databases/db.xml +++ b/server/databases/db.xml @@ -6,10 +6,10 @@ - - - - + + + + ]> @@ -35,7 +35,10 @@ The Berkeley DB package contains programs and utilities used by many other applications for database related - functions. + functions. This package is also installed during LFS and may already exist + on your system. It is listed here in BLFS as well because you may need to + reinstall it if you need the additional language bindings or the RPC + server. Package Information @@ -62,7 +65,8 @@ Berkeley DB Dependencies Optional - , and + , + , and sharutils (for the uudecode command) @@ -71,40 +75,41 @@ Testing Berkeley DB - It is recommended you skip ahead to Installation. The test-suite - takes more than 80 SBU and has a few bugs causing reports of 'Regression - Tests Failed'. You must have Tcl to test - Berkeley DB. + You may want to skip ahead to . The + test suite can take up to 150 SBUs and has a few bugs causing a report of + Regression tests failed. However, running the test suite is + a very exhaustive test of your hardware, perhaps pushing your machine + harder (especially disk I/O) than it will ever see during production use. + Note that you must have Tcl installed to run the + test suite. Build for the Berkeley DB test by running the following commands: cd build_unix && -../dist/configure --prefix=/usr \ - --enable-test --enable-tcl --with-tcl=/usr/lib && -make LIBSO_LIBS="-lpthread" LIBXSO_LIBS="-lpthread" && -chmod 644 ../test/sijointest.tcl && -sed -i 's:puts "[s,S].*::' \ - ../test/sijointest.tcl +../dist/configure --prefix=/usr --enable-test \ + --enable-tcl --with-tcl=/usr/lib && +make To test the results, start tclsh: tclsh - From the tclsh prompt (%), run: + From the tclsh prompt (%), + run: -source ../test/test.tcl -run_parallel 4 run_std -exit +%source ../test/test.tcl +%run_parallel 5 run_std +%exit - Clean up with the following command: + Clean up the source tree with the following command: make realclean && cd .. - + Installation of Berkeley DB Install Berkeley DB by running the @@ -112,16 +117,16 @@ cd .. cd build_unix && ../dist/configure --prefix=/usr \ - --enable-compat185 \ - --enable-cxx && -make LIBSO_LIBS="-lpthread" LIBXSO_LIBS="-lpthread" + --enable-compat185 \ + --enable-cxx && +make Now, as the root user: make docdir=/usr/share/doc/db-&db-version; install && -chown root:root /usr/bin/db_* \ - /usr/lib/libdb* /usr/include/db* && -chown -R root:root /usr/share/doc/db-&db-version; +chown -v root:root /usr/bin/db_* /usr/lib/libdb* /usr/include/db* && +chown -v root:root /usr/bin/berkeley_db_svc && +chown -v -R root:root /usr/share/doc/db-&db-version; @@ -135,7 +140,7 @@ chown -R root:root /usr/share/doc/db-&db-version; build directories for different platforms. --enable-compat185: This switch enables - building DB 1.85 compatibility API. + building the DB-1.85 compatibility API. --enable-cxx: This switch enables building C++ API libraries. @@ -151,35 +156,34 @@ chown -R root:root /usr/share/doc/db-&db-version; --enable-rpc: Enables building the Berkeley DB RPC server. - make LIBSO_LIBS="-lpthread" - LIBXSO_LIBS="-lpthread": configure - does not correctly handle NPTL. These variables force it to - properly link against NPTL. - make docdir=/usr/share/doc/db-&db-version; install: This installs the documentation in - the correct place. + the correct location instead of + /usr/docs. - sed -i 's:puts "[s,S].*::' ../test/sijointest.tcl: - This prevents logging two notes that are not recognized by - run_std. + chown -v root:root /usr/bin/berkeley_db_svc: + This command changes the ownership of the RPC server program. It is only + required if you passed --enable-rpc to the + configure script. Contents + Only the program and libraries not installed in LFS are listed here, + the others can be found at as they were initially + installed during the building of LFS. + - Installed Programs + Installed Program Installed Libraries Installed Directory - db_archive, db_checkpoint, db_deadlock, db_dump, db_load, - db_printlog, db_recover, db_stat, db_upgrade, db_verify and - berkeley_db_svc if enabled - libdb.[so,a], libdb_cxx.[so,a], libdb_java.[so,a] and - libdb_tcl.[so,a] + berkeley_db_svc + libdb_java.[so,a] and libdb_tcl.[so,a] /usr/share/doc/db-&db-version; @@ -200,6 +204,9 @@ chown -R root:root /usr/share/doc/db-&db-version; + +