aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Dubbs <bdubbs@linuxfromscratch.org>2016-12-31 17:15:47 +0000
committerBruce Dubbs <bdubbs@linuxfromscratch.org>2016-12-31 17:15:47 +0000
commit9742edf14755e42ecbfab6b837817508c56c4411 (patch)
tree6d36626eb9e52fbedc6c1a3e72d0dd762b0157a8
parentfc54d2e79153fbe8e9caf3ff48c3955c0116d82b (diff)
Update to flex-2.6.3.
Update to xz-5.2.3. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@11160 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml14
-rw-r--r--chapter01/whatsnew.xml4
-rw-r--r--chapter03/patches.xml4
-rw-r--r--chapter06/flex.xml5
-rw-r--r--chapter06/xz.xml7
-rw-r--r--general.ent6
-rw-r--r--packages.ent12
-rw-r--r--patches.ent2
8 files changed, 28 insertions, 26 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 29a245f92..843397bab 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -43,6 +43,20 @@
appropriate for the entry or if needed the entire day's listitem.
-->
<listitem>
+ <para>2017-01-01</para>
+ <itemizedlist>
+ <listitem>
+ <para>[bdubbs] - Update to flex-2.6.3. Fixes
+ <ulink url="&lfs-ticket-root;4020">#4020</ulink>.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Update to xz-5.2.3. Fixes
+ <ulink url="&lfs-ticket-root;4021">#4021</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2016-12-21</para>
<itemizedlist>
<listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 79cb48563..6ed0421c2 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -230,9 +230,9 @@
<!--<listitem>
<para>XML-Parser-&xml-parser-version;</para>
</listitem>-->
- <!--<listitem>
+ <listitem>
<para>XZ-Utils &xz-version;</para>
- </listitem>-->
+ </listitem>
<!--<listitem>
<para>Zlib &zlib-version;</para>
</listitem>-->
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 4ff762d2c..e4b3afdf3 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -49,7 +49,7 @@
<para>MD5 sum: <literal>&coreutils-i18n-patch-md5;</literal></para>
</listitem>
</varlistentry>
-
+<!--
<varlistentry>
<term>Flex Fixes Patch - <token>&flex-fixes-patch-size;</token>:</term>
<listitem>
@@ -57,7 +57,7 @@
<para>MD5 sum: <literal>&flex-fixes-patch-md5;</literal></para>
</listitem>
</varlistentry>
-<!--
+
<varlistentry>
<term>Gccc ASAN Patch - <token>&gcc-asan-patch-size;</token>:</term>
<listitem>
diff --git a/chapter06/flex.xml b/chapter06/flex.xml
index f1bdc7fb5..5536772dc 100644
--- a/chapter06/flex.xml
+++ b/chapter06/flex.xml
@@ -41,11 +41,6 @@
<sect2 role="installation">
<title>Installation of Flex</title>
- <para>Fix an issue that was discovered after release:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&flex-fixes-patch; &amp;&amp;
-touch src/scan.*</userinput></screen>
-
<para>The build procedure assumes the <application>help2man</application>
program is available to create a man page from the executable --help option.
This is not present, so we use an environment variable to skip this process.
diff --git a/chapter06/xz.xml b/chapter06/xz.xml
index e566273e6..8d29b578a 100644
--- a/chapter06/xz.xml
+++ b/chapter06/xz.xml
@@ -44,13 +44,6 @@
<sect2 role="installation">
<title>Installation of Xz</title>
- <para>First, fix an internal problem:</para>
-
-<screen><userinput remap="pre">sed -e '/mf\.buffer = NULL/a next->coder->mf.size = 0;' \
- -i src/liblzma/lz/lz_encoder.c</userinput></screen>
-
-
-
<para>Prepare Xz for compilation with:</para>
<screen><userinput remap="configure">./configure --prefix=/usr \
diff --git a/general.ent b/general.ent
index 89e754a18..841778376 100644
--- a/general.ent
+++ b/general.ent
@@ -1,13 +1,13 @@
-<!ENTITY version "SVN-20161221">
+<!ENTITY version "SVN-20170101">
<!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 "20161221-systemd">
+<!ENTITY versiond "20170101-systemd">
<!ENTITY short-versiond "systemd">
<!ENTITY generic-versiond "systemd">
-<!ENTITY releasedate "December 21, 2016">
+<!ENTITY releasedate "January 1, 2016">
<!ENTITY copyrightdate "1999-2017"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "7.11">
diff --git a/packages.ent b/packages.ent
index 48a042ffc..b12d001d0 100644
--- a/packages.ent
+++ b/packages.ent
@@ -187,10 +187,10 @@
<!ENTITY findutils-ch6-du "48 MB">
<!ENTITY findutils-ch6-sbu "1.6 SBU">
-<!ENTITY flex-version "2.6.2">
-<!ENTITY flex-size "1,370 KB">
+<!ENTITY flex-version "2.6.3">
+<!ENTITY flex-size "1,373 KB">
<!ENTITY flex-url "https://github.com/westes/flex/releases/download/v&flex-version;/flex-&flex-version;.tar.gz">
-<!ENTITY flex-md5 "cc6d76c333db7653d5caf423a3335239">
+<!ENTITY flex-md5 "a5f65570cd9107ec8a8ec88f17b31bb1">
<!ENTITY flex-home "http://flex.sourceforge.net">
<!ENTITY flex-ch6-du "31 MB">
<!ENTITY flex-ch6-sbu "0.4 SBU">
@@ -632,10 +632,10 @@
<!ENTITY xml-parser-ch6-du "2.0 MB">
<!ENTITY xml-parser-ch6-sbu "less than 0.1 SBU">
-<!ENTITY xz-version "5.2.2">
-<!ENTITY xz-size "993 KB">
+<!ENTITY xz-version "5.2.3">
+<!ENTITY xz-size "1009 KB">
<!ENTITY xz-url "http://tukaani.org/xz/xz-&xz-version;.tar.xz">
-<!ENTITY xz-md5 "e26772b69940085c0632589ab1d52e64">
+<!ENTITY xz-md5 "60fb79cab777e3f71ca43d298adacbd5">
<!ENTITY xz-home "http://tukaani.org/xz">
<!ENTITY xz-ch5-du "16 MB">
<!ENTITY xz-ch5-sbu "0.2 SBU">
diff --git a/patches.ent b/patches.ent
index c409df7cf..c88d56e2d 100644
--- a/patches.ent
+++ b/patches.ent
@@ -14,11 +14,11 @@
<!ENTITY coreutils-i18n-patch-md5 "e1f87b10b23d66344e5e99e7fabfa7a2">
<!ENTITY coreutils-i18n-patch-size "168 KB">
+<!--
<!ENTITY flex-fixes-patch "flex-&flex-version;-fixes-1.patch">
<!ENTITY flex-fixes-patch-md5 "ab07c395c5c96839f4fbc7801ed4cf73">
<!ENTITY flex-fixes-patch-size "200 KB">
-<!--
<!ENTITY gcc-asan-patch "gcc-&gcc-version;-asan-1.patch">
<!ENTITY gcc-asan-patch-md5 "c12ab2e323010fda83bfccc27f58f0b5">
<!ENTITY gcc-asan-patch-size "2.8 KB">