r3251 - in trunk: BOOK/content/databases BOOK/kde/add patches

igor at linuxfromscratch.org igor at linuxfromscratch.org
Mon Jan 10 14:56:39 PST 2005


Author: igor
Date: 2005-01-10 15:56:39 -0700 (Mon, 10 Jan 2005)
New Revision: 3251

Added:
   trunk/patches/exim-4.43-db43-1.patch
Removed:
   trunk/BOOK/content/databases/db-3.3.xml
   trunk/patches/exim-4.43-db43.patch
Modified:
   trunk/BOOK/content/databases/databases.xml
   trunk/BOOK/kde/add/kdesdk.xml
Log:
Fixed kdesdk version entity.

Modified: trunk/BOOK/content/databases/databases.xml
===================================================================
--- trunk/BOOK/content/databases/databases.xml	2005-01-10 22:43:51 UTC (rev 3250)
+++ trunk/BOOK/content/databases/databases.xml	2005-01-10 22:56:39 UTC (rev 3251)
@@ -16,7 +16,6 @@
 <acronym>LFS</acronym> system is entirely possible.</para>
 
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="db.xml"/>   
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="db-3.3.xml"/>   
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mysql.xml"/>   
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="postgresql.xml"/>   
 

Deleted: trunk/BOOK/content/databases/db-3.3.xml
===================================================================
--- trunk/BOOK/content/databases/db-3.3.xml	2005-01-10 22:43:51 UTC (rev 3250)
+++ trunk/BOOK/content/databases/db-3.3.xml	2005-01-10 22:56:39 UTC (rev 3251)
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-   "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
-  <!ENTITY % general-entities SYSTEM "../../general.ent">
-  %general-entities;
-
-  <!ENTITY db-3.3-download-http "http://fresh.t-systems-sfr.com/unix/src/misc/db-&db-3.3-version;.tar.gz">
-  <!ENTITY db-3.3-download-ftp  "ftp://sleepycat1.inetu.net/releases/db-&db-3.3-version;.tar.gz">
-  <!ENTITY db-3.3-size          "2.3 MB">
-  <!ENTITY db-3.3-buildsize     "27.5 MB">
-  <!ENTITY db-3.3-time          "0.63 SBU">
-]>
-
-<sect1 id="db-3.3" xreflabel="Berkeley DB-&db-3.3-version;">
-<sect1info>
-<othername>$LastChangedBy$</othername>
-<date>$Date$</date>
-</sect1info>
-<?dbhtml filename="db-3.3.html"?>
-<title>Berkeley DB-&db-3.3-version;</title>
-
-<sect2>
-<title>Introduction to 
-<application>Berkeley DB</application>-&db-3.3-version;</title>
-
-<para>The <application>Berkeley DB</application> package contains version 
-&db-3.3-version; of the Berkeley Database.</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&db-3.3-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&db-3.3-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &db-3.3-size;</para></listitem>
-<listitem><para>Estimated disk space required:
-&db-3.3-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&db-3.3-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title>Additional downloads</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Required Patch: <ulink
-url="http://www.sleepycat.com/update/&db-3.3-version;/patch.&db-3.3-version;.1"/>
-</para></listitem>
-<listitem><para>Recommended Patch: <ulink
-url="http://www.sleepycat.com/update/&db-3.3-version;/patch.&db-3.3-version;.2"/>
-</para></listitem>
-</itemizedlist>
-</sect3>
-
-</sect2>
-
-<sect2>
-<title>Installation of <application>Berkeley DB</application></title>
-
-<para>Install <application>Berkeley DB</application> by running the following 
-commands:</para>
-
-<screen><userinput><command>patch -Np0 -i ../patch.&db-3.3-version;.1 &&
-patch -Np0 -i ../patch.&db-3.3-version;.2 &&
-cd build_unix &&
-../dist/configure --prefix=/opt/db-3.3 --enable-compat185 &&
-make LIBSO_LIBS="-lpthread" LIBXSO_LIBS="-lpthread" &&
-make docdir=/opt/db-3.3/doc/Berkeley-DB install &&
-cd /opt/db-3.3/lib/ &&
-mv libdb.so .. &&
-for i in $(ls); do mv $i /usr/lib; ln -sf /usr/lib/$i; done &&
-mv ../libdb.so . &&
-cd /opt/db-3.3/include/ &&
-sed -i 's/^DB185/DB/' db_185.h &&
-ln -nsf /opt/db-3.3/include /usr/include/db3 &&
-chmod 755 /usr/lib/libdb-3.3.so &&
-chown -R root:root /opt/db-3.3/{bin,include,doc}</command></userinput></screen>
-
-</sect2>
-
-<sect2>
-<title>Command explanations</title>
-
-<para><parameter>docdir=/opt/db-3.3/doc/Berkeley-DB</parameter>: Installs the 
-documentation in the <filename class="directory">/opt/db-3.3</filename> 
-hierarchy.</para>
-
-<para><command>mv libdb.so ..</command> and <command>mv ../libdb.so 
-.</command>: Avoids moving <filename>libdb.so</filename> to  
-<filename class="directory">/usr/lib</filename>.</para>
-
-<para><command>for i in ...; do ...; ln ...; done</command>: Moves the DB 
-libraries to <filename class="directory">/usr/lib</filename> and creates 
-symlinks to these libraries in 
-<filename class="directory">/opt/db-3.3/lib</filename>.</para>
-
-<para><command>sed -i 's/^DB185/DB/' db_185.h</command>: Change the DB185 
-database pointer to DB.</para>
-
-<para><command>chown -R root:root /opt/db-3.3/{bin,include,doc}</command>: 
-This command corrects the improper ownership of installed files.</para>
-
-</sect2>
-
-<sect2>
-<title>Contents</title>
-
-<para>The <application>Berkeley DB</application> package contains
-<command>db_archive</command>,
-<command>db_checkpoint</command>,
-<command>db_deadlock</command>,
-<command>db_dump</command>,
-<command>db_load</command>,
-<command>db_printlog</command>,
-<command>db_recover</command>,
-<command>db_stat</command>,
-<command>db_upgrade</command>,
-<command>db_verify</command> and the 
-<filename class="libraryfile">libdb-3</filename> libraries.
-
-</para>
-
-</sect2>
-
-<sect2><title>Description</title>
-
-<sect3><title>db_archive</title>
-<para><command>db_archive</command> prints the pathnames of log files that are 
-no longer in use.</para></sect3>
-
-<sect3><title>db_checkpoint</title>
-<para><command>db_checkpoint</command> is a daemon process used to monitor and 
-checkpoint database logs.</para></sect3>
-
-<sect3><title>db_deadlock</title>
-<para><command>db_deadlock</command> is used to abort lock requests when 
-deadlocks are detected.</para></sect3>
-
-<sect3><title>db_dump</title>
-<para><command>db_dump</command> converts database files to a flat file format 
-readable by <command>db_load</command>.</para></sect3>
-
-<sect3><title>db_load</title>
-<para><command>db_load</command> is used to create database files from flat 
-files created with <command>db_dump</command>.</para></sect3>
-
-<sect3><title>db_printlog</title>
-<para><command>db_printlog</command> converts database log files to human 
-readable text.</para></sect3>
-
-<sect3><title>db_recover</title>
-<para><command>db_recover</command> is used to restore a database to a 
-consistent state after a failure.</para></sect3>
-
-<sect3><title>db_stat</title>
-<para><command>db_stat</command> displays database environment statistics.
-</para></sect3>
-
-<sect3><title>db_upgrade</title>
-<para><command>db_upgrade</command> is used to upgrade database files to a 
-newer version of <application>Berkeley DB</application>.</para></sect3>
-
-<sect3><title>db_verify</title>
-<para><command>db_verify</command> is used to run consistency checks on 
-database files.</para></sect3>
-
-</sect2>
-
-</sect1>

