diff options
| author | Douglas R. Reno <renodr@linuxfromscratch.org> | 2021-09-08 10:36:09 -0500 |
|---|---|---|
| committer | Douglas R. Reno <renodr@linuxfromscratch.org> | 2021-09-08 10:36:09 -0500 |
| commit | e128c68596c1847eff317816550e06c01ab076fc (patch) | |
| tree | 90ae30eadf13989242b617c52cf0947c0325e0a8 | |
| parent | 2da0137968546f55eba120fd10c1844c804e365e (diff) | |
Add the File upstream fixes patch to the book.
| -rw-r--r-- | chapter01/changelog.xml | 10 | ||||
| -rw-r--r-- | chapter01/whatsnew.xml | 3 | ||||
| -rw-r--r-- | chapter03/patches.xml | 8 | ||||
| -rw-r--r-- | chapter08/file.xml | 4 | ||||
| -rw-r--r-- | patches.ent | 4 |
5 files changed, 29 insertions, 0 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index edd35bb5e..0097cb2c6 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -44,6 +44,16 @@ --> <listitem> + <para>2021-09-08</para> + <itemizedlist> + <listitem> + <para>[renodr] - Fix regressions in File that result in improper + detection of text and XZ files.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>2021-09-06</para> <itemizedlist> <listitem> diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index f4f4be90c..cd40cb78a 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -284,6 +284,9 @@ <itemizedlist> <title>Added:</title> <listitem><para></para></listitem> <!-- satisfy build --> + <listitem> + <para>file-5.40-upstream_fixes-1.patch</para> + </listitem> <!-- <listitem> <para>binutils-2.37-upstream_fix-1.patch</para> diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 9c32c63f8..8921684ce 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -61,6 +61,14 @@ </varlistentry> <varlistentry> + <term>File Upstream Fixes Patch - <token>&file-upstream-fixes-patch-size;</token>:</term> + <listitem> + <para>Download: <ulink url="&patches-root;&file-upstream-fixes-patch;"/></para> + <para>MD5 sum: <literal>&file-upstream-fixes-md5;</literal></para> + </listitem> + </varlistentry> + + <varlistentry> <term>Glibc FHS Patch - <token>&glibc-fhs-patch-size;</token>:</term> <listitem> <para>Download: <ulink url="&patches-root;&glibc-fhs-patch;"/></para> diff --git a/chapter08/file.xml b/chapter08/file.xml index eb9f41a2b..8baf349b1 100644 --- a/chapter08/file.xml +++ b/chapter08/file.xml @@ -41,6 +41,10 @@ <sect2 role="installation"> <title>Installation of File</title> + <para>First, fix a few regressions in File:</para> + +<screen><userinput remap="pre">patch -Np1 -i ../file-&file-version;-upstream_fixes-1.patch</userinput></screen> + <para>Prepare File for compilation:</para> <screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen> diff --git a/patches.ent b/patches.ent index e1700857a..99595d762 100644 --- a/patches.ent +++ b/patches.ent @@ -30,6 +30,10 @@ <!ENTITY flex-fixes-patch-size "3.4 KB"> --> +<!ENTITY file-upstream-fixes-patch "file-&file-version;-upstream_fixes-1.patch"> +<!ENTITY file-upstream-fixes-md5 "d99090db596b9db2bed869662199a56a"> +<!ENTITY file-upstream-fixes-patch-size "4.0 KB"> + <!ENTITY gcc-upstream-fixes-patch "gcc-&gcc-version;-upstream_fixes-1.patch"> <!ENTITY gcc-upstream-fixes-patch-md5 "27266d2a771f2ff812cb6ec9c8b456b4"> <!ENTITY gcc-upstream-fixes-patch-size "18.0 KB"> |