diff options
| author | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2022-04-17 14:19:34 -0500 |
|---|---|---|
| committer | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2022-04-17 14:19:34 -0500 |
| commit | 7a0687cbbfeb3f7198fcf6e1093869cd4e39324b (patch) | |
| tree | e8d2f4a9bbfd36325afb295c0e6dd5786f25137a | |
| parent | e9538133fa6c5dd2a6afdd5521b507fa5229fddc (diff) | |
| parent | 1d694184b375b493c2926f291e4a696882db78ae (diff) | |
Merge branch 'trunk' of git.linuxfromscratch.org:lfs into trunk
| -rw-r--r-- | chapter01/changelog.xml | 4 | ||||
| -rw-r--r-- | chapter01/whatsnew.xml | 3 | ||||
| -rw-r--r-- | chapter03/patches.xml | 8 | ||||
| -rw-r--r-- | chapter08/xz.xml | 4 | ||||
| -rw-r--r-- | patches.ent | 4 |
5 files changed, 23 insertions, 0 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index b1152d3db..6b2244bdd 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -44,6 +44,10 @@ <para>2022-04-15</para> <itemizedlist> <listitem> + <para>[ken] - Patch Xz for a security fix. Fixes + <ulink url="&lfs-ticket-root;5047">#5047</ulink>.</para> + </listitem> + <listitem> <para>[bdubbs] - Update to libcap-2.64. Fixes <ulink url="&lfs-ticket-root;5044">#5044</ulink>.</para> </listitem> diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 4c4e239f9..8acd99833 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -281,6 +281,9 @@ <title>Added:</title> <listitem><para></para></listitem> <!-- satisfy build --> <listitem> + <para>&xz-upstream-fix-patch;</para> + </listitem> + <listitem> <para>&zstd-upstream-fixes-patch;</para> </listitem> </itemizedlist> diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 0e22d26c0..83ada1927 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -151,6 +151,14 @@ </varlistentry> <varlistentry> + <term>Xz Upstream Fix Patch - <token>&xz-upstream-fix-patch-size;</token>:</term> + <listitem> + <para>Download: <ulink url="&patches-root;&xz-upstream-fix-patch;"/></para> + <para>MD5 sum: <literal>&xz-upstream-fix-patch-md5;</literal></para> + </listitem> + </varlistentry> + + <varlistentry> <term>Zstd Upstream Fixes Patch - <token>&zstd-upstream-fixes-patch-size;</token>:</term> <listitem> <para>Download: <ulink url="&patches-root;&zstd-upstream-fixes-patch;"/></para> diff --git a/chapter08/xz.xml b/chapter08/xz.xml index e4c43131c..bf108ad34 100644 --- a/chapter08/xz.xml +++ b/chapter08/xz.xml @@ -44,6 +44,10 @@ <sect2 role="installation"> <title>Installation of Xz</title> + <para>Apply a patch to fix an issue in xzgrep:</para> + +<screen><userinput remap="pre">patch -Np1 -i ../&xz-upstream-fix-patch;</userinput></screen> + <para>Prepare Xz for compilation with:</para> <screen><userinput remap="configure">./configure --prefix=/usr \ diff --git a/patches.ent b/patches.ent index 8f4f0d188..dbbfdc2a6 100644 --- a/patches.ent +++ b/patches.ent @@ -93,6 +93,10 @@ <!ENTITY systemd-kernel-fixes-patch-md5 "34cee987b35d5d522fd3317e08057c1d"> <!ENTITY systemd-kernel-fixes-patch-size "2.7 KB"> +<!ENTITY xz-upstream-fix-patch "xz-&xz-version;-upstream_fix-1.patch"> +<!ENTITY xz-upstream-fix-patch-md5 "584c72ea3d8f7502b2770670f3090788"> +<!ENTITY xz-upstream-fix-patch-size "3.7 KB"> + <!ENTITY zstd-upstream-fixes-patch "zstd-&zstd-version;-upstream_fixes-1.patch"> <!ENTITY zstd-upstream-fixes-patch-md5 "a7e576e3f87415fdf388392b257cdcf3"> <!ENTITY zstd-upstream-fixes-patch-size "4 KB"> |