Modified: trunk/BOOK/kde/add/kdesdk.xml
===================================================================
--- trunk/BOOK/kde/add/kdesdk.xml	2005-01-10 22:43:51 UTC (rev 3250)
+++ trunk/BOOK/kde/add/kdesdk.xml	2005-01-10 22:56:39 UTC (rev 3251)
@@ -40,7 +40,7 @@
 <sect3><title>Additional downloads</title>
 <itemizedlist spacing="compact">
 <listitem><para>Required patch for Berkeley DB: <ulink 
-url="&patch-root;/kdesdk-&kdesdk-version;-db43-1.patch"/></para>
+url="&patch-root;/kdesdk-&kde-version;-db43-1.patch"/></para>
 </listitem></itemizedlist>
 </sect3>
 
@@ -64,7 +64,7 @@
 <para>If you have Berkeley DB installed, apply
 the following patch:</para>
 
-<screen><userinput><command>patch -Np1 ../kdesdk-&kdesdk-version;-db43-1.patch</command></userinput></screen>
+<screen><userinput><command>patch -Np1 ../kdesdk-&kde-version;-db43-1.patch</command></userinput></screen>
 
 <para>Install <application>kdesdk</application> with:</para>
 

Copied: trunk/patches/exim-4.43-db43-1.patch (from rev 3249, trunk/patches/exim-4.43-db43.patch)

Deleted: trunk/patches/exim-4.43-db43.patch
===================================================================
--- trunk/patches/exim-4.43-db43.patch	2005-01-10 22:43:51 UTC (rev 3250)
+++ trunk/patches/exim-4.43-db43.patch	2005-01-10 22:56:39 UTC (rev 3251)
@@ -1,54 +0,0 @@
-Submitted By:            Igor Zivkovic <igor at linuxfromscratch.org>
-Date:                    2005-01-10
-Initial Package Version: 4.43
-Upstream Status:         Not submitted.
-Origin:                  http://www.sleepycat.com/docs/ref/upgrade.4.3/toc.html
-Description:             Adds support for Berkeley DB-4.3.x.
-
-$LastChangedBy$
-$Date$
-
---- exim-4.43/src/exim_dbmbuild.c.orig	2005-01-10 15:16:40.841577000 +0000
-+++ exim-4.43/src/exim_dbmbuild.c	2005-01-10 15:16:56.367216744 +0000
-@@ -60,7 +60,7 @@
- 
- #if defined(USE_DB) && defined(DB_VERSION_STRING)
- void
--dbfn_bdb_error_callback(const char *pfx, char *msg)
-+dbfn_bdb_error_callback(const DB_ENV *dbenv, const char *pfx, const char *msg)
- {
- pfx = pfx;
- printf("Berkeley DB error: %s\n", msg);
---- exim-4.43/src/exim_dbutil.c.orig	2005-01-10 15:16:49.594246392 +0000
-+++ exim-4.43/src/exim_dbutil.c	2005-01-10 15:16:56.368216592 +0000
-@@ -79,7 +79,7 @@
- 
- #if defined(USE_DB) && defined(DB_VERSION_STRING)
- void
--dbfn_bdb_error_callback(const char *pfx, char *msg)
-+dbfn_bdb_error_callback(const DB_ENV *dbenv, const char *pfx, const char *msg)
- {
- pfx = pfx;
- printf("Berkeley DB error: %s\n", msg);
---- exim-4.43/src/dbfn.c.orig	2005-01-10 15:17:10.322095280 +0000
-+++ exim-4.43/src/dbfn.c	2005-01-10 15:17:14.602444568 +0000
-@@ -42,7 +42,7 @@
- 
- #if defined(USE_DB) && defined(DB_VERSION_STRING)
- void
--dbfn_bdb_error_callback(const char *pfx, char *msg)
-+dbfn_bdb_error_callback(const DB_ENV *dbenv, const char *pfx, const char *msg)
- {
- pfx = pfx;
- log_write(0, LOG_MAIN, "Berkeley DB error: %s", msg);
---- exim-4.43/src/dbfunctions.h.orig	2005-01-10 15:17:21.159447752 +0000
-+++ exim-4.43/src/dbfunctions.h	2005-01-10 15:17:25.472792024 +0000
-@@ -22,7 +22,7 @@
- /* Berkeley DB uses a callback function to pass back error details. */
- 
- #if defined(USE_DB) && defined(DB_VERSION_STRING)
--void     dbfn_bdb_error_callback(const char *, char *);
-+void     dbfn_bdb_error_callback(const DB_ENV *, const char *, const char *);
- #endif
- 
- /* End of dbfunctions.h */




More information about the blfs-book mailing list