Changeset b3dc2ba

Timestamp:

04/01/2017 02:39:25 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, lazarus, lxqt, perl-modules, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

6ebd029

Parents:

783108e

Message:

Fix update-leap script on NTP page

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

Files:

• general.ent (modified) (1 diff)
• introduction/welcome/changelog.xml (modified) (1 diff)
• networking/netprogs/ntp.xml (modified) (3 diffs)

general.ent

@@ -1 +1 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "31">                   <!-- Always 2 digits -->
-<!ENTITY month        "03">                   <!-- Always 2 digits -->
+<!ENTITY day          "01">                   <!-- Always 2 digits -->
+<!ENTITY month        "04">                   <!-- Always 2 digits -->
 <!ENTITY year         "2017">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "March 31st &year;">
+<!ENTITY releasedate  "April 1st &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->

introduction/welcome/changelog.xml

@@ -43 +43 @@
 -->
     <listitem>
+      <para>April 1st, 2017</para>
+      <itemizedlist>
+        <listitem>
+          <para>[pierre] - Fix the <command>update-leap</command> script
+          on the NTP page. Fixes
+          <ulink url="&blfs-ticket-root;9068">#9068</ulink>..</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>March 31st, 2017</para>
       <itemizedlist>

networking/netprogs/ntp.xml

@@ -62 +62 @@
     <bridgehead renderas="sect3">ntp Dependencies</bridgehead>
 
-    <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required">
-      <xref linkend="wget"/> (runtime, for <command>update-leap</command>) and
-      <xref linkend="which"/>
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="wget"/> (runtime, for <command>update-leap</command>)
+<!-- The download code for update-leap uses the File::Fetch perl module,
+     which may use wget, or lynx, or some core perle modules, so maybe move
+     to optional -->
+<!--      <xref linkend="which"/> does not seem to be used now -->
     </para>
 
@@ -97 +100 @@
         -g ntp -s /bin/false ntp</userinput></screen>
 
-    <para>Install <application>ntp</application> by running
-    the following commands:</para>
+<!-- At least one of the issues has been reported upstream. The next para
+     is valid for 4.8.2p10 -->
+    <para>
+      The <command>update-leap</command> command needs to be fixed in order
+      to run properly:
+    </para>
+
+<screen><userinput>sed -e "s/https/http/"              \
+    -e 's/"(\\S+)"/"?([^\\s"]+)"?/' \
+    -i scripts/update-leap/update-leap.in</userinput></screen>
+
+    <para>
+      Install <application>ntp</application> by running
+      the following commands:
+    </para>
 
 <screen><userinput>./configure CFLAGS="-O2 -g -fPIC" \
@@ -109 +125 @@
 make</userinput></screen>
 
-    <para>To test the results, issue: <command>make check</command>.</para>
-
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>
+      To test the results, issue: <command>make check</command>.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
 
 <screen role="root"><userinput>make install &amp;&amp;