Changeset 3a5f637

Timestamp:

01/06/2022 07:41:09 PM (2 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

11.1, 11.2, 11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

eb18295

Parents:

bcccddd (diff), 1a8040a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'trunk' of git.linuxfromscratch.org:blfs into trunk

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• server/databases/mariadb.xml (modified) (2 diffs)

introduction/welcome/changelog.xml

@@ -46 +46 @@
       <itemizedlist>
         <listitem>
+          <para>[pierre] - Patch mariadb to prevent a stack smashing error
+          when building against openssl-3. Fixes
+          <ulink url="&blfs-ticket-root;15928">#15928</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[renodr] - Update to gjs-1.70.0. Fixes
           <ulink url="&blfs-ticket-root;15571">#15571</ulink>.</para>

server/databases/mariadb.xml

@@ -81 +81 @@
     </note>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch to prevent a stack smashing error when usin openssl-3:
+          <ulink url="&patch-root;/mariadb-&mariadb-version;-openssl3_fix-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">MariaDB Dependencies</bridgehead>
 
@@ -142 +152 @@
 <screen role="root"><userinput>groupadd -g 40 mysql &amp;&amp;
 useradd -c "MySQL Server" -d /srv/mysql -g mysql -s /bin/false -u 40 mysql</userinput></screen>
-<!--
-    <para>
-      Fix a syntax error that causes CMake to fail:
-    </para>
-
-<screen><userinput remap="pre">sed -i 's/END()/ENDIF()/' libmariadb/cmake/ConnectorName.cmake</userinput></screen>
--->
+
+    <para>
+      Fix a stack smashing error introduced by openssl-3:
+    </para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../mariadb-&mariadb-version;-openssl3_fix-1.patch</userinput></screen>
+
     <para>
       Install <application>MariaDB</application> by running the