Changeset e31502b

Timestamp:

11/16/2011 04:12:05 AM (12 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

fb89293

Parents:

a9af283

Message:

Update to nasm-2.09.10.

Move the sections about running cvs and svn
servers adjacent to the cvs and svn build instructions.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@8969 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general.ent (modified) (1 diff)
• general/prog/cvsserver.xml (moved) (moved from server/other/cvsserver.xml )
• general/prog/nasm.xml (modified) (7 diffs)
• general/prog/prog.xml (modified) (2 diffs)
• general/prog/svnserver.xml (moved) (moved from server/other/svnserver.xml )
• introduction/welcome/changelog.xml (modified) (1 diff)
• server/other/other.xml (modified) (1 diff)

general.ent

@@ -332 +332 @@
 <!ENTITY junit-version                "4.8.1">
 <!ENTITY librep-version               "0.17">
-<!ENTITY NASM-version                 "2.09.04">
+<!ENTITY NASM-version                 "2.09.10">
 <!ENTITY pdl-version                  "2.4.2">
 <!ENTITY php-version                  "5.3.8">

general/prog/nasm.xml

@@ -7 +7 @@
   <!ENTITY NASM-download-http "http://www.nasm.us/pub/nasm/releasebuilds/&NASM-version;/nasm-&NASM-version;.tar.bz2">
   <!ENTITY NASM-download-ftp  " ">
-  <!ENTITY NASM-md5sum        "c11f083a501adae843d0bc3e7c106c73">
-  <!ENTITY NASM-size          "801 KB">
-  <!ENTITY NASM-buildsize     "25 MB (includes building and installing all docs)">
-  <!ENTITY NASM-time          "0.4 SBU">
+  <!ENTITY NASM-md5sum        "15c79dcb5838870a0fac15feb5fade66">
+  <!ENTITY NASM-size          "792 KB">
+  <!ENTITY NASM-buildsize     "17 MB" >
+  <!ENTITY NASM-time          "0.1 SBU">
 ]>
 
@@ -34 +34 @@
     disassembler as well.</para>
 
-    &lfs67_built;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -57 +57 @@
       </listitem>
     </itemizedlist>
-<!--
+
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Required patch to fix a buffer overrun vulnerability: <ulink
-        url="&patch-root;/nasm-&NASM-version;-security_fix-1.patch"/></para>
+        <para>Optional documentation: <ulink
+        url="http://www.nasm.us/pub/nasm/releasebuilds/&NASM-version;/nasm-&NASM-version;-xdoc.tar.bz2"/></para>
       </listitem>
     </itemizedlist>
--->
+
+    <!--
     <bridgehead renderas="sect3">NASM Dependencies</bridgehead>
 
@@ -71 +72 @@
     <para role="optional"><xref linkend="tetex"/> or
     <xref linkend="texlive"/>, and
-    <!-- <xref linkend="espgs"/> or --><xref linkend="gs"/></para>
+    <xref linkend="espgs"/> or <xref linkend="gs"/></para> 
+    -->
 
     <para condition="html" role="usernotes">User Notes:
@@ -81 +83 @@
     <title>Installation of NASM</title>
 
+    <para>If you downloaded the optional documentation, put it into the 
+    source tree:</para>
+
+<screen><userinput>pushd ..                          &amp;&amp;
+tar -xf nasm-&NASM-version;-xdoc.tar.bz2 &amp;&amp;
+popd</userinput></screen>
+
     <para>Install <application>NASM</application> by running
     the following commands:</para>
 
 <screen><userinput>./configure --prefix=/usr &amp;&amp;
-make &amp;&amp;
-make -C rdoff/doc &amp;&amp;
+make</userinput></screen>
+
+<!-- make -C rdoff/doc &amp;&amp;
 make -C rdoff/doc html &amp;&amp;
-makeinfo --html --no-split -o rdoff/doc/rdoff.html \
+makeinfo - -html - -no-split -o rdoff/doc/rdoff.html \
                               rdoff/doc/rdoff.texi &amp;&amp;
-makeinfo --plaintext       -o rdoff/doc/rdoff.txt  \
+makeinfo - -plaintext       -o rdoff/doc/rdoff.txt  \
                               rdoff/doc/rdoff.texi</userinput></screen>
 
@@ -106 +116 @@
 make -C rdoff/doc pdf &amp;&amp;
 make -C rdoff/doc ps</userinput></screen>
-
+-->
     <para>This package does not come with a test suite.</para>
 
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>make install install_rdf &amp;&amp;
+<screen role="root"><userinput>make install</userinput></screen>
+
+    <para>If you downloaded the optional documentation, install it with the
+    following instructions as the <systemitem
+    class="username">root</systemitem> user:</para>
+
+<screen role="root"><userinput>install -m755 -d         /usr/share/doc/nasm-&NASM-version;/html &amp;&amp; 
+cp -v doc/html/*.html    /usr/share/doc/nasm-&NASM-version;/html &amp;&amp;
+cp -v doc/*.{txt,ps,pdf} /usr/share/doc/nasm-&NASM-version;      &amp;&amp;
+cp -v doc/info/*         /usr/share/info                  &amp;&amp;
+pushd /usr/share/info                                     &amp;&amp;
+install-info nasm.info dir                                &amp;&amp;
+popd</userinput></screen>
+
+<!-- install_rdf &amp;&amp;
 install -v -m755 -d /usr/share/doc/nasm-&NASM-version;/html &amp;&amp;
 install -v -m644    rdoff/doc/rdoff/* \
@@ -144 +168 @@
 <screen role="root"><userinput>install -v -m644 rdoff/doc/rdoff.p{df,s} \
                  /usr/share/doc/nasm-&NASM-version;</userinput></screen>
-
+-->
   </sect2>
 

general/prog/prog.xml

@@ -26 +26 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cmake.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cvs.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cvsserver.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dejagnu.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="doxygen.xml"/>
@@ -47 +48 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="ruby.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="subversion.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="svnserver.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="slang.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="tcl.xml"/>

introduction/welcome/changelog.xml

@@ -45 +45 @@
       <para>November 15th, 2011</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Move the sections about running cvs and svn 
+          servers adjacent to the cvs and svn build instructions.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to nasm-2.09.10.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Update to shadow-4.1.4.3.</para>

server/other/other.xml

@@ -29 +29 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="virtuoso.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="soprano.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cvsserver.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="svnserver.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="cvsserver.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="svnserver.xml"/> -->
 
 </chapter>