Parcourir la source

Upgrade to IPRoute2-3.6.0. Fixes #3196.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@10014 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
Matthew Burgess il y a 11 ans
Parent
commit
ce935eba24
6 fichiers modifiés avec 26 ajouts et 17 suppressions
  1. 4 0
      chapter01/changelog.xml
  2. 6 2
      chapter01/whatsnew.xml
  3. 3 12
      chapter03/patches.xml
  4. 5 0
      chapter06/iproute2.xml
  5. 3 3
      packages.ent
  6. 5 0
      patches.ent

+ 4 - 0
chapter01/changelog.xml

@@ -39,6 +39,10 @@
     <listitem>
       <para>2012-10-02</para>
       <itemizedlist>
+        <listitem>
+          <para>[matthew] - Upgrade to IPRoute2-3.6.0.  Fixes
+          <ulink url="&lfs-ticket-root;3196">#3196</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[matthew] - Upgrade to Linux-3.6.  Fixes
           <ulink url="&lfs-ticket-root;3195">#3195</ulink>.</para>

+ 6 - 2
chapter01/whatsnew.xml

@@ -106,9 +106,9 @@
     <!--<listitem>
       <para>Inetutils &inetutils-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>IPRoute2 &iproute2-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Kbd &kbd-version;</para>
     </listitem>-->
@@ -234,6 +234,10 @@
       <para>&glibc-installation-patch;</para>
     </listitem>
 
+    <listitem>
+      <para>&iproute2-ipset-patch;</para>
+    </listitem>
+
     <listitem>
       <para>&kmod-test_fix-patch;</para>
     </listitem>

+ 3 - 12
chapter03/patches.xml

@@ -74,23 +74,14 @@
       </listitem>
     </varlistentry>
 
-<!--
     <varlistentry>
-      <term>GRUB Disk Geometry Patch - <token>&grub-geometry-patch-size;</token>:</term>
+      <term>IPRoute2 ipset Patch - <token>&iproute2-ipset-patch-size;</token>:</term>
       <listitem>
-        <para>Download: <ulink url="&patches-root;&grub-geometry-patch;"/></para>
-        <para>MD5 sum: <literal>&grub-geometry-patch-md5;</literal></para>
+        <para>Download: <ulink url="&patches-root;&iproute2-ipset-patch;"/></para>
+        <para>MD5 sum: <literal>&iproute2-ipset-patch-md5;</literal></para>
       </listitem>
     </varlistentry>
 
-    <varlistentry>
-      <term>GRUB 256-Byte Inodes Patch - <token>&grub-inode-patch-size;</token>:</term>
-      <listitem>
-        <para>Download: <ulink url="&patches-root;&grub-inode-patch;"/></para>
-        <para>MD5 sum: <literal>&grub-inode-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry>
--->
     <varlistentry>
       <term>Kbd Loadkeys Fix Patch - <token>&kbd-fixes-patch-size;</token>:</term>
       <listitem>

+ 5 - 0
chapter06/iproute2.xml

@@ -41,6 +41,11 @@
   <sect2 role="installation">
     <title>Installation of IPRoute2</title>
 
+    <para>Apply a patch to fix a compilation issue caused by the absence of the
+    iptables package:</para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../&iproute2-ipset-patch;</userinput></screen>
+
     <para>The <command>arpd</command> binary included in this package 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

+ 3 - 3
packages.ent

@@ -270,10 +270,10 @@
 <!ENTITY inetutils-ch6-du "27 MB">
 <!ENTITY inetutils-ch6-sbu "0.4 SBU">
 
-<!ENTITY iproute2-version "3.5.1">
-<!ENTITY iproute2-size "379 KB">
+<!ENTITY iproute2-version "3.6.0">
+<!ENTITY iproute2-size "386 KB">
 <!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz">
-<!ENTITY iproute2-md5 "d4425b44edd5eacd6099e672e4baacbf">
+<!ENTITY iproute2-md5 "a19e30c8e0099d3197414c96bea6d6f8">
 <!ENTITY iproute2-home "&kernel;linux/utils/net/iproute2/">
 <!ENTITY iproute2-ch6-du "7.3 MB">
 <!ENTITY iproute2-ch6-sbu "0.1 SBU">

+ 5 - 0
patches.ent

@@ -52,6 +52,11 @@
 <!ENTITY grub-geometry-patch-size "28 KB">
 
 
+<!ENTITY iproute2-ipset-patch "iproute2-&iproute2-version;-ipset-1.patch">
+<!ENTITY iproute2-ipset-patch-md5 "fca7fc756c30d96ada545b692a74701b">
+<!ENTITY iproute2-ipset-patch-size "1 KB">
+
+
 <!ENTITY kbd-backspace-patch "kbd-&kbd-version;-backspace-1.patch">
 <!ENTITY kbd-backspace-patch-md5 "f75cca16a38da6caa7d52151f7136895">
 <!ENTITY kbd-backspace-patch-size "12 KB">