diff options
| -rw-r--r-- | chapter01/changelog.xml | 10 | ||||
| -rw-r--r-- | chapter01/whatsnew.xml | 9 | ||||
| -rw-r--r-- | chapter03/patches.xml | 4 | ||||
| -rw-r--r-- | chapter06/bc.xml | 17 | ||||
| -rw-r--r-- | general.ent | 6 | ||||
| -rw-r--r-- | packages.ent | 8 | ||||
| -rw-r--r-- | patches.ent | 2 |
7 files changed, 41 insertions, 15 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index cc06eface..52c66cfc9 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -43,6 +43,16 @@ appropriate for the entry or if needed the entire day's listitem. --> <listitem> + <para>2017-04-03</para> + <itemizedlist> + <listitem> + <para>[bdubbs] - Update to bc-1.07. Fixes + <ulink url="&lfs-ticket-root;4071">#4071</ulink>.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>2017-03-31</para> <itemizedlist> <listitem> diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index dad364937..42da0a7e8 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -42,6 +42,9 @@ <para>Bash &bash-version;</para> </listitem>--> <listitem> + <para>Bc &bc-version;</para> + </listitem> + <listitem> <para>Binutils &binutils-version;</para> </listitem> <!--<listitem> @@ -262,9 +265,9 @@ <title>Removed:</title> <listitem><para></para></listitem> <!-- satisfy build --> - <!--<listitem> - <para>bash-4.3.30-upstream_fixes-3.patch</para> - </listitem>--> + <listitem> + <para>bc-1.06.95-memory_leak-1.patch</para> + </listitem> </itemizedlist> diff --git a/chapter03/patches.xml b/chapter03/patches.xml index c298bc79f..0fd3124d5 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -25,7 +25,7 @@ <para>MD5 sum: <literal>&bash-fixes-patch-md5;</literal></para> </listitem> </varlistentry> - +<!-- <varlistentry> <term>Bc Memory Leak Patch - <token>&bc-memory-leak-patch-size;</token>:</term> <listitem> @@ -33,7 +33,7 @@ <para>MD5 sum: <literal>&bc-memory-leak-patch-md5;</literal></para> </listitem> </varlistentry> - +--> <varlistentry> <term>Bzip2 Documentation Patch - <token>&bzip2-docs-patch-size;</token>:</term> <listitem> diff --git a/chapter06/bc.xml b/chapter06/bc.xml index 31794bb80..3c585547e 100644 --- a/chapter06/bc.xml +++ b/chapter06/bc.xml @@ -41,9 +41,20 @@ <sect2 role="installation"> <title>Installation of Bc</title> - <para>First, fix some minor memory leaks in the code:</para> - -<screen><userinput remap="pre">patch -Np1 -i ../&bc-memory-leak-patch;</userinput></screen> + <para>First, change an internal script to use <command>sed</command> instead + of <command>ed</command>:</para> + +<screen><userinput remap="pre">cat > bc/fix-libmath_h << "EOF" +#! /bin/bash +sed -e '1 s/^/{"/' \ + -e 's/$/",/' \ + -e '2,$ s/^/"/' \ + -e '$ d' \ + -i libmath.h + +sed -e '$ s/$/0}/' \ + -i libmath.h +EOF</userinput></screen> <para>Create a temporary symbolic link so the package can find the readline library and confirm that its required libncurses diff --git a/general.ent b/general.ent index ef6c820f3..238a061c1 100644 --- a/general.ent +++ b/general.ent @@ -1,13 +1,13 @@ -<!ENTITY version "SVN-20170331"> +<!ENTITY version "SVN-20170403"> <!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 "20170331-systemd"> +<!ENTITY versiond "20170403-systemd"> <!ENTITY short-versiond "systemd"> <!ENTITY generic-versiond "systemd"> -<!ENTITY releasedate "March 31, 2017"> +<!ENTITY releasedate "April 3, 2017"> <!ENTITY copyrightdate "1999-2017"><!-- jhalfs needs a literal dash, not – --> <!ENTITY milestone "8.1"> diff --git a/packages.ent b/packages.ent index eefe7722d..0004cfe72 100644 --- a/packages.ent +++ b/packages.ent @@ -50,10 +50,10 @@ <!ENTITY bash-ch6-du "56 MB"> <!ENTITY bash-ch6-sbu "1.7 SBU"> -<!ENTITY bc-version "1.06.95"> -<!ENTITY bc-size "288 KB"> -<!ENTITY bc-url "&alpha-gnu;bc/bc-&bc-version;.tar.bz2"> -<!ENTITY bc-md5 "5126a721b73f97d715bb72c13c889035"> +<!ENTITY bc-version "1.07"> +<!ENTITY bc-size "409 KB"> +<!ENTITY bc-url "&gnu;bc/bc-&bc-version;.tar.gz"> +<!ENTITY bc-md5 "e91638a947beadabf4d7770bdbb3d512"> <!ENTITY bc-home "&gnu-software;bc/"> <!ENTITY bc-ch6-du "3.6 MB"> <!ENTITY bc-ch6-sbu "0.1 SBU"> diff --git a/patches.ent b/patches.ent index 620dd5c68..7587bc567 100644 --- a/patches.ent +++ b/patches.ent @@ -6,9 +6,11 @@ <!ENTITY bash-fixes-patch-md5 "e3d5bf23a4e5628680893d46e6ff286e"> <!ENTITY bash-fixes-patch-size "17 KB"> +<!-- <!ENTITY bc-memory-leak-patch "bc-&bc-version;-memory_leak-1.patch"> <!ENTITY bc-memory-leak-patch-md5 "877e81fba316fe487ec23501059d54b8"> <!ENTITY bc-memory-leak-patch-size "1.4 KB"> +--> <!ENTITY bzip2-docs-patch "bzip2-&bzip2-version;-install_docs-1.patch"> <!ENTITY bzip2-docs-patch-md5 "6a5ac7e89b791aae556de0f745916f7f"> |