Changeset c416b5c

Timestamp:

Apr 16, 2017, 4:00:47 PM (8 years ago)

Author:

William Harrington <kb0iic@…>

Branches:

sysvinit

Children:

6355738

Parents:

95c1d14

git-author:

William Harrington <kb0iic@…> (04/16/17 15:58:32)

git-committer:

William Harrington <kb0iic@…> (04/16/17 16:00:47)

Message:

Update to IProute2 4.9.0 and removal of libdir patch.

Files:

• BOOK/final-system/common/iproute2.xml (modified) (1 diff)
• BOOK/final-system/multilib/iproute2.xml (modified) (1 diff)
• BOOK/introduction/common/changelog.xml (modified) (1 diff)
• BOOK/materials/mips64/patches.xml (modified) (1 diff)
• BOOK/materials/ppc64/patches.xml (modified) (1 diff)
• BOOK/materials/sparc64/patches.xml (modified) (1 diff)
• BOOK/materials/x86_64/patches.xml (modified) (1 diff)
• BOOK/packages.ent (modified) (1 diff)
• BOOK/patches.ent (modified) (1 diff)
• patches/iproute2-4.1.1-libdir-1.patch (deleted)

BOOK/final-system/common/iproute2.xml

@@ -26 +26 @@
     <title>Installation of IPRoute2</title>
 
-    <para os="s1">By default, this package builds the <command>arpd</command>
-    program, which is dependent on Berkeley DB.  Because <command>arpd</command>
-    is not a very common requirement on a base Linux system, remove the
-    dependency on Berkeley DB by using the commands
-    below. If the <command>arpd</command> binary is needed, instructions for
-    compiling Berkeley DB can be found in CBLFS at <ulink
-    url="&cblfs-root;index.php/Berkeley_DB"/>.</para>
-
-<screen os="s2"><userinput>sed -i '/^TARGETS/s@arpd@@g' misc/Makefile
-sed -i '/ARPD/d' Makefile
-sed -i 's/arpd.8//' man/man8/Makefile</userinput></screen>
+    <para os="s1">ARPD will not be installed as Berkeley DB is not installed.
+        Remove any <command>arpd</command> references during install.</para>
+
+    <screen os="s2"><userinput>sed -i '/ARPD/d' Makefile
+            sed -i 's/arpd.8//' man/man8/Makefile
+            sed -i '/tc-simple/s@tc-skbmod.8 @@' man/man8/Makefile
+            rm -v doc/arpd.sgml
+    </userinput></screen>
 
     <para os="a">Compile the package:</para>

BOOK/final-system/multilib/iproute2.xml

@@ -30 +30 @@
     xpointer="xpointer(//*[@os='s2'])"/>
 
-    <para os="p1">This patch adds the ability to update the LIBDIR path:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&iproute2-libdir-patch;</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/iproute2.xml"

BOOK/introduction/common/changelog.xml

@@ -43 +43 @@
           ticket <ulink url="&clfs-ticket-root;1105">#1105.</ulink></para> 
         </listitem>
+        <listitem>
+          <para>[William Harrington] - Upgrade IProute2 to 4.9.0. Fixes
+          ticket <ulink url="&clfs-ticket-root;1103">#1103.</ulink></para> 
+        </listitem>
       </itemizedlist>
     </listitem>

BOOK/materials/mips64/patches.xml

@@ -35 +35 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../x86_64/patches.xml"
-    xpointer="xpointer(//*[@os='iproute2-libdir-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64/patches.xml"
     xpointer="xpointer(//*[@os='perl-multilib-patch'])"/>
 

BOOK/materials/ppc64/patches.xml

@@ -20 +20 @@
     href="../ppc/patches.xml"
     xpointer="xpointer(//*[@os='hfsutils-fixes-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64/patches.xml"
-    xpointer="xpointer(//*[@os='iproute2-libdir-patch'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"

BOOK/materials/sparc64/patches.xml

@@ -23 +23 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../x86_64/patches.xml"
-    xpointer="xpointer(//*[@os='iproute2-libdir-patch'])"/>
-
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-    href="../x86_64/patches.xml"
     xpointer="xpointer(//*[@os='perl-multilib-patch'])"/>
 

BOOK/materials/x86_64/patches.xml

@@ -17 +17 @@
     xpointer="xpointer(//*[@os='gcc-specs-patch'])"/>
 
-    <varlistentry os="iproute2-libdir-patch">
-      <term>IPRoute2 Lib64 Patch - <token>&iproute2-libdir-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink
-        url="&patches-root;&iproute2-libdir-patch;"/></para>
-        <para>MD5 sum: <literal>&iproute2-libdir-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry os="perl-multilib-patch">
       <term>Perl Configure Multilib Patch - <token>&perl-multilib-patch-size;</token>:</term>

BOOK/packages.ent

@@ -233 +233 @@
 <!ENTITY iana-etc-md5 "3ba3afb1d1b261383d247f46cb135ee8">
 <!ENTITY iana-etc-home "https://www.archlinux.org/packages/core/any/iana-etc/">
-<!-- <!ENTITY iana-etc-home "http://sethwklein.net/iana-etc"> -->
 
 <!ENTITY iproute2-version "4.1.1">
 <!ENTITY iproute2-size "496 KB">
+
+<!ENTITY intltool-version "0.51.0">
+<!ENTITY intltool-size "162 KB">
+<!ENTITY intltool-url "http://launchpad.net/intltool/trunk/&intltool-version;/+download/intltool-&intltool-version;.tar.gz">
+<!ENTITY intltool-md5 "12e517cac2b57a0121cda351570f1e63">
+<!ENTITY intltool-home "http://freedesktop.org/wiki/Software/intltool">
+
+<!ENTITY iproute2-version "4.9.0">
+<!ENTITY iproute2-size "613 KB">
 <!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz">
-<!ENTITY iproute2-md5 "39290cb3a55d38dd8d10e19a3094109f">
+<!ENTITY iproute2-md5 "44a8371a4b2c40e48e4c9f98cbd41391">
 <!ENTITY iproute2-home "http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2">
 

BOOK/patches.ent

@@ -84 +84 @@
 <!-- Start of multilib patches -->
 
-<!ENTITY iproute2-libdir-patch "iproute2-&iproute2-version;-libdir-1.patch">
-<!ENTITY iproute2-libdir-patch-md5 "c1b1d63a88f04785c02c71a32d6b9b65">
-<!ENTITY iproute2-libdir-patch-size "2.053 KB">
-
 <!ENTITY perl-multilib-patch "perl-&perl-version;-Configure_multilib-1.patch">
 <!ENTITY perl-multilib-patch-md5 "7a2893356fb80871d6e766900c278a52">