Changeset f22fa770

Timestamp:

06/28/2017 05:13:28 PM (6 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, perl-modules, plabs/python-mods, qt5new, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

5e37f876

Parents:

17a38b0

Message:

Make OpenSSL a recommended dep of Lynx

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

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• networking/textweb/lynx.xml (modified) (6 diffs)

introduction/welcome/changelog.xml

@@ -47 +47 @@
       <itemizedlist>
         <listitem>
+          <para>[pierre] - Make OpenSSL a recommended dependency of Lynx.</para>
+        </listitem>
+        <listitem>
           <para>[pierre] - Update to unbound-1.6.4. Fixes
           <ulink url="&blfs-ticket-root;9415">#9415</ulink>.</para>

networking/textweb/lynx.xml

@@ -62 +62 @@
       <listitem>
         <para>
-          Optional patch to build with openssl-1.1:
+          Patch to build with openssl-1.1:
           <ulink url="&patch-root;/lynx-&lynx-version;-openssl_1.1.0-1.patch"/>
         </para>
@@ -70 +70 @@
     <bridgehead renderas="sect3">Lynx Dependencies</bridgehead>
 
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="openssl"/>
+    </para>
+
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="openssl"/> or
-      <xref linkend="gnutls"/> (experimental),
+      <xref linkend="gnutls"/> (experimental, to replace openssl),
       <xref linkend="zip"/>,
       <xref linkend="unzip"/>,
@@ -90 +94 @@
     <title>Installation of Lynx</title>
     <para>
-      If you want to build <application>Lynx</application> with openssl-1.1,
-      issue:
+      Apply a patch to build <application>Lynx</application> with openssl-1.1:
     </para>
 
@@ -104 +107 @@
             --with-zlib            \
             --with-bzlib           \
+            --with-ssl             \
             --with-screen=ncursesw \
             --enable-locale-charset &amp;&amp;
@@ -138 +142 @@
     linking <filename class="libraryfile">libbz2</filename> into
     <application>Lynx</application>.</para>
+
+    <para><parameter>--with-ssl</parameter>: This enables support for
+    linking SSL into <application>Lynx</application>.</para>
 
     <para><parameter>--with-screen=ncursesw</parameter>: This switch enables
@@ -158 +165 @@
     questions about cookies and SSL certificates).</para>
 
-    <para><option>--with-ssl</option>: This enables support for
-    linking SSL into <application>Lynx</application>.</para>
-
-    <!-- Fixed at version 2.8.8
-    <note><para>Due to an error in the <command>configure</command>
-    process, building with <application>openssl</application> also requires
-    running the following before running <command>make</command>.
-
-    <screen><userinput>echo "#define USE_OPENSSL_INCL 1" >> lynx_cfg.h</userinput></screen>
-    </para></note>
-    -->
-
     <para><option>--with-gnutls</option>: This enables experimental support
     for linking <application>GnuTLS</application> into
-    <application>Lynx</application>.</para>
+    <application>Lynx</application>. Remove the
+    <parameter>--with-ssl</parameter>  switch if you want to use gnutls.</para>
 
     <para><command>make install-full</command>: In addition to the standard