Changeset 49b241a

Timestamp:

03/01/2014 06:00:12 AM (11 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 12.2, 7.10, 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, gimp3, 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/for-12.3, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/spidermonkey128, xry111/test-20220226, xry111/xf86-video-removal

Children:

283854e4

Parents:

43bb741

Message:

Added a patch to avoid net-tools from overwriting LFS versions of
ifconfig and hostname.
Tag a few more files.

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

Files:

• general.ent (modified) (1 diff)
• introduction/welcome/changelog.xml (modified) (1 diff)
• networking/netprogs/net-tools.xml (modified) (12 diffs)
• xsoft/other/balsa.xml (modified) (2 diffs)
• xsoft/other/rox-filer.xml (modified) (2 diffs)
• xsoft/other/xchat.xml (modified) (1 diff)

general.ent

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

introduction/welcome/changelog.xml

@@ -46 +46 @@
 
     <listitem>
+      <para>March 1st, 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Add a patch to remove ifconfig and hostname
+          when installing net-tools. Fixes 
+          <ulink url="&blfs-ticket-root;4720">#4720</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>February 27th, 2014</para>
       <itemizedlist>

networking/netprogs/net-tools.xml

@@ -58 +58 @@
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/net-tools-&net-tools-version;-remove_dups-1.patch"/>
+        </para>
+      </listitem>
+    </itemizedlist>
+
+
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/net-tools"/></para>
@@ -65 +76 @@
   <sect2 role="installation">
     <title>Installation of Net-tools</title>
-
-    <note>
-      <para>The <application>Net-tools</application> package installs a
-      <command>hostname</command> program which will overwrite the existing
-      program installed by <application>Inetutils</application> during a base
-      LFS installation. If, for whatever reason, you need to reinstall the
-      <application>Inetutils</application> package after installing
-      <application>Net-tools</application>, you should add
-      <command>--disable-hostname</command> to the Inetutils
-      <command>configure</command> command in LFS if you wish to preserve the
-      <application>Net-tools</application> <command>hostname</command>
-      program.</para>
-    </note>
 
     <para id="net-tools-automate-example" xreflabel="Net-tools">The
@@ -99 +97 @@
     family' and 'INET (TCP/IP) protocol family'.</para></note>
 
+    <para>The patch below cleans up the installation so that it does not
+    overwrite the <application>ifconfig</application> and 
+    <application>hostname</application> programs that were installed in LFS.</para>
+
     <para>Install <application>Net-tools</application> by running the
     following commands:</para>
 
-<screen><userinput>sed -i -e '/Token/s/y$/n/'        config.in &amp;&amp;
-sed -i -e '/HAVE_HWSTRIP/s/y$/n/' config.in &amp;&amp;
-yes "" | make config                 &amp;&amp;
+<screen><userinput>patch -Np1 -i ../net-tools-&net-tools-version;-remove_dups-1.patch &amp;&amp;
+
+yes "" | make config &amp;&amp;
 make</userinput></screen>
 
@@ -117 +119 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
+<!--
     <para><command>sed -i -e '/Token/s/y$/n/' config.in</command>: Change the
     default for building obsolete token ring support to no.  This is a
@@ -126 +128 @@
     Removes obsolete Metricom radio support that requires a header no longer
     included in the kernel.  </para>
-
+-->
     <para><command>yes "" | make config</command>: Piping <command>yes</command>
     to <command>make config</command> skips the interactive configuration and
@@ -142 +144 @@
 
       <seglistitem>
-        <seg>arp, dnsdomainname, domainname, hostname,
-        ifconfig, ipmaddr, iptunnel, mii-tool, nameif, netstat,
-        nisdomainname, plipconfig, rarp, route, slattach, and
-        ypdomainname</seg>
+        <seg>arp, 
+        ipmaddr, iptunnel, mii-tool, nameif, netstat,
+        plipconfig, rarp, route, and slattach
+        </seg>
         <seg>None</seg>
         <seg>None</seg>
@@ -166 +168 @@
         </listitem>
       </varlistentry>
-
+<!--
       <varlistentry id="dnsdomainname">
         <term><command>dnsdomainname</command></term>
@@ -206 +208 @@
         </listitem>
       </varlistentry>
-
+-->
       <varlistentry id="ipmaddr">
         <term><command>ipmaddr</command></term>
@@ -258 +260 @@
         </listitem>
       </varlistentry>
-
+<!--
       <varlistentry id="nisdomainname">
         <term><command>nisdomainname</command></term>
@@ -268 +270 @@
         </listitem>
       </varlistentry>
-
+-->
       <varlistentry id="plipconfig">
         <term><command>plipconfig</command></term>
@@ -310 +312 @@
         </listitem>
       </varlistentry>
-
+<!--
       <varlistentry id="ypdomainname">
         <term><command>ypdomainname</command></term>
@@ -320 +322 @@
         </listitem>
       </varlistentry>
-
+-->
     </variablelist>
 

xsoft/other/balsa.xml

@@ -33 +33 @@
     <application>GNOME</application>-2 based mail client.</para>
 
-    &lfs74_checked;
+    &lfs75_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -111 +111 @@
 #include &lt;glib-2.0/glib.h&gt;" src/main-window.c &amp;&amp;
 
-
 ./configure --prefix=/usr            \
             --sysconfdir=/etc/gnome  \

xsoft/other/rox-filer.xml

@@ -36 +36 @@
     </para>
 
-    &lfs74_checked;
+    &lfs75_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -117 +117 @@
 sed -i 's:g_strdup(getenv("APP_DIR")):"/usr/share/rox":' src/main.c &amp;&amp;
 
-mkdir build                      &amp;&amp;
-pushd build                      &amp;&amp;
-../src/configure LIBS="-lm -ldl" &amp;&amp;
-make                             &amp;&amp;
+mkdir build                        &amp;&amp;
+pushd build                        &amp;&amp;
+  ../src/configure LIBS="-lm -ldl" &amp;&amp;
+  make                             &amp;&amp;
 popd</userinput></screen>
 

xsoft/other/xchat.xml

@@ -35 +35 @@
     also possible.</para>
 
-    &lfs74_checked;
+    &lfs75_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>