Author: igor
Date: Mon Nov 11 09:10:53 2013
New Revision: 12182
Log:
added mariadb
Added:
trunk/BOOK/server/databases/mariadb.xml (contents, props changed)
Modified:
trunk/BOOK/general.ent
trunk/BOOK/general/genlib/apr-util.xml
trunk/BOOK/general/prog/php.xml
trunk/BOOK/general/sysutils/redland.xml
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/kde/core/akonadi.xml
trunk/BOOK/multimedia/audioutils/amarok.xml
trunk/BOOK/postlfs/security/cyrus-sasl.xml
trunk/BOOK/server/databases/databases.xml
trunk/BOOK/server/mail/dovecot.xml
trunk/BOOK/server/mail/exim.xml
trunk/BOOK/server/mail/postfix.xml
trunk/BOOK/server/major/bind.xml
trunk/BOOK/server/other/openldap.xml
trunk/BOOK/x/lib/qt4.xml
trunk/BOOK/x/lib/qt5.xml
trunk/BOOK/xsoft/office/libreoffice.xml
Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent Mon Nov 11 02:14:59 2013 (r12181)
+++ trunk/BOOK/general.ent Mon Nov 11 09:10:53 2013 (r12182)
@@ -496,6 +496,7 @@
<!-- Chapter 22 -->
<!ENTITY db-version "6.0.20">
+<!ENTITY mariadb-version "10.0.5">
<!ENTITY mysql-version "5.6.14">
<!ENTITY postgresql-version "9.3.1">
<!ENTITY sqlite-version "3.8.1">
Modified: trunk/BOOK/general/genlib/apr-util.xml
==============================================================================
--- trunk/BOOK/general/genlib/apr-util.xml Mon Nov 11 02:14:59 2013
(r12181)
+++ trunk/BOOK/general/genlib/apr-util.xml Mon Nov 11 09:10:53 2013
(r12182)
@@ -90,7 +90,7 @@
<xref linkend="db"/>,
<xref linkend="expat"/>,
<ulink url="http://www.freetds.org/";>FreeTDS</ulink>,
- <xref linkend="mysql"/>,
+ <xref linkend="mariadb"/> or <xref linkend="mysql"/>,
<xref linkend="openldap"/>,
<xref linkend="postgresql"/>,
<xref linkend="sqlite"/> and
Modified: trunk/BOOK/general/prog/php.xml
==============================================================================
--- trunk/BOOK/general/prog/php.xml Mon Nov 11 02:14:59 2013 (r12181)
+++ trunk/BOOK/general/prog/php.xml Mon Nov 11 09:10:53 2013 (r12182)
@@ -115,7 +115,7 @@
<para role="optional"><xref linkend="openldap"/>,
<!-- <xref linkend="gdbm"/>, -->
<xref linkend="db"/>,
- <xref linkend="mysql"/>,
+ <xref linkend="mariadb"/> or <xref linkend="mysql"/>,
<xref linkend="postgresql"/>,
<xref linkend="unixodbc"/>,
<xref linkend="sqlite"/>,
Modified: trunk/BOOK/general/sysutils/redland.xml
==============================================================================
--- trunk/BOOK/general/sysutils/redland.xml Mon Nov 11 02:14:59 2013
(r12181)
+++ trunk/BOOK/general/sysutils/redland.xml Mon Nov 11 09:10:53 2013
(r12182)
@@ -70,7 +70,7 @@
<xref linkend="db"/>,
<xref linkend="libiodbc"/>,
<xref linkend="sqlite"/>,
- <xref linkend="mysql"/>,
+ <xref linkend="mariadb"/> or <xref linkend="mysql"/>,
<xref linkend="postgresql"/>,
<xref linkend="virtuoso"/> and
<ulink url="http://sourceforge.net/projects/threestore/";>3store</ulink>
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Mon Nov 11 02:14:59
2013 (r12181)
+++ trunk/BOOK/introduction/welcome/changelog.xml Mon Nov 11 09:10:53
2013 (r12182)
@@ -44,6 +44,16 @@
-->
<listitem>
+ <para>November 11th, 2013</para>
+ <itemizedlist>
+ <listitem>
+ <para>[igor] - Added mariadb-10.0.5. Fixes
+ <ulink url="&blfs-ticket-root;4262">#4262</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>November 10th, 2013</para>
<itemizedlist>
<listitem>
Modified: trunk/BOOK/kde/core/akonadi.xml
==============================================================================
--- trunk/BOOK/kde/core/akonadi.xml Mon Nov 11 02:14:59 2013 (r12181)
+++ trunk/BOOK/kde/core/akonadi.xml Mon Nov 11 09:10:53 2013 (r12182)
@@ -66,7 +66,7 @@
<xref linkend="boost"/>,
<xref linkend="soprano"/>, and one of:
<xref linkend="sqlite"/>,
- <xref linkend="mysql"/>, or
+ <xref linkend="mariadb"/>, <xref linkend="mysql"/>, or
<xref linkend="postgresql"/>
</para>
Modified: trunk/BOOK/multimedia/audioutils/amarok.xml
==============================================================================
--- trunk/BOOK/multimedia/audioutils/amarok.xml Mon Nov 11 02:14:59 2013
(r12181)
+++ trunk/BOOK/multimedia/audioutils/amarok.xml Mon Nov 11 09:10:53 2013
(r12182)
@@ -77,7 +77,7 @@
<bridgehead renderas="sect4">Required</bridgehead>
<para role="required">
<xref linkend="kdelibs"/>,
- <xref linkend="mysql"/>, and
+ <xref linkend="mariadb"/> or <xref linkend="mysql"/>, and
<xref linkend="taglib"/>
</para>
Modified: trunk/BOOK/postlfs/security/cyrus-sasl.xml
==============================================================================
--- trunk/BOOK/postlfs/security/cyrus-sasl.xml Mon Nov 11 02:14:59 2013
(r12181)
+++ trunk/BOOK/postlfs/security/cyrus-sasl.xml Mon Nov 11 09:10:53 2013
(r12182)
@@ -101,7 +101,7 @@
<para role="optional">
<xref linkend="linux-pam"/>,
<xref linkend="mitkrb"/>,
- <xref linkend="mysql"/>,
+ <xref linkend="mariadb"/> or <xref linkend="mysql"/>,
<xref linkend="openjdk"/>,
<xref linkend="openldap"/>,
<xref linkend="postgresql"/>,
Modified: trunk/BOOK/server/databases/databases.xml
==============================================================================
--- trunk/BOOK/server/databases/databases.xml Mon Nov 11 02:14:59 2013
(r12181)
+++ trunk/BOOK/server/databases/databases.xml Mon Nov 11 09:10:53 2013
(r12182)
@@ -22,6 +22,7 @@
entirely possible.</para>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="db.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="mariadb.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="mysql.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="postgresql.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="sqlite.xml"/>
Added: trunk/BOOK/server/databases/mariadb.xml
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ trunk/BOOK/server/databases/mariadb.xml Mon Nov 11 09:10:53 2013
(r12182)
@@ -0,0 +1,408 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [
+ <!ENTITY % general-entities SYSTEM "../../general.ent">
+ %general-entities;
+
+ <!ENTITY mariadb-download-http
"http://tweedo.com/mirror/mariadb/mariadb-&mariadb-version;/kvm-tarbake-jaunty-x86/mariadb-&mariadb-version;.tar.gz";>
+ <!ENTITY mariadb-download-ftp
"ftp://mirrors.fe.up.pt/pub/mariadb/mariadb-&mariadb-version;/kvm-tarbake-jaunty-x86/mariadb-&mariadb-version;.tar.gz";>
+ <!ENTITY mariadb-md5sum "299fd67d5f193ac30a30a60b579d8bec">
+ <!ENTITY mariadb-size "48 MB">
+ <!ENTITY mariadb-buildsize "1.5 GB">
+ <!ENTITY mariadb-time "6.8 SBU">
+]>
+
+<sect1 id="mariadb" xreflabel="MariaDB-&mariadb-version;">
+ <?dbhtml filename="mariadb.html"?>
+
+ <sect1info>
+ <othername>$LastChangedBy$</othername>
+ <date>$Date$</date>
+ </sect1info>
+
+ <title>MariaDB-&mariadb-version;</title>
+
+ <indexterm zone="mariadb">
+ <primary sortas="a-MariaDB">MariaDB</primary>
+ </indexterm>
+
+ <sect2 role="package">
+ <title>Introduction to MariaDB</title>
+
+ <para>
+ <application>MariaDB</application> is a community-developed fork and a
+ drop-in replacement for the <application>MySQL</application> relational
+ database management system.
+ </para>
+
+ &lfs74_checked;
+
+ <bridgehead renderas="sect3">Package Information</bridgehead>
+ <itemizedlist spacing="compact">
+ <listitem>
+ <para>
+ Download (HTTP): <ulink url="&mariadb-download-http;"/>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Download (FTP): <ulink url="&mariadb-download-ftp;"/>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Download MD5 sum: &mariadb-md5sum;
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Download size: &mariadb-size;
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Estimated disk space required: &mariadb-buildsize;
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Estimated build time: &mariadb-time;
+ </para>
+ </listitem>
+ </itemizedlist>
+
+ <bridgehead renderas="sect3">MariaDB Dependencies</bridgehead>
+
+ <bridgehead renderas="sect4">Required</bridgehead>
+ <para role="required">
+ <xref linkend="cmake"/> and
+ <xref linkend="openssl"/>
+ </para>
+
+ <bridgehead renderas="sect4">Recommended</bridgehead>
+ <para role="recommended">
+ <xref linkend="libevent"/>
+ </para>
+
+ <bridgehead renderas="sect4">Optional</bridgehead>
+ <para role="optional">
+ <ulink url="http://packages.debian.org/source/sid/libaio";>libaio</ulink>
and
+ <xref linkend="libedit"/>
+ </para>
+
+ <para condition="html" role="usernotes">User Notes:
+ <ulink url="&blfs-wiki;/mariadb"/>
+ </para>
+
+ </sect2>
+
+ <sect2 role="installation">
+ <title>Installation of MariaDB</title>
+
+ <para>
+ For security reasons, running the server as an unprivileged user
+ and group is strongly encouraged. Issue the following (as
+ <systemitem class="username">root</systemitem>) to create the
+ user and group:
+ </para>
+
+<screen role="root"><userinput>groupadd -g 40 mysql &&
+useradd -c "MySQL Server" -d /srv/mysql -g mysql -s /bin/false -u 40
mysql</userinput></screen>
+
+ <para>
+ Install <application>MariaDB</application> by running the
+ following commands:
+ </para>
+
+<screen><userinput>sed -i "s@data/test@\${INSTALL_MYSQLTESTDIR}@g"
sql/CMakeLists.txt &&
+sed -i "s/srv_buf_size/srv_sort_buf_size/" storage/innobase/row/row0log.cc
&&
+mkdir build &&
+cd build &&
+cmake -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DINSTALL_DOCDIR=share/doc/mysql \
+ -DINSTALL_DOCREADMEDIR=share/doc/mysql \
+ -DINSTALL_MANDIR=share/man \
+ -DINSTALL_MYSQLSHAREDIR=share/mysql \
+ -DINSTALL_MYSQLTESTDIR=share/mysql/test \
+ -DINSTALL_PLUGINDIR=lib/mysql \
+ -DINSTALL_SBINDIR=sbin \
+ -DINSTALL_SCRIPTDIR=bin \
+ -DINSTALL_SQLBENCHDIR=share/mysql \
+ -DINSTALL_SUPPORTFILESDIR=share/mysql \
+ -DMYSQL_DATADIR=/srv/mysql \
+ -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \
+ -DWITH_EXTRA_CHARSETS=complex \
+ -DWITH_LIBEVENT=system
+ .. &&
+make</userinput></screen>
+
+ <para>
+ To test the results, issue: <command>make test</command>.
+ </para>
+
+ <para>
+ Now, as the <systemitem class="username">root</systemitem> user:
+ </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+ </sect2>
+
+ <sect2 role="commands">
+ <title>Command Explanations</title>
+
+ <para>
+ <command>sed -i ...</command>: First sed sets correct installation
+ directory for some components. Second sed fixes a bug in the code.
+ </para>
+
+ <para>
+ <parameter>-DWITH_EXTRA_CHARSETS=complex</parameter>: This switch enables
+ support for the complex character sets.
+ </para>
+
+ <para>
+ <parameter>-DWITH_LIBEVENT=system</parameter>: This switch is used to
+ tell the build system to use installed
<application>libevent</application>.
+ Remove it if you didn't install <application>libevent</application>.
+ </para>
+
+ <para>
+ <option>-DWITHOUT_SERVER=ON -DWITH_UNIT_TESTS=OFF</option>: Use these
+ switches if you don't want the server and would like to build the client
+ only.
+ </para>
+
+ <para>
+ <option>-DWITH_EMBEDDED_SERVER=ON</option>: This switch enables compiling
+ the embedded server library needed by certain applications, such as
+ <application>Amarok</application>.
+ </para>
+
+ <note><para>
+ There are numerous options available to <command>cmake</command>. Check
+ the output of the <command>cmake . -LH</command> for additional
+ customization options.
+ </para></note>
+
+
+ </sect2>
+
+ <sect2 role="configuration">
+ <title>Configuring MySQL</title>
+
+ <sect3 id="mariadb-config">
+ <title>Config Files</title>
+
+ <para>
+ <filename>/etc/mysql/my.cnf</filename> and
+ <filename>~/.my.cnf</filename>
+ </para>
+
+ <indexterm zone="mariadb mariadb-config">
+ <primary sortas="e-AA.my.cnf">~/.my.cnf</primary>
+ </indexterm>
+
+ <indexterm zone="mariadb mariadb-config">
+ <primary sortas="e-etc-mysql-my.cnf">/etc/mysql/my.cnf</primary>
+ </indexterm>
+
+ </sect3>
+
+ <sect3>
+ <title>Configuration Information</title>
+
+ <para>
+ Create basic <filename>/etc/mysql/my.cnf</filename>
+ using the following command as the <systemitem
+ class="username">root</systemitem> user:
+ </para>
+
+<screen role="root"><userinput>install -v -dm 755 /etc/mysql &&
+cat > /etc/mysql/my.cnf << "EOF"
+<literal># Begin /etc/mysql/my.cnf
+
+# The following options will be passed to all MySQL clients
+[client]
+#password = your_password
+port = 3306
+socket = /run/mysqld/mysqld.sock
+
+# The MySQL server
+[mysqld]
+port = 3306
+socket = /run/mysqld/mysqld.sock
+datadir = /srv/mysql
+skip-external-locking
+key_buffer_size = 16M
+max_allowed_packet = 1M
+sort_buffer_size = 512K
+net_buffer_length = 16K
+myisam_sort_buffer_size = 8M
+
+# Don't listen on a TCP/IP port at all.
+skip-networking
+
+# required unique id between 1 and 2^32 - 1
+server-id = 1
+
+# Uncomment the following if you are using BDB tables
+#bdb_cache_size = 4M
+#bdb_max_lock = 10000
+
+# Uncomment the following if you are using InnoDB tables
+#innodb_data_home_dir = /srv/mysql
+#innodb_data_file_path = ibdata1:10M:autoextend
+#innodb_log_group_home_dir = /srv/mysql
+# You can set .._buffer_pool_size up to 50 - 80 %
+# of RAM but beware of setting memory usage too high
+#innodb_buffer_pool_size = 16M
+#innodb_additional_mem_pool_size = 2M
+# Set .._log_file_size to 25 % of buffer pool size
+#innodb_log_file_size = 5M
+#innodb_log_buffer_size = 8M
+#innodb_flush_log_at_trx_commit = 1
+#innodb_lock_wait_timeout = 50
+
+[mysqldump]
+quick
+max_allowed_packet = 16M
+
+[mysql]
+no-auto-rehash
+# Remove the next comment character if you are not familiar with SQL
+#safe-updates
+
+[isamchk]
+key_buffer = 20M
+sort_buffer_size = 20M
+read_buffer = 2M
+write_buffer = 2M
+
+[myisamchk]
+key_buffer_size = 20M
+sort_buffer_size = 20M
+read_buffer = 2M
+write_buffer = 2M
+
+[mysqlhotcopy]
+interactive-timeout
+
+# End /etc/mysql/my.cnf</literal>
+EOF</userinput></screen>
+
+ <para>
+ You can now install a database and change the ownership to the
+ unprivileged user and group (perform as the <systemitem
+ class="username">root</systemitem> user):
+ </para>
+
+<screen role="root"><userinput>mysql_install_db --basedir=/usr
--datadir=/srv/mysql --user=mysql &&
+chown -R mysql:mysql /srv/mysql</userinput></screen>
+
+ <para>
+ Further configuration requires that the
+ <application>MariaDB</application> server is running. Start
+ the server using the following commands as the <systemitem
+ class="username">root</systemitem> user:
+ </para>
+
+<screen role="root"><userinput>install -v -m755 -o mysql -g mysql -d
/var/run/mysqld &&
+mysqld_safe --user=mysql 2>&1 >/dev/null &</userinput></screen>
+
+ <para>
+ A default installation does not set up a password for the
+ administrator, so use the following command as the <systemitem
+ class="username">root</systemitem> user to set one. Replace
+ <replaceable><new-password></replaceable> with your own.
+ </para>
+
+<screen role="root"><userinput>mysqladmin -u root password
<replaceable><new-password></replaceable></userinput></screen>
+
+ <para>
+ Configuration of the server is now finished. Shut the server
+ down using the following command as the <systemitem
+ class="username">root</systemitem> user:
+ </para>
+
+<screen role="root"><userinput>mysqladmin -p shutdown</userinput></screen>
+
+ </sect3>
+
+ <sect3 id="mariadb-init">
+ <title>Boot Script</title>
+
+ <para>
+ Install the <filename>/etc/rc.d/init.d/mysql</filename> init script
+ included in the <xref linkend="bootscripts"/> package as
+ the <systemitem class="username">root</systemitem> user to start the
+ <application>MariaDB</application> server during system boot-up.
+ </para>
+
+ <indexterm zone="mariadb mariadb-init">
+ <primary sortas="f-mysql">mysql</primary>
+ </indexterm>
+
+<screen role="root"><userinput>make install-mysql</userinput></screen>
+
+ </sect3>
+
+ </sect2>
+
+ <sect2 role="content">
+ <title>Contents</title>
+
+ <segmentedlist>
+ <segtitle>Installed Programs</segtitle>
+ <segtitle>Installed Libraries</segtitle>
+ <segtitle>Installed Directories</segtitle>
+
+ <seglistitem>
+ <seg>
+ aria_chk, aria_dump_log, aria_ftdump, aria_pack, aria_read_log,
+ innochecksum, msql2mysql, myisamchk, myisam_ftdump, myisamlog,
+ myisampack, my_print_defaults, mysql, mysqlaccess,
+ mysqladmin, mysqlbinlog, mysqlbug, mysqlcheck, mysql_client_test,
+ mysql_client_test_embedded, mysql_config,
+ mysql_convert_table_format, mysqld, mysqld_multi, mysqld_safe,
mysqldump,
+ mysqldumpslow, mysql_embedded, mysql_find_rows, mysql_fix_extensions,
+ mysqlhotcopy, mysqlimport, mysql_install_db, mysql_plugin,
+ mysql_secure_installation, mysql_setpermission, mysqlshow, mysqlslap,
+ mysqltest, mysqltest_embedded, mysql_tzinfo_to_sql, mysql_upgrade,
+ mysql_waitpid, mysql_zap, mytop, perror, replace, resolveip,
+ resolve_stack_dump, and tokuftdump
+ </seg>
+ <seg>
+ libmysqlclient.{so,a}, libmysqlclient_r.{so,a}, libmysqld.{so,a}, and
+ libmysqlservices.a
+ </seg>
+ <seg>
+ /etc/mysql,
+ /srv/mysql,
+ /usr/include/mysql,
+ /usr/lib/mysql,
+ /usr/share/doc/mysql, and
+ /usr/share/mysql
+ </seg>
+ </seglistitem>
+ </segmentedlist>
+
+ <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+
+ <para>
+ Descriptions of all the programs and libraries would be several
+ pages long. Instead, consult the man pages
+ or the online documentation at <ulink
+ url="https://mariadb.com/kb/en/mariadb-documentation/"/>.
+ </para>
+
+ <para>
+ The <application>Perl</application> DBI modules must be installed
+ for some of the <application>MariaDB</application> support programs to
+ function properly.
+ </para>
+
+ </sect2>
+
+</sect1>
Modified: trunk/BOOK/server/mail/dovecot.xml
==============================================================================
--- trunk/BOOK/server/mail/dovecot.xml Mon Nov 11 02:14:59 2013 (r12181)
+++ trunk/BOOK/server/mail/dovecot.xml Mon Nov 11 09:10:53 2013 (r12182)
@@ -84,7 +84,7 @@
<xref linkend="linux-pam"/>,
<xref linkend="openldap"/>,
<xref linkend="postgresql"/>,
- <xref linkend="mysql"/>,
+ <xref linkend="mariadb"/> or <xref linkend="mysql"/>,
<xref linkend="sqlite"/>, and
<xref linkend="clucene"/>
</para>
Modified: trunk/BOOK/server/mail/exim.xml
==============================================================================
--- trunk/BOOK/server/mail/exim.xml Mon Nov 11 02:14:59 2013 (r12181)
+++ trunk/BOOK/server/mail/exim.xml Mon Nov 11 09:10:53 2013 (r12182)
@@ -82,7 +82,7 @@
<xref linkend="openldap"/>,
<xref linkend="openssl"/> or <xref linkend="gnutls"/>,
<xref linkend="cyrus-sasl"/>,
- <xref linkend="mysql"/>,
+ <xref linkend="mariadb"/> or <xref linkend="mysql"/>,
<xref linkend="postgresql"/>,
<xref linkend="sqlite"/>,
<xref linkend="linux-pam"/>, and
Modified: trunk/BOOK/server/mail/postfix.xml
==============================================================================
--- trunk/BOOK/server/mail/postfix.xml Mon Nov 11 02:14:59 2013 (r12181)
+++ trunk/BOOK/server/mail/postfix.xml Mon Nov 11 09:10:53 2013 (r12182)
@@ -89,7 +89,7 @@
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
- <xref linkend="mysql"/>,
+ <xref linkend="mariadb"/> or <xref linkend="mysql"/>,
<xref linkend="openldap"/>,
<xref linkend="pcre"/>,
<xref linkend="postgresql"/>,
Modified: trunk/BOOK/server/major/bind.xml
==============================================================================
--- trunk/BOOK/server/major/bind.xml Mon Nov 11 02:14:59 2013 (r12181)
+++ trunk/BOOK/server/major/bind.xml Mon Nov 11 09:10:53 2013 (r12182)
@@ -81,7 +81,7 @@
<bridgehead renderas="sect4">Optional database backends</bridgehead>
<para role="optional">
<xref linkend="postgresql"/>,
- <xref linkend="mysql"/>,
+ <xref linkend="mariadb"/> or <xref linkend="mysql"/>,
<xref linkend="db"/>,
<xref linkend="openldap"/>, and
<xref linkend="unixodbc"/>
Modified: trunk/BOOK/server/other/openldap.xml
==============================================================================
--- trunk/BOOK/server/other/openldap.xml Mon Nov 11 02:14:59 2013
(r12181)
+++ trunk/BOOK/server/other/openldap.xml Mon Nov 11 09:10:53 2013
(r12182)
@@ -108,7 +108,7 @@
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional">
<xref linkend="icu"/>,
- <xref linkend="mysql"/> or
+ <xref linkend="mariadb"/> or <xref linkend="mysql"/> or
<xref linkend="postgresql"/>,
<ulink url="http://www.openslp.org/";>OpenSLP</ulink>,
<xref linkend="pth"/> and
Modified: trunk/BOOK/x/lib/qt4.xml
==============================================================================
--- trunk/BOOK/x/lib/qt4.xml Mon Nov 11 02:14:59 2013 (r12181)
+++ trunk/BOOK/x/lib/qt4.xml Mon Nov 11 09:10:53 2013 (r12182)
@@ -102,7 +102,7 @@
<xref linkend="cups"/>,
<xref linkend="gtk2"/> (GTK+ 2 theme support),
<xref linkend="gst-plugins-base"/> (For QtWebKit HTML5 Video),
- <xref linkend="mysql"/>,
+ <xref linkend="mariadb"/> or <xref linkend="mysql"/>,
<xref linkend="postgresql"/>,
<xref linkend="pulseaudio"/>,
<xref linkend="unixodbc"/>, and
Modified: trunk/BOOK/x/lib/qt5.xml
==============================================================================
--- trunk/BOOK/x/lib/qt5.xml Mon Nov 11 02:14:59 2013 (r12181)
+++ trunk/BOOK/x/lib/qt5.xml Mon Nov 11 09:10:53 2013 (r12182)
@@ -111,7 +111,7 @@
<xref linkend="gst10-plugins-base"/> (QtWebKit HTML5 Video Support),
<xref linkend="gtk2"/> (GTK+ Theme Support),
<ulink url="http://xkbcommon.org/";>libxkbcommon</ulink>,
- <xref linkend="mysql"/>,
+ <xref linkend="mariadb"/> or <xref linkend="mysql"/>,
<xref linkend="postgresql"/>,
<xref linkend="pulseaudio"/>,
<xref linkend="unixodbc"/>, and
Modified: trunk/BOOK/xsoft/office/libreoffice.xml
==============================================================================
--- trunk/BOOK/xsoft/office/libreoffice.xml Mon Nov 11 02:14:59 2013
(r12181)
+++ trunk/BOOK/xsoft/office/libreoffice.xml Mon Nov 11 09:10:53 2013
(r12182)
@@ -202,7 +202,7 @@
<ulink
url="http://sourceforge.net/projects/libwpd/files/libodfgen/";>libodfgen</ulink>,
<ulink url="http://hci.iwr.uni-heidelberg.de/vigra/";>VIGRA</ulink>,
<ulink url="http://code.google.com/p/multidimalgorithm/";>mdds</ulink>,
- <xref linkend="mysql"/>,
+ <xref linkend="mariadb"/> or <xref linkend="mysql"/>,
<ulink
url="http://sourceforge.net/projects/hunspell/files/MyThes/";>MyThes</ulink>,
<ulink url="https://gitorious.org/orcus";>Orcus</ulink>,
<xref linkend="postgresql"/>,
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
