r8903 - in trunk/BOOK: . basicnet/netprogs introduction/welcome postlfs/security

bdubbs at linuxfromscratch.org bdubbs at linuxfromscratch.org
Wed Oct 19 18:45:18 PDT 2011


Author: bdubbs
Date: 2011-10-19 19:45:13 -0600 (Wed, 19 Oct 2011)
New Revision: 8903

Modified:
   trunk/BOOK/basicnet/netprogs/wget.xml
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/postlfs/security/openssh.xml
Log:
Update to wget-1.13


Modified: trunk/BOOK/basicnet/netprogs/wget.xml
===================================================================
--- trunk/BOOK/basicnet/netprogs/wget.xml	2011-10-19 23:51:59 UTC (rev 8902)
+++ trunk/BOOK/basicnet/netprogs/wget.xml	2011-10-20 01:45:13 UTC (rev 8903)
@@ -4,12 +4,12 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY wget-download-http "http://ftp.gnu.org/gnu/wget/wget-&wget-version;.tar.bz2">
-  <!ENTITY wget-download-ftp  "ftp://ftp.gnu.org/gnu/wget/wget-&wget-version;.tar.bz2">
-  <!ENTITY wget-md5sum        "308a5476fc096a8a525d07279a6f6aa3">
-  <!ENTITY wget-size          "1.6 MB">
-  <!ENTITY wget-buildsize     "16 MB">
-  <!ENTITY wget-time          "0.2 SBU">
+  <!ENTITY wget-download-http "http://ftp.gnu.org/gnu/wget/wget-&wget-version;.tar.xz">
+  <!ENTITY wget-download-ftp  "ftp://ftp.gnu.org/gnu/wget/wget-&wget-version;.tar.xz">
+  <!ENTITY wget-md5sum        "48c5384123156e7b7501d2f5b5c7189a">
+  <!ENTITY wget-size          "1.4 MB">
+  <!ENTITY wget-buildsize     "20 MB">
+  <!ENTITY wget-time          "0.4 SBU">
 ]>
 
 <sect1 id="wget" xreflabel="Wget-&wget-version;">
@@ -75,7 +75,9 @@
     <para>Install <application>Wget</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &&
+<screen><userinput>./configure --prefix=/usr     \
+            --sysconfdir=/etc \
+            --with-ssl=openssl &&
 make</userinput></screen>
 
     <para>To test the results, issue: <command>make check</command>.</para>
@@ -84,10 +86,6 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
 
-    <!-- <para>Finally update the info dir file:</para>
-
-<screen role="root"><userinput>install-info -info-dir=/usr/share/info /usr/share/info/wget.info</userinput></screen> -->
-
   </sect2>
 
   <sect2 role="commands">
@@ -97,6 +95,10 @@
     the configuration file from <filename class="directory">/usr/etc</filename> to
     <filename class="directory">/etc</filename>.</para>
 
+    <para><parameter>--with-ssl=openssl</parameter>: This allows the program to
+    work with <xref linkend="openssl"/>.  It can be omitted if <xref linkend="gnutls"/>
+    is found or the https protocol is not needed. </para>
+
   </sect2>
 
   <sect2 role="configuration">

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2011-10-19 23:51:59 UTC (rev 8902)
+++ trunk/BOOK/general.ent	2011-10-20 01:45:13 UTC (rev 8903)
@@ -104,6 +104,7 @@
 <!ENTITY ca-bundle-version            "3.12.11.0">
 <!ENTITY gnutls-version               "2.10.2">
 <!ENTITY cracklib-version             "2.8.18">
+<!ENTITY openssh-version              "5.9p1">
 <!ENTITY linux-pam-version            "1.1.3">
 <!ENTITY shadow-version               "4.1.4.2">
 <!ENTITY iptables-version             "1.4.7">
@@ -446,7 +447,7 @@
 <!ENTITY samba3-version               "3.5.6">
 <!ENTITY subversion-version           "1.6.15">
 <!ENTITY tcpwrappers-version          "7.6">
-<!ENTITY wget-version                 "1.12">
+<!ENTITY wget-version                 "1.13">
 <!ENTITY ggz-client-libs-version      "0.0.14.1">
 
 <!-- Obsolete

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2011-10-19 23:51:59 UTC (rev 8902)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2011-10-20 01:45:13 UTC (rev 8903)
@@ -45,9 +45,15 @@
       <para>October 19th, 2011</para>
       <itemizedlist>
         <listitem>
-          <para>[bdubbs] - Updated to openssh-5.9p1.</para>
+          <para>[bdubbs] - Updated to wget-1.13.</para>
         </listitem>
         <listitem>
+          <para>[bdubbs] - Updated to openssh-5.9p1. Modify the sed
+          that matches -ldes to only modify needed lines.  Move
+          openssl to Security chapter (Fixes ticket 
+          <ulink url="&blfs-ticket-root;3250">#3250</ulink>).</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Added separate page to generate CA certificates.</para>
         </listitem>
         <listitem>

Modified: trunk/BOOK/postlfs/security/openssh.xml
===================================================================
--- trunk/BOOK/postlfs/security/openssh.xml	2011-10-19 23:51:59 UTC (rev 8902)
+++ trunk/BOOK/postlfs/security/openssh.xml	2011-10-20 01:45:13 UTC (rev 8903)
@@ -115,7 +115,7 @@
     <para>Install <application>OpenSSH</application> by running
     the following commands:</para>
 
-<screen><userinput>sed -i.bak 's/ -ldes//' configure &&
+<screen><userinput>sed -i.bak '/K5LIBS=/s/ -ldes//' configure &&
 ./configure --prefix=/usr \
             --sysconfdir=/etc/ssh \
             --datadir=/usr/share/sshd \
@@ -153,7 +153,7 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><command>sed -i.bak 's/ -ldes//' configure</command>:
+    <para><command>sed -i.bak '/K5LIBS=/s/ -ldes//' configure</command>:
     This command fixes a build crash if you used the
     <option>--with-kerberos5</option> parameter and you built the
     <application>Heimdal</application> package in accordance with the BLFS




More information about the blfs-book mailing list