aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Dubbs <bdubbs@linuxfromscratch.org>2018-02-03 02:56:41 +0000
committerBruce Dubbs <bdubbs@linuxfromscratch.org>2018-02-03 02:56:41 +0000
commit869b09668663e06670b710babd7261cd3821356d (patch)
tree37aec7bd49f13f526aeefecefbc769409c931798
parent173aea3c22a648219286575b96fe11030df56bb5 (diff)
Update to glibc-2.27.
Update to man-pages-4.15. Update to bash-4.4.18. Update to iproute2-4.15.0. Add an option to binutils to support 64-bit operations on a 32-bit system. Provide better initialization for vim. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11359 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml22
-rw-r--r--chapter01/whatsnew.xml4
-rw-r--r--chapter03/patches.xml4
-rw-r--r--chapter05/make.xml4
-rw-r--r--chapter06/binutils.xml9
-rw-r--r--chapter06/glibc.xml9
-rw-r--r--chapter06/make.xml3
-rw-r--r--chapter06/vim.xml1
-rw-r--r--general.ent6
-rw-r--r--packages.ent24
-rw-r--r--patches.ent3
11 files changed, 66 insertions, 23 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 09ef2f351..760eb9b49 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -43,6 +43,28 @@
appropriate for the entry or if needed the entire day's listitem.
-->
<listitem>
+ <para>2018-02-02</para>
+ <itemizedlist>
+ <listitem>
+ <para>[bdubbs] - Update to glibc-2.27. Fixes
+ <ulink url="&lfs-ticket-root;4207">#4207</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to man-pages-4.15. Fixes
+ <ulink url="&lfs-ticket-root;4206">#4206</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to bash-4.4.18. Fixes
+ <ulink url="&lfs-ticket-root;4205">#4205</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to iproute2-4.15.0. Fixes
+ <ulink url="&lfs-ticket-root;4204">#4204</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2018-01-30</para>
<itemizedlist>
<listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index afdae780b..f1ec7ab0c 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -101,9 +101,9 @@
<!--<listitem>
<para>Gettext-&gettext-version;</para>
</listitem>-->
- <!--<listitem>
+ <listitem>
<para>Glibc-&glibc-version;</para>
- </listitem>-->
+ </listitem>
<!--<listitem>
<para>GMP-&gmp-version;</para>
</listitem>-->
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index d5262986f..ae7f7a795 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -75,7 +75,7 @@
<para>MD5 sum: <literal>&glibc-fhs-patch-md5;</literal></para>
</listitem>
</varlistentry>
-
+<!--
<varlistentry>
<term>Glibc Glob Security Patch - <token>&glibc-glob-patch-size;</token>:</term>
<listitem>
@@ -83,7 +83,7 @@
<para>MD5 sum: <literal>&glibc-glob-patch-md5;</literal></para>
</listitem>
</varlistentry>
-
+-->
<varlistentry>
<term>Kbd Backspace/Delete Fix Patch - <token>&kbd-backspace-patch-size;</token>:</term>
<listitem>
diff --git a/chapter05/make.xml b/chapter05/make.xml
index 22b5afb4e..ec2a6e8d4 100644
--- a/chapter05/make.xml
+++ b/chapter05/make.xml
@@ -42,6 +42,10 @@
<sect2 role="installation">
<title>Installation of Make</title>
+ <para>First, work around an error caused by glibc-2.27:</para>
+
+<screen><userinput remap="pre">sed -i '211,217 d; 219,229 d; 232 d' glob/glob.c</userinput></screen>
+
<para>Prepare Make for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/tools --without-guile</userinput></screen>
diff --git a/chapter06/binutils.xml b/chapter06/binutils.xml
index 3cc7ae0a5..4435db7e9 100644
--- a/chapter06/binutils.xml
+++ b/chapter06/binutils.xml
@@ -71,6 +71,7 @@ cd build</userinput></screen>
--enable-plugins \
--enable-shared \
--disable-werror \
+ --enable-64-bit-bfd \
--with-system-zlib</userinput></screen>
<variablelist>
<title>The meaning of the configure parameters:</title>
@@ -99,6 +100,14 @@ cd build</userinput></screen>
</varlistentry>
<varlistentry>
+ <term><parameter>--enable-64-bit-bfd</parameter></term>
+ <listitem>
+ <para>Enables 64-bit support (on hosts with narrower word sizes).
+ May not be needed on 64-bit systems, but does no harm.</para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term><parameter>--with-system-zlib</parameter></term>
<listitem>
<para>Use the installed zlib library rather than building the
diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml
index 07cbe969d..2a74215f4 100644
--- a/chapter06/glibc.xml
+++ b/chapter06/glibc.xml
@@ -56,16 +56,21 @@
store their runtime data in the FHS-compliant locations:</para>
<screen><userinput remap="pre">patch -Np1 -i ../&glibc-fhs-patch;</userinput></screen>
-
+<!--
<para>Fix a minor security issue with glob functions:</para>
<screen><userinput remap="pre">patch -Np1 -i ../&glibc-glob-patch;</userinput></screen>
-
+-->
<para>First create a compatibility symlink to avoid references to /tools in
our final glibc:</para>
<screen><userinput remap="pre">ln -sfv /tools/lib/gcc /usr/lib</userinput></screen>
+ <para>Now work around a problem caused by a hard-coded path to an
+ executable program:</para>
+
+<screen><userinput remap="pre">ln -sfv /tools/bin/m4 /usr/bin</userinput></screen>
+
<para>Determine the GCC include directory and create a symlink for LSB
compliance. Additionally, for x86_64, create a compatibility symlink
required for the dynamic loader to function correctly:</para>
diff --git a/chapter06/make.xml b/chapter06/make.xml
index f88105c01..e52fff2cf 100644
--- a/chapter06/make.xml
+++ b/chapter06/make.xml
@@ -40,6 +40,9 @@
<sect2 role="installation">
<title>Installation of Make</title>
+ <para>Again, work around an error caused by glibc-2.27:</para>
+
+<screen><userinput remap="pre">sed -i '211,217 d; 219,229 d; 232 d' glob/glob.c</userinput></screen>
<para>Prepare Make for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index fa2bad722..a11068a54 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -140,7 +140,6 @@ if (&amp;term == "xterm") || (&amp;term == "putty")
set background=dark
endif
-
" End /etc/vimrc</literal>
EOF</userinput></screen>
diff --git a/general.ent b/general.ent
index d4d2890cd..6f9f7f2ca 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version "SVN-20180130">
+<!ENTITY version "SVN-20180202">
<!ENTITY short-version "svn"> <!-- Used below in &blfs-book;
Change to x.y for release but not -rc releases -->
<!ENTITY generic-version "development"> <!-- Use "development" or "x.y[-pre{x}]" -->
-<!ENTITY versiond "20180130-systemd">
+<!ENTITY versiond "20180202-systemd">
<!ENTITY short-versiond "systemd">
<!ENTITY generic-versiond "systemd">
-<!ENTITY releasedate "January 30, 2018">
+<!ENTITY releasedate "February 2, 2018">
<!ENTITY copyrightdate "1999-2018"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "8.2">
diff --git a/packages.ent b/packages.ent
index 4bfd5fbd4..4886e34cc 100644
--- a/packages.ent
+++ b/packages.ent
@@ -40,10 +40,10 @@
<!ENTITY automake-ch6-du "110 MB">
<!ENTITY automake-ch6-sbu "less than 0.1 SBU (about 8.5 SBU with tests)">
-<!ENTITY bash-version "4.4.12">
-<!ENTITY bash-size "9,244 KB">
+<!ENTITY bash-version "4.4.18">
+<!ENTITY bash-size "9,242 KB">
<!ENTITY bash-url "&gnu;bash/bash-&bash-version;.tar.gz">
-<!ENTITY bash-md5 "7c112970cbdcadfc331e10eeb5f6aa41">
+<!ENTITY bash-md5 "518e2c187cc11a17040f0915dddce54e">
<!ENTITY bash-home "&gnu-software;bash/">
<!ENTITY bash-ch5-du "61 MB">
<!ENTITY bash-ch5-sbu "0.4 SBU">
@@ -255,10 +255,10 @@
<!ENTITY gettext-ch6-du "199 MB">
<!ENTITY gettext-ch6-sbu "2.4 SBU">
-<!ENTITY glibc-version "2.26">
-<!ENTITY glibc-size "14,339 KB">
+<!ENTITY glibc-version "2.27">
+<!ENTITY glibc-size "15,035 KB">
<!ENTITY glibc-url "&gnu;glibc/glibc-&glibc-version;.tar.xz">
-<!ENTITY glibc-md5 "102f637c3812f81111f48f2427611be1">
+<!ENTITY glibc-md5 "898cd5656519ffbc3a03fe811dd89e82">
<!ENTITY glibc-home "&gnu-software;libc/">
<!ENTITY glibc-ch5-du "790 MB">
<!ENTITY glibc-ch5-sbu "4.2 SBU">
@@ -342,10 +342,10 @@
<!ENTITY intltool-ch6-du "1.5 MB">
<!ENTITY intltool-ch6-sbu "less than 0.1 SBU">
-<!ENTITY iproute2-version "4.14.1">
-<!ENTITY iproute2-size "622 KB">
+<!ENTITY iproute2-version "4.15.0">
+<!ENTITY iproute2-size "634 KB">
<!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz">
-<!ENTITY iproute2-md5 "1075423d7029e02a8f23ed4f42b7e372">
+<!ENTITY iproute2-md5 "0681bf4664b2649ad4e12551a3a7a1f9">
<!ENTITY iproute2-home "&kernel;linux/utils/net/iproute2/">
<!ENTITY iproute2-ch6-du "12 MB">
<!ENTITY iproute2-ch6-sbu "0.2 SBU">
@@ -462,10 +462,10 @@
<!ENTITY man-db-ch6-du "30 MB">
<!ENTITY man-db-ch6-sbu "0.4 SBU">
-<!ENTITY man-pages-version "4.14">
-<!ENTITY man-pages-size "1,574 KB">
+<!ENTITY man-pages-version "4.15">
+<!ENTITY man-pages-size "1,585 KB">
<!ENTITY man-pages-url "&kernel;linux/docs/man-pages/man-pages-&man-pages-version;.tar.xz">
-<!ENTITY man-pages-md5 "4c2c44f27e8f2c593ea67caa981a6c3b">
+<!ENTITY man-pages-md5 "4298feb3d5feffad8ff46bb87b061a07">
<!ENTITY man-pages-home "http://www.kernel.org/doc/man-pages/">
<!ENTITY man-pages-ch6-du "27 MB">
<!ENTITY man-pages-ch6-sbu "less than 0.1 SBU">
diff --git a/patches.ent b/patches.ent
index 6528f6b2a..753d8f162 100644
--- a/patches.ent
+++ b/patches.ent
@@ -34,10 +34,11 @@
<!ENTITY glibc-fhs-patch-md5 "9a5997c3452909b1769918c759eff8a2">
<!ENTITY glibc-fhs-patch-size "2.8 KB">
+<!--
<!ENTITY glibc-glob-patch "glibc-&glibc-version;-local_glob_exploits-2.patch">
<!ENTITY glibc-glob-patch-md5 "1377e4f5422c6672ff48d430c07b245c">
<!ENTITY glibc-glob-patch-size "2.3 KB">
-
+-->
<!--
<!ENTITY glibc-upstream-patch "glibc-&glibc-version;-upstream_fixes-1.patch">
<!ENTITY glibc-upstream-patch-md5 "e602b6c3a332f4a06e2914e02ae2b295">