[blfs] 03/03: Update to btrfs-progs-v7.0.

This is an automated email from the git hooks/post-receive script.

git pushed a commit to branch trunk
in repository blfs.

commit ab203b40c46600ba24536773759f5ee7cca0c6ae
Author: Bruce Dubbs <[email protected]>
AuthorDate: Fri May 22 12:28:40 2026 -0500

    Update to btrfs-progs-v7.0.
    
    Also add a patch to apache.
---
 introduction/welcome/changelog.xml  | 10 ++++++++++
 packages.ent                        |  2 +-
 postlfs/filesystems/btrfs-progs.xml | 12 +++++++-----
 server/major/apache.xml             | 12 ++++++++++++
 4 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 3cb6fd7efb..7c561e619f 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -39,6 +39,16 @@
   <itemizedlist>
     <title>Changelog Entries:</title>
 
+    <listitem>
+      <para>May 22nd, 2026</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to btrfs-progs-v7.0. Fixes
+          <ulink url="&blfs-ticket-root;23274">#23274</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>May 21st, 2026</para>
       <itemizedlist>
diff --git a/packages.ent b/packages.ent
index 7f08031602..277100092b 100644
--- a/packages.ent
+++ b/packages.ent
@@ -45,7 +45,7 @@
 <!--<!ENTITY volume_key-version           "0.3.12">-->
 
 <!-- Chapter 5 -->
-<!ENTITY btrfs-progs-version          "6.19.1">
+<!ENTITY btrfs-progs-version          "7.0">
 <!ENTITY dosfstools-version           "4.2">
 <!ENTITY fuse3-version                "3.18.2">
 <!ENTITY jfsutils-version             "1.1.15">
diff --git a/postlfs/filesystems/btrfs-progs.xml b/postlfs/filesystems/btrfs-progs.xml
index 35b4c5f3bf..09e8c244de 100644
--- a/postlfs/filesystems/btrfs-progs.xml
+++ b/postlfs/filesystems/btrfs-progs.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY btrfs-progs-download-http "&kernel-dl;/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v&btrfs-progs-version;.tar.xz">
   <!ENTITY btrfs-progs-download-ftp  " ">
-  <!ENTITY btrfs-progs-md5sum        "a06ba5c0b7d9f8e5a80f14e15818bd92">
+  <!ENTITY btrfs-progs-md5sum        "58f14462ee1da3e36d0bde684e48b9ea">
   <!ENTITY btrfs-progs-size          "4.8 MB">
-  <!ENTITY btrfs-progs-buildsize     "69 MB (transient files created during tests need up to 10 GB)">
-  <!ENTITY btrfs-progs-time          "0.3 SBU (with parallelism=4; add 4.4 SBU for tests, up to 14 SBU on slow disks)">
+  <!ENTITY btrfs-progs-buildsize     "70 MB (transient files created during tests need up to 10 GB)">
+  <!ENTITY btrfs-progs-time          "0.3 SBU (with parallelism=4; add 4.6 SBU for tests, up to 14 SBU on slow disks)">
 ]>
 
 <sect1 id="btrfs-progs" xreflabel="btrfs-progs-&btrfs-progs-version;">
@@ -134,10 +134,12 @@ make</userinput></screen>
 <screen remap="test"><userinput>make fssum</userinput></screen>
 
     <para>
-      Now, remove a test that is known to fail. As &root;:
+      Now, remove tests that are known to fail. As &root;:
     </para>
 
-<screen remap="test"><userinput>rm -rf tests/fuzz-tests/010-simple-sb</userinput></screen>
+<screen remap="test"><userinput>rm -rf tests/mkfs-tests/042-rootdir-contents
+rm -rf tests/misc-tests/041-subvolume-delete-during-send
+rm -rf tests/fuzz-tests/010-simple-sb</userinput></screen>
 
     <para>
       To test the results, issue (as the &root; user):
diff --git a/server/major/apache.xml b/server/major/apache.xml
index c39860d4bb..124d0a0a4d 100644
--- a/server/major/apache.xml
+++ b/server/major/apache.xml
@@ -76,6 +76,12 @@
           <ulink url="&patch-root;/httpd-blfs_layout-1.patch"/>
         </para>
       </listitem>
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/httpd-2.4.67-openssl4_fixes-1.patch"/>
+        </para>
+      </listitem>
     </itemizedlist>
 
     <bridgehead renderas="sect3">Apache HTTPD Dependencies</bridgehead>
@@ -118,6 +124,12 @@
 useradd -c "Apache Server" -d /srv/www -g apache \
         -s /bin/false -u 25 apache</userinput></screen>
 
+    <para>
+      Now add a patch for compatibility with openssl4:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../httpd-2.4.67-openssl4_fixes-1.patch</userinput></screen>  
+
     <para>
       Build and install <application>Apache HTTPD</application> by running the
       following commands:

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

-- 
http://lists.linuxfromscratch.org/sympa/info/blfs-book
Unsubscribe: See the above information page