diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 129e2fe58..5a8afb03a 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -37,6 +37,16 @@
-->
+
+ 2009-10-12
+
+
+ [matthew] Upgraded to Gzip-1.3.13. Fixes
+ #2500.
+
+
+
+
2009-09-29
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 4ec15d835..93d10a6ac 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -94,9 +94,9 @@
-
+
@@ -222,6 +222,11 @@
coreutils-7.6-uname-1.patch
+
+ gzip-1.3.13-zdiff-1.patch
+
+
+
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index feef01888..7dffd7e9e 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -122,6 +122,14 @@
+
+ Gzip Zdiff Patch - &gzip-zdiff-patch-size;:
+
+ Download:
+ MD5 sum: &gzip-zdiff-patch-md5;
+
+
+
Inetutils No-Server-Man-Pages Patch - &inetutils-man_pages-patch-size;:
diff --git a/chapter05/gzip.xml b/chapter05/gzip.xml
index 0d55b6d75..24fb488e8 100644
--- a/chapter05/gzip.xml
+++ b/chapter05/gzip.xml
@@ -43,15 +43,6 @@
Installation of Gzip
- The version of the function futimens
used
- by Gzip is incompatible with the version that current
- Glibc provides, so we'll rename the function:
-
-for file in gzip.c lib/utimens.{c,h} ; do \
- cp -v $file{,.orig}
- sed 's/futimens/gl_&/' $file.orig > $file
-done
-
Prepare Gzip for compilation:
./configure --prefix=/tools
diff --git a/chapter06/gzip.xml b/chapter06/gzip.xml
index 4447704ab..467471388 100644
--- a/chapter06/gzip.xml
+++ b/chapter06/gzip.xml
@@ -41,16 +41,10 @@
Installation of Gzip
- The version of the function futimens
used
- by Gzip is incompatible with the version that current
- Glibc provides, so we'll rename the function:
+ Fix a bug in gzip, whereby zdiff doesn't work correctly when invoked
+ on two compressed inputs:
-sed -i 's/futimens/gl_&/' gzip.c lib/utimens.{c,h}
-
- There is also a bug in the zdiff script that
- needs to be fixed:
-
-sed -i 's/5 -)/5 - >\&3)/' zdiff.in
+patch -Np1 -i ../&gzip-zdiff-patch;
Prepare Gzip for compilation:
diff --git a/general.ent b/general.ent
index 8b61419fa..54513ed81 100644
--- a/general.ent
+++ b/general.ent
@@ -1,6 +1,6 @@
-
-
+
+
diff --git a/packages.ent b/packages.ent
index 1a0a9711b..4ee93d69d 100644
--- a/packages.ent
+++ b/packages.ent
@@ -240,10 +240,10 @@
-
-
+
+
-
+
diff --git a/patches.ent b/patches.ent
index 80918480c..c1c538eb3 100644
--- a/patches.ent
+++ b/patches.ent
@@ -64,6 +64,11 @@
+
+
+
+
+