diff options
| -rw-r--r-- | chapter01/changelog.xml | 10 | ||||
| -rw-r--r-- | chapter03/patches.xml | 24 | ||||
| -rw-r--r-- | chapter05/glibc.xml | 7 | ||||
| -rw-r--r-- | chapter06/glibc.xml | 10 | ||||
| -rw-r--r-- | general.ent | 4 | ||||
| -rw-r--r-- | packages.ent | 6 | ||||
| -rw-r--r-- | patches.ent | 12 |
7 files changed, 16 insertions, 57 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index f9aa0cdb5..cedae73db 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -37,6 +37,16 @@ --> <listitem> + <para>2010-12-14</para> + <itemizedlist> + <listitem> + <para>[matthew] Upgrade to Glibc-2.12.2. Fixes + <ulink url="&lfs-ticket-root;2804">#2804</ulink>.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>2010-12-13</para> <itemizedlist> <listitem> diff --git a/chapter03/patches.xml b/chapter03/patches.xml index f9306b7c5..838067a86 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -82,30 +82,6 @@ </listitem> </varlistentry> - <varlistentry> - <term>Glibc LD Audit Patch - <token>&glibc-ldaudit-patch-size;</token>:</term> - <listitem> - <para>Download: <ulink url="&patches-root;&glibc-ldaudit-patch;"/></para> - <para>MD5 sum: <literal>&glibc-ldaudit-patch-md5;</literal></para> - </listitem> - </varlistentry> - - <varlistentry> - <term>Glibc Makefile Fix Patch - <token>&glibc-makefile_fix-patch-size;</token>:</term> - <listitem> - <para>Download: <ulink url="&patches-root;&glibc-makefile_fix-patch;"/></para> - <para>MD5 sum: <literal>&glibc-makefile_fix-patch-md5;</literal></para> - </listitem> - </varlistentry> - - <varlistentry> - <term>Glibc Origin Patch - <token>&glibc-origin-patch-size;</token>:</term> - <listitem> - <para>Download: <ulink url="&patches-root;&glibc-origin-patch;"/></para> - <para>MD5 sum: <literal>&glibc-origin-patch-md5;</literal></para> - </listitem> - </varlistentry> - <!-- <varlistentry> <term>GRUB Disk Geometry Patch - <token>&grub-geometry-patch-size;</token>:</term> diff --git a/chapter05/glibc.xml b/chapter05/glibc.xml index f9481cf73..a7ad06fe7 100644 --- a/chapter05/glibc.xml +++ b/chapter05/glibc.xml @@ -45,12 +45,7 @@ <para>Fix a bug that prevents Glibc from building with GCC-&gcc-version;:</para> -<screen><userinput remap="pre">patch -Np1 -i ../&glibc-gcc_fix-patch;</userinput></screen> - - <para>Fix a bug that prevents Glibc from building with versions of Make - newer than 3.81.</para> - -<screen><userinput remap="pre">patch -Np1 -i ../&glibc-makefile_fix-patch;</userinput></screen> + <screen><userinput remap="pre">patch -Np1 -i ../&glibc-gcc_fix-patch;</userinput></screen> <para>The Glibc documentation recommends building Glibc outside of the source directory in a dedicated build directory:</para> diff --git a/chapter06/glibc.xml b/chapter06/glibc.xml index b727ee98f..693d0d993 100644 --- a/chapter06/glibc.xml +++ b/chapter06/glibc.xml @@ -96,16 +96,6 @@ unset DL</userinput></screen> <screen><userinput remap="pre">patch -Np1 -i ../&glibc-gcc_fix-patch;</userinput></screen> - <para>Fix a bug that prevents Glibc from building with versions of Make - newer than 3.81.</para> - -<screen><userinput remap="pre">patch -Np1 -i ../&glibc-makefile_fix-patch;</userinput></screen> - - <para>Apply 2 patches that fix security vulnerabilities in this version of Glibc:</para> - -<screen><userinput remap="pre">patch -Np1 -i ../&glibc-ldaudit-patch; -patch -Np1 -i ../&glibc-origin-patch;</userinput></screen> - <para>The Glibc documentation recommends building Glibc outside of the source directory in a dedicated build directory:</para> diff --git a/general.ent b/general.ent index 8059a97e6..a53513ec2 100644 --- a/general.ent +++ b/general.ent @@ -1,5 +1,5 @@ -<!ENTITY version "SVN-20101213"> -<!ENTITY releasedate "December 13, 2010"> +<!ENTITY version "SVN-20101214"> +<!ENTITY releasedate "December 14, 2010"> <!ENTITY copyrightdate "1999-2010"><!-- jhalfs needs a literal dash, not – --> <!ENTITY milestone "6.8"> <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> diff --git a/packages.ent b/packages.ent index bc4f64304..318063b01 100644 --- a/packages.ent +++ b/packages.ent @@ -193,10 +193,10 @@ <!ENTITY gettext-ch6-du "125 MB"> <!ENTITY gettext-ch6-sbu "5.8 SBU"> -<!ENTITY glibc-version "2.12.1"> -<!ENTITY glibc-size "15,300 KB"> +<!ENTITY glibc-version "2.12.2"> +<!ENTITY glibc-size "15,301 KB"> <!ENTITY glibc-url "&gnu;glibc/glibc-&glibc-version;.tar.bz2"> -<!ENTITY glibc-md5 "be0ea9e587f08c87604fe10a91f72afd"> +<!ENTITY glibc-md5 "903fcfa547df2f453476800e0838fe52"> <!ENTITY glibc-home "&gnu-software;libc/"> <!ENTITY glibc-ch5-du "371 MB"> <!ENTITY glibc-ch5-sbu "6.9 SBU"> diff --git a/patches.ent b/patches.ent index 649eadf89..7e476a009 100644 --- a/patches.ent +++ b/patches.ent @@ -44,18 +44,6 @@ <!ENTITY glibc-gcc_fix-patch-md5 "d1f28cb98acb9417fe52596908bbb9fd"> <!ENTITY glibc-gcc_fix-patch-size "2.5 KB"> -<!ENTITY glibc-ldaudit-patch "glibc-&glibc-version;-ld_audit_fix-1.patch"> -<!ENTITY glibc-ldaudit-patch-md5 "10e1bae28413ec9086f63abba34a1e2e"> -<!ENTITY glibc-ldaudit-patch-size "7.9 KB"> - -<!ENTITY glibc-makefile_fix-patch "glibc-&glibc-version;-makefile_fix-1.patch"> -<!ENTITY glibc-makefile_fix-patch-md5 "0ef634ac78e582f45d0e7643bfda7505"> -<!ENTITY glibc-makefile_fix-patch-size "1 KB"> - -<!ENTITY glibc-origin-patch "glibc-&glibc-version;-origin_fix-1.patch"> -<!ENTITY glibc-origin-patch-md5 "aa81dd9594648707e86c764ce8b2e1c8"> -<!ENTITY glibc-origin-patch-size "2.9 KB"> - <!ENTITY grub-inode-patch "grub-&grub-version;-256byte_inode-1.patch"> <!ENTITY grub-inode-patch-md5 "2482bef9c1866b4045767a56268ba673"> |