r952 - branches/2.4-branch/BOOK branches/2.4-branch/BOOK/chapter04 branches/2.4-branch/BOOK/chapter06 trunk/BOOK trunk/BOOK/chapter04 trunk/BOOK/chapter06

robert at linuxfromscratch.org robert at linuxfromscratch.org
Thu Dec 28 20:28:14 PST 2006


Author: robert
Date: 2006-12-28 21:28:14 -0700 (Thu, 28 Dec 2006)
New Revision: 952

Modified:
   branches/2.4-branch/BOOK/chapter04/patches.xml
   branches/2.4-branch/BOOK/chapter06/gzip.xml
   branches/2.4-branch/BOOK/patches.ent
   trunk/BOOK/chapter04/patches.xml
   trunk/BOOK/chapter06/gzip.xml
   trunk/BOOK/patches.ent
Log:
removed Gzip patches

Modified: branches/2.4-branch/BOOK/chapter04/patches.xml
===================================================================
--- branches/2.4-branch/BOOK/chapter04/patches.xml	2006-12-29 04:19:36 UTC (rev 951)
+++ branches/2.4-branch/BOOK/chapter04/patches.xml	2006-12-29 04:28:14 UTC (rev 952)
@@ -227,30 +227,6 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Gzip Hardened Tmp Patch - &gzip-hardened_tmp-patch-size;:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&gzip-hardened_tmp-patch;"/></para>
-        <para>MD5 sum: <literal>&gzip-hardened_tmp-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Gzip Script Dir Patch - &gzip-scriptsdir-patch-size;:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&gzip-scriptsdir-patch;"/></para>
-        <para>MD5 sum: <literal>&gzip-scriptsdir-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Gzip Security Patch - &gzip-security_fixes-patch-size;:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&gzip-security_fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&gzip-security_fixes-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>KBD Backspace Patch - &kbd-backspace-patch-size;:</term>
       <listitem>
         <para>Download: <ulink url="&patches-root;&kbd-backspace-patch;"/></para>

Modified: branches/2.4-branch/BOOK/chapter06/gzip.xml
===================================================================
--- branches/2.4-branch/BOOK/chapter06/gzip.xml	2006-12-29 04:19:36 UTC (rev 951)
+++ branches/2.4-branch/BOOK/chapter06/gzip.xml	2006-12-29 04:28:14 UTC (rev 952)
@@ -35,45 +35,17 @@
   <sect2 role="installation">
     <title>Installation of Gzip</title>
 
-    <para>Gzip has 2 known security vulnerabilities.  The following patch
-    addresses both of them:</para>
+    <para>Prepare Gzip for compilation:</para>
 
-<screen><userinput>patch -Np1 -i ../&gzip-security_fixes-patch;</userinput></screen>
+<screen><userinput>env DEFS=NO_ASM ./configure --prefix=/usr </userinput></screen>
 
-    <para role="hardened_tmp">This patch modifies the <command>gzexe</command>,
-    <command>zdiff</command>, and <command>znew</command> scripts to use temporary
-    files in a paranoid way, including using <command>mktemp</command> instead of
-    shell routines:</para>
+    <para>The <command>gzexe</command> script has the location of the
+    <command>gzip</command> binary hard-wired into it. Because the
+    location of the binary is changed later, the following command ensures
+    that the new location gets placed into the script:</para>
 
-<screen role="hardened_tmp"><userinput>patch -Np1 -i ../&gzip-hardened_tmp-patch;</userinput></screen>
+<screen><userinput>sed 's@"BINDIR"@/bin at g' -i.orig gzexe.in</userinput></screen>
 
-    <para>This patch adds <parameter>--with-scripts-dir</parameter> to
-    <command>configure</command>, and uses <command>ln -s</command> when
-    installing command aliases. The <parameter>--with-scripts-dir</parameter>
-    switch defaults to <envar>EPREFIX</envar>, so it does not need to actually
-    be used:</para>
-
-<screen><userinput>patch -Np1 -i ../&gzip-scriptsdir-patch;</userinput></screen>
-
-    <para>The scriptsdir patch requires the build scripts to be reconfigured and
-    updated, do that with the following commands:</para>
-
-<screen><userinput>aclocal -I m4
-autoconf
-automake</userinput></screen>
-
-    <para>The <command>gzexe</command> command calls <command>tail</command>
-    with options that do not conform to newer versions of the POSIX standard,
-    and therefore are not accepted by current versions of Coreutils. Fix this
-    problem by issuing the following command:</para>
-
-<screen><userinput>sed 's/tail +/tail -n +/' -i.orig gzexe.in</userinput></screen>
-
-    <para>Prepare Gzip for compilation:</para>
-
-<screen><userinput>env DEFS=NO_ASM ./configure --prefix=/usr \
-    --bindir=/bin</userinput></screen>
-
     <para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>

Modified: branches/2.4-branch/BOOK/patches.ent
===================================================================
--- branches/2.4-branch/BOOK/patches.ent	2006-12-29 04:19:36 UTC (rev 951)
+++ branches/2.4-branch/BOOK/patches.ent	2006-12-29 04:28:14 UTC (rev 952)
@@ -110,18 +110,6 @@
 <!ENTITY grsecurity-patch-md5 "a8716df84c19673bda2e8764abaa01e7">
 <!ENTITY grsecurity-patch-size "160 KB">
 
-<!ENTITY gzip-hardened_tmp-patch "gzip-&gzip-version;-hardened_tmp-1.patch">
-<!ENTITY gzip-hardened_tmp-patch-md5 "1253a0ddd75bca95aa66aaf0369b7846">
-<!ENTITY gzip-hardened_tmp-patch-size "8 KB">
-
-<!ENTITY gzip-scriptsdir-patch "gzip-&gzip-version;-scriptsdir-1.patch">
-<!ENTITY gzip-scriptsdir-patch-md5 "41c7cf98bbba817047231429b960b046">
-<!ENTITY gzip-scriptsdir-patch-size "8 KB">
-
-<!ENTITY gzip-security_fixes-patch "gzip-&gzip-version;-security_fixes-1.patch">
-<!ENTITY gzip-security_fixes-patch-md5 "f107844f01fc49446654ae4a8f8a0728">
-<!ENTITY gzip-security_fixes-patch-size "2 KB">
-
 <!ENTITY kbd-backspace-patch "kbd-&kbd-version;-backspace-1.patch">
 <!ENTITY kbd-backspace-patch-md5 "692c88bb76906d99cc20446fadfb6499">
 <!ENTITY kbd-backspace-patch-size "11 KB">

Modified: trunk/BOOK/chapter04/patches.xml
===================================================================
--- trunk/BOOK/chapter04/patches.xml	2006-12-29 04:19:36 UTC (rev 951)
+++ trunk/BOOK/chapter04/patches.xml	2006-12-29 04:28:14 UTC (rev 952)
@@ -227,30 +227,6 @@
     </varlistentry>
 
     <varlistentry>
-      <term>Gzip Hardened Tmp Patch - &gzip-hardened_tmp-patch-size;:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&gzip-hardened_tmp-patch;"/></para>
-        <para>MD5 sum: <literal>&gzip-hardened_tmp-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Gzip Script Dir Patch - &gzip-scriptsdir-patch-size;:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&gzip-scriptsdir-patch;"/></para>
-        <para>MD5 sum: <literal>&gzip-scriptsdir-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term>Gzip Security Patch - &gzip-security_fixes-patch-size;:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&gzip-security_fixes-patch;"/></para>
-        <para>MD5 sum: <literal>&gzip-security_fixes-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
-    <varlistentry>
       <term>KBD Backspace Patch - &kbd-backspace-patch-size;:</term>
       <listitem>
         <para>Download: <ulink url="&patches-root;&kbd-backspace-patch;"/></para>

Modified: trunk/BOOK/chapter06/gzip.xml
===================================================================
--- trunk/BOOK/chapter06/gzip.xml	2006-12-29 04:19:36 UTC (rev 951)
+++ trunk/BOOK/chapter06/gzip.xml	2006-12-29 04:28:14 UTC (rev 952)
@@ -35,45 +35,18 @@
   <sect2 role="installation">
     <title>Installation of Gzip</title>
 
-    <para>Gzip has 2 known security vulnerabilities.  The following patch
-    addresses both of them:</para>
-
-<screen><userinput>patch -Np1 -i ../&gzip-security_fixes-patch;</userinput></screen>
-
-    <para role="hardened_tmp">This patch modifies the <command>gzexe</command>,
-    <command>zdiff</command>, and <command>znew</command> scripts to use temporary
-    files in a paranoid way, including using <command>mktemp</command> instead of
-    shell routines:</para>
-
-<screen role="hardened_tmp"><userinput>patch -Np1 -i ../&gzip-hardened_tmp-patch;</userinput></screen>
-
-    <para>This patch adds <parameter>--with-scripts-dir</parameter> to
-    <command>configure</command>, and uses <command>ln -s</command> when
-    installing command aliases. The <parameter>--with-scripts-dir</parameter>
-    switch defaults to <envar>EPREFIX</envar>, so it does not need to actually
-    be used:</para>
-
-<screen><userinput>patch -Np1 -i ../&gzip-scriptsdir-patch;</userinput></screen>
-
-    <para>The scriptsdir patch requires the build scripts to be reconfigured and
-    updated, do that with the following commands:</para>
-
-<screen><userinput>aclocal -I m4
-autoconf
-automake</userinput></screen>
-
-    <para>The <command>gzexe</command> command calls <command>tail</command>
-    with options that do not conform to newer versions of the POSIX standard,
-    and therefore are not accepted by current versions of Coreutils. Fix this
-    problem by issuing the following command:</para>
-
-<screen><userinput>sed 's/tail +/tail -n +/' -i.orig gzexe.in</userinput></screen>
-
     <para>Prepare Gzip for compilation:</para>
 
 <screen><userinput>env DEFS=NO_ASM ./configure --prefix=/usr \
     --bindir=/bin</userinput></screen>
 
+    <para>The <command>gzexe</command> script has the location of the
+    <command>gzip</command> binary hard-wired into it. Because the
+    location of the binary is changed later, the following command ensures
+    that the new location gets placed into the script:</para>
+
+<screen><userinput>sed 's@"BINDIR"@/bin at g' -i.orig gzexe.in</userinput></screen>
+
     <para>Compile the package:</para>
 
 <screen><userinput>make</userinput></screen>

Modified: trunk/BOOK/patches.ent
===================================================================
--- trunk/BOOK/patches.ent	2006-12-29 04:19:36 UTC (rev 951)
+++ trunk/BOOK/patches.ent	2006-12-29 04:28:14 UTC (rev 952)
@@ -106,18 +106,6 @@
 <!ENTITY grsecurity-patch-md5 "df7aaaa329b360de5d7fa7ca0e6f9ced">
 <!ENTITY grsecurity-patch-size "188 KB">
 
-<!ENTITY gzip-hardened_tmp-patch "gzip-&gzip-version;-hardened_tmp-1.patch">
-<!ENTITY gzip-hardened_tmp-patch-md5 "1253a0ddd75bca95aa66aaf0369b7846">
-<!ENTITY gzip-hardened_tmp-patch-size "8 KB">
-
-<!ENTITY gzip-scriptsdir-patch "gzip-&gzip-version;-scriptsdir-1.patch">
-<!ENTITY gzip-scriptsdir-patch-md5 "41c7cf98bbba817047231429b960b046">
-<!ENTITY gzip-scriptsdir-patch-size "8 KB">
-
-<!ENTITY gzip-security_fixes-patch "gzip-&gzip-version;-security_fixes-1.patch">
-<!ENTITY gzip-security_fixes-patch-md5 "f107844f01fc49446654ae4a8f8a0728">
-<!ENTITY gzip-security_fixes-patch-size "2 KB">
-
 <!ENTITY kbd-backspace-patch "kbd-&kbd-version;-backspace-1.patch">
 <!ENTITY kbd-backspace-patch-md5 "692c88bb76906d99cc20446fadfb6499">
 <!ENTITY kbd-backspace-patch-size "11 KB">




More information about the hlfs-book mailing list