Changeset 419a60e

Timestamp:

11/11/2013 05:10:53 PM (10 years ago)

Author:

Igor Živković <igor@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

0d210a29

Parents:

f2c30c74

Message:

added mariadb

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@12182 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general.ent (modified) (1 diff)
• general/genlib/apr-util.xml (modified) (1 diff)
• general/prog/php.xml (modified) (1 diff)
• general/sysutils/redland.xml (modified) (1 diff)
• introduction/welcome/changelog.xml (modified) (1 diff)
• kde/core/akonadi.xml (modified) (1 diff)
• multimedia/audioutils/amarok.xml (modified) (1 diff)
• postlfs/security/cyrus-sasl.xml (modified) (1 diff)
• server/databases/databases.xml (modified) (1 diff)
• server/databases/mariadb.xml (added)
• server/mail/dovecot.xml (modified) (1 diff)
• server/mail/exim.xml (modified) (1 diff)
• server/mail/postfix.xml (modified) (1 diff)
• server/major/bind.xml (modified) (1 diff)
• server/other/openldap.xml (modified) (1 diff)
• x/lib/qt4.xml (modified) (1 diff)
• x/lib/qt5.xml (modified) (1 diff)
• xsoft/office/libreoffice.xml (modified) (1 diff)

general.ent

@@ -497 +497 @@
 <!-- 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">

general/genlib/apr-util.xml

@@ -91 +91 @@
       <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"/>,

general/prog/php.xml

@@ -116 +116 @@
     <!-- <xref linkend="gdbm"/>, -->
     <xref linkend="db"/>,
-    <xref linkend="mysql"/>,
+    <xref linkend="mariadb"/> or <xref linkend="mysql"/>,
     <xref linkend="postgresql"/>,
     <xref linkend="unixodbc"/>,

general/sysutils/redland.xml

@@ -71 +71 @@
     <xref linkend="libiodbc"/>,
     <xref linkend="sqlite"/>,
-    <xref linkend="mysql"/>,
+    <xref linkend="mariadb"/> or <xref linkend="mysql"/>,
     <xref linkend="postgresql"/>,
     <xref linkend="virtuoso"/> and

introduction/welcome/changelog.xml

@@ -45 +45 @@
 -->
     <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>

kde/core/akonadi.xml

@@ -67 +67 @@
     <xref linkend="soprano"/>, and one of:
     <xref linkend="sqlite"/>,
-    <xref linkend="mysql"/>, or
+    <xref linkend="mariadb"/>, <xref linkend="mysql"/>, or
     <xref linkend="postgresql"/>
     </para>

multimedia/audioutils/amarok.xml

@@ -78 +78 @@
     <para role="required">
       <xref linkend="kdelibs"/>,
-      <xref linkend="mysql"/>, and
+      <xref linkend="mariadb"/> or <xref linkend="mysql"/>, and
       <xref linkend="taglib"/>
     </para>

postlfs/security/cyrus-sasl.xml

@@ -102 +102 @@
       <xref linkend="linux-pam"/>,
       <xref linkend="mitkrb"/>,
-      <xref linkend="mysql"/>,
+      <xref linkend="mariadb"/> or <xref linkend="mysql"/>,
       <xref linkend="openjdk"/>,
       <xref linkend="openldap"/>,

server/databases/databases.xml

@@ -23 +23 @@
 
   <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"/>

server/mail/dovecot.xml

@@ -85 +85 @@
       <xref linkend="openldap"/>,
       <xref linkend="postgresql"/>,
-      <xref linkend="mysql"/>,
+      <xref linkend="mariadb"/> or <xref linkend="mysql"/>,
       <xref linkend="sqlite"/>, and
       <xref linkend="clucene"/>

server/mail/exim.xml

@@ -83 +83 @@
       <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"/>,

server/mail/postfix.xml

@@ -90 +90 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="mysql"/>,
+      <xref linkend="mariadb"/> or <xref linkend="mysql"/>,
       <xref linkend="openldap"/>,
       <xref linkend="pcre"/>,

server/major/bind.xml

@@ -82 +82 @@
     <para role="optional">
       <xref linkend="postgresql"/>,
-      <xref linkend="mysql"/>,
+      <xref linkend="mariadb"/> or <xref linkend="mysql"/>,
       <xref linkend="db"/>,
       <xref linkend="openldap"/>, and

server/other/openldap.xml

@@ -109 +109 @@
     <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>,

x/lib/qt4.xml

@@ -103 +103 @@
       <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"/>,

x/lib/qt5.xml

@@ -112 +112 @@
       <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"/>, 

xsoft/office/libreoffice.xml

@@ -203 +203 @@
       <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>,