Forráskód Böngészése

Upgrade to Gzip-1.3.13. Fixes #2500.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9080 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Matthew Burgess 16 éve
szülő
commit
b417b18d56
8 módosított fájl, 38 hozzáadás és 25 törlés
  1. 10 0
      chapter01/changelog.xml
  2. 7 2
      chapter01/whatsnew.xml
  3. 8 0
      chapter03/patches.xml
  4. 0 9
      chapter05/gzip.xml
  5. 3 9
      chapter06/gzip.xml
  6. 2 2
      general.ent
  7. 3 3
      packages.ent
  8. 5 0
      patches.ent

+ 10 - 0
chapter01/changelog.xml

@@ -37,6 +37,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>

+ 7 - 2
chapter01/whatsnew.xml

@@ -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>

+ 8 - 0
chapter03/patches.xml

@@ -122,6 +122,14 @@
       </listitem>
     </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>

+ 0 - 9
chapter05/gzip.xml

@@ -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_&amp;/' $file.orig &gt; $file
-done</userinput></screen>
-
     <para>Prepare Gzip for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/tools</userinput></screen>

+ 3 - 9
chapter06/gzip.xml

@@ -41,16 +41,10 @@
   <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_&amp;/' gzip.c lib/utimens.{c,h}</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 - >\&amp;3)/' zdiff.in</userinput></screen>
+<screen><userinput remap="pre">patch -Np1 -i ../&gzip-zdiff-patch;</userinput></screen>
 
     <para>Prepare Gzip for compilation:</para>
 

+ 2 - 2
general.ent

@@ -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 &ndash; -->
 <!ENTITY milestone "7.0">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->

+ 3 - 3
packages.ent

@@ -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">

+ 5 - 0
patches.ent

@@ -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">