Author: matthew
Date: 2009-10-12 14:30:47 -0600 (Mon, 12 Oct 2009)
New Revision: 9080
Modified:
trunk/BOOK/chapter01/changelog.xml
trunk/BOOK/chapter01/whatsnew.xml
trunk/BOOK/chapter03/patches.xml
trunk/BOOK/chapter05/gzip.xml
trunk/BOOK/chapter06/gzip.xml
trunk/BOOK/general.ent
trunk/BOOK/packages.ent
trunk/BOOK/patches.ent
Log:
Upgrade to Gzip-1.3.13. Fixes #2500.
Modified: trunk/BOOK/chapter01/changelog.xml
===================================================================
--- trunk/BOOK/chapter01/changelog.xml 2009-09-29 19:15:50 UTC (rev 9079)
+++ trunk/BOOK/chapter01/changelog.xml 2009-10-12 20:30:47 UTC (rev 9080)
@@ -38,6 +38,16 @@
-->
<listitem>
+ <para>2009-10-12</para>
+ <itemizedlist>
+ <listitem>
+ <para>[matthew] Upgraded to Gzip-1.3.13. Fixes
+ <ulink url="&lfs-ticket-root;2500">#2500</ulink>.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2009-09-29</para>
<itemizedlist>
<listitem>
Modified: trunk/BOOK/chapter01/whatsnew.xml
===================================================================
--- trunk/BOOK/chapter01/whatsnew.xml 2009-09-29 19:15:50 UTC (rev 9079)
+++ trunk/BOOK/chapter01/whatsnew.xml 2009-10-12 20:30:47 UTC (rev 9080)
@@ -94,9 +94,9 @@
<!--<listitem>
<para>GRUB &grub-version;</para>
</listitem>-->
- <!--<listitem>
+ <listitem>
<para>Gzip &gzip-version;</para>
- </listitem>-->
+ </listitem>
<!--<listitem>
<para>IANA-Etc &iana-etc-version;</para>
</listitem>-->
@@ -222,6 +222,11 @@
<para>coreutils-7.6-uname-1.patch</para>
</listitem>
+ <listitem>
+ <para>gzip-1.3.13-zdiff-1.patch</para>
+ </listitem>
+
+
</itemizedlist>
<itemizedlist>
Modified: trunk/BOOK/chapter03/patches.xml
===================================================================
--- trunk/BOOK/chapter03/patches.xml 2009-09-29 19:15:50 UTC (rev 9079)
+++ trunk/BOOK/chapter03/patches.xml 2009-10-12 20:30:47 UTC (rev 9080)
@@ -123,6 +123,14 @@
</varlistentry>
<varlistentry>
+ <term>Gzip Zdiff Patch - <token>&gzip-zdiff-patch-size;</token>:</term>
+ <listitem>
+ <para>Download: <ulink url="&patches-root;&gzip-zdiff-patch;"/></para>
+ <para>MD5 sum: <literal>&gzip-zdiff-patch-md5;</literal></para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>Inetutils No-Server-Man-Pages Patch -
<token>&inetutils-man_pages-patch-size;</token>:</term>
<listitem>
<para>Download: <ulink
url="&patches-root;&inetutils-man_pages-patch;"/></para>
Modified: trunk/BOOK/chapter05/gzip.xml
===================================================================
--- trunk/BOOK/chapter05/gzip.xml 2009-09-29 19:15:50 UTC (rev 9079)
+++ trunk/BOOK/chapter05/gzip.xml 2009-10-12 20:30:47 UTC (rev 9080)
@@ -43,15 +43,6 @@
<sect2 role="installation">
<title>Installation of Gzip</title>
- <para>The version of the function <quote>futimens</quote> used
- by Gzip is incompatible with the version that current
- Glibc provides, so we'll rename the function:</para>
-
-<screen><userinput remap="pre">for file in gzip.c lib/utimens.{c,h} ; do \
- cp -v $file{,.orig}
- sed 's/futimens/gl_&/' $file.orig > $file
-done</userinput></screen>
-
<para>Prepare Gzip for compilation:</para>
<screen><userinput remap="configure">./configure
--prefix=/tools</userinput></screen>
Modified: trunk/BOOK/chapter06/gzip.xml
===================================================================
--- trunk/BOOK/chapter06/gzip.xml 2009-09-29 19:15:50 UTC (rev 9079)
+++ trunk/BOOK/chapter06/gzip.xml 2009-10-12 20:30:47 UTC (rev 9080)
@@ -41,17 +41,11 @@
<sect2 role="installation">
<title>Installation of Gzip</title>
- <para>The version of the function <quote>futimens</quote> used
- by Gzip is incompatible with the version that current
- Glibc provides, so we'll rename the function:</para>
+ <para>Fix a bug in gzip, whereby zdiff doesn't work correctly when invoked
+ on two compressed inputs:</para>
-<screen><userinput remap="pre">sed -i 's/futimens/gl_&/' gzip.c
lib/utimens.{c,h}</userinput></screen>
+<screen><userinput remap="pre">patch -Np1 -i
../&gzip-zdiff-patch;</userinput></screen>
- <para>There is also a bug in the <filename>zdiff</filename> script that
- needs to be fixed:</para>
-
-<screen><userinput remap="pre">sed -i 's/5 -)/5 - >\&3)/'
zdiff.in</userinput></screen>
-
<para>Prepare Gzip for compilation:</para>
<screen><userinput remap="configure">./configure --prefix=/usr
--bindir=/bin</userinput></screen>
Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent 2009-09-29 19:15:50 UTC (rev 9079)
+++ trunk/BOOK/general.ent 2009-10-12 20:30:47 UTC (rev 9080)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY version "SVN-20090929">
-<!ENTITY releasedate "September 29, 2009">
+<!ENTITY version "SVN-20091012">
+<!ENTITY releasedate "October 12, 2009">
<!ENTITY copyrightdate "1999-2009"><!-- jhalfs needs a literal dash, not
– -->
<!ENTITY milestone "7.0">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or
"x.y[-pre{x}]" -->
Modified: trunk/BOOK/packages.ent
===================================================================
--- trunk/BOOK/packages.ent 2009-09-29 19:15:50 UTC (rev 9079)
+++ trunk/BOOK/packages.ent 2009-10-12 20:30:47 UTC (rev 9080)
@@ -240,10 +240,10 @@
<!ENTITY grub-ch6-du "10.2 MB">
<!ENTITY grub-ch6-sbu "0.2 SBU">
-<!ENTITY gzip-version "1.3.12">
-<!ENTITY gzip-size "451 KB">
+<!ENTITY gzip-version "1.3.13">
+<!ENTITY gzip-size "795 KB">
<!ENTITY gzip-url "&gnu;gzip/gzip-&gzip-version;.tar.gz">
-<!ENTITY gzip-md5 "b5bac2d21840ae077e0217bc5e4845b1">
+<!ENTITY gzip-md5 "c54a31b93e865f6a4410b2dc64662706">
<!ENTITY gzip-home "http://www.gzip.org/";>
<!ENTITY gzip-ch5-du "3.3 MB">
<!ENTITY gzip-ch5-sbu "less than 0.1 SBU">
Modified: trunk/BOOK/patches.ent
===================================================================
--- trunk/BOOK/patches.ent 2009-09-29 19:15:50 UTC (rev 9079)
+++ trunk/BOOK/patches.ent 2009-10-12 20:30:47 UTC (rev 9080)
@@ -64,6 +64,11 @@
<!ENTITY grub-geometry-patch-size "28 KB">
+<!ENTITY gzip-zdiff-patch "gzip-&gzip-version;-zdiff-1.patch">
+<!ENTITY gzip-zdiff-patch-md5 "3736ea34a678e6411bbdc4b2797eb5be">
+<!ENTITY gzip-zdiff-patch-size "17.5 KB">
+
+
<!ENTITY inetutils-man_pages-patch
"inetutils-&inetutils-version;-no_server_man_pages-1.patch">
<!ENTITY inetutils-man_pages-patch-md5 "fffe02c2f93fec7911e57393fd927a9d">
<!ENTITY inetutils-man_pages-patch-size "5.4 KB">
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page
