r5678 - in trunk/BOOK: . general/sysutils introduction/welcome postlfs/security

bdubbs at linuxfromscratch.org bdubbs at linuxfromscratch.org
Mon Feb 20 22:11:07 PST 2006


Author: bdubbs
Date: 2006-02-20 23:11:05 -0700 (Mon, 20 Feb 2006)
New Revision: 5678

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/sysutils/unzip.xml
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/postlfs/security/openssl.xml
Log:
Simplified unzip instructions

Modified: trunk/BOOK/general/sysutils/unzip.xml
===================================================================
--- trunk/BOOK/general/sysutils/unzip.xml	2006-02-13 01:07:50 UTC (rev 5677)
+++ trunk/BOOK/general/sysutils/unzip.xml	2006-02-21 06:11:05 UTC (rev 5678)
@@ -69,22 +69,6 @@
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/unzip-&unzip-version;-fix_Makefile-1.patch"/></para>
-      </listitem>
-      <listitem>
-        <para>Required patch: <ulink
-        url="&patch-root;/unzip-&unzip-version;-fix_libz-1.patch"/></para>
-      </listitem>
-      <listitem>
-        <para>Recommended patch: <ulink
-        url="&patch-root;/unzip-&unzip-version;-dont_make_noise-1.patch"/></para>
-      </listitem>
-    </itemizedlist>
-
   </sect2>
 
   <sect2 role="installation">
@@ -93,20 +77,14 @@
     <para>Install <application>UnZip</application> by running the following
     commands:</para>
 
-<screen><userinput>patch -Np1 -i ../unzip-&unzip-version;-fix_Makefile-1.patch &&
-patch -Np1 -i ../unzip-&unzip-version;-fix_libz-1.patch &&
-patch -Np1 -i ../unzip-&unzip-version;-dont_make_noise-1.patch &&
-cp -v unix/Makefile . &&
-make prefix=/usr LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 linux &&
-make prefix=/usr LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 linux_shlibz</userinput></screen>
+<screen><userinput>make -f unix/Makefile LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 linux</userinput></screen> 
 
     <para>To test the results, issue: <command>LD_LIBRARY_PATH=$PWD
     make check</command>.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>make prefix=/usr install &&
-cp -v -d libunzip.so* /usr/lib</userinput></screen>
+<screen role="root"><userinput>make prefix=/usr install</userinput></screen>
 
   </sect2>
 
@@ -122,10 +100,6 @@
     This sets the compilation flags to allow <application>UnZip</application>
     to handle files upto 4 GB.</para>
 
-    <para><command>make ... linux_shlibz</command>: Build shared
-    <filename>libunzip</filename> and link <application>UnZip</application>
-    against it and <application>zlib</application>.</para>
-
   </sect2>
 
   <sect2 role="content">

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2006-02-13 01:07:50 UTC (rev 5677)
+++ trunk/BOOK/general.ent	2006-02-21 06:11:05 UTC (rev 5678)
@@ -1,8 +1,8 @@
-<!ENTITY day          "13">                   <!-- Always 2 digits -->
+<!ENTITY day          "21">                   <!-- Always 2 digits -->
 <!ENTITY month        "02">                   <!-- Always 2 digits -->
 <!ENTITY year         "2006">
 <!ENTITY version      "svn-&year;&month;&day;">
-<!ENTITY releasedate  "February &day;th, &year;">
+<!ENTITY releasedate  "February &day;st, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- version|stable|testing|unstable|development] -->

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2006-02-13 01:07:50 UTC (rev 5677)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2006-02-21 06:11:05 UTC (rev 5678)
@@ -40,6 +40,15 @@
     </listitem>
 
 -->
+    
+    <listitem>
+      <para>February 21st, 2006</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Simplified unzip instructions.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>
       <para>February 13th, 2006</para>

Modified: trunk/BOOK/postlfs/security/openssl.xml
===================================================================
--- trunk/BOOK/postlfs/security/openssl.xml	2006-02-13 01:07:50 UTC (rev 5677)
+++ trunk/BOOK/postlfs/security/openssl.xml	2006-02-21 06:11:05 UTC (rev 5678)
@@ -75,6 +75,9 @@
     <para role="optional"><xref linkend="bc"/> (recommended
     if you run the test suite during the build)</para>
 
+    <bridgehead renderas="sect3" condition="html" role="usernotes">User Notes:
+    <ulink url='&blfs-wiki;/OpenSSL'/></bridgehead>
+  
   </sect2>
 
   <sect2 role="installation">
@@ -94,9 +97,6 @@
 <screen role="root"><userinput>make MANDIR=/usr/share/man install &&
 cp -v -r certs /etc/ssl</userinput></screen>
 
-  <para condition="html" role="usernotes">User Notes:
-  <ulink url='&blfs-wiki;/OpenSSL'/></para>
-
   </sect2>
 
   <sect2 role="commands">




More information about the blfs-book mailing list