diff options
| -rw-r--r-- | chapter01/changelog.xml | 4 | ||||
| -rw-r--r-- | chapter01/whatsnew.xml | 4 | ||||
| -rw-r--r-- | chapter03/patches.xml | 8 | ||||
| -rw-r--r-- | chapter06/iproute2.xml | 5 | ||||
| -rw-r--r-- | packages.ent | 6 | ||||
| -rw-r--r-- | patches.ent | 5 |
6 files changed, 7 insertions, 25 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 5b7e0467a..832095046 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -40,6 +40,10 @@ <para>2012-12-12</para> <itemizedlist> <listitem> + <para>[matthew] - Upgrade to IPRoute2-3.7.0. Fixes + <ulink url="&lfs-ticket-root;3246">#3246</ulink>.</para> + </listitem> + <listitem> <para>[matthew] - Update Check's list of installed programs. Fixes <ulink url="&lfs-ticket-root;3245">#3245</ulink>. Thanks diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 4eccb9821..c3864dd62 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -241,10 +241,6 @@ </listitem> <listitem> - <para>&iproute2-ipset-patch;</para> - </listitem> - - <listitem> <para>&make-fixes-patch;</para> </listitem> diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 5e3575348..7eba63141 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -67,14 +67,6 @@ </varlistentry> <varlistentry> - <term>IPRoute2 ipset Patch - <token>&iproute2-ipset-patch-size;</token>:</term> - <listitem> - <para>Download: <ulink url="&patches-root;&iproute2-ipset-patch;"/></para> - <para>MD5 sum: <literal>&iproute2-ipset-patch-md5;</literal></para> - </listitem> - </varlistentry> - - <varlistentry> <term>Kbd Loadkeys Fix Patch - <token>&kbd-fixes-patch-size;</token>:</term> <listitem> <para>Download: <ulink url="&patches-root;&kbd-fixes-patch;"/></para> diff --git a/chapter06/iproute2.xml b/chapter06/iproute2.xml index 73d7eaa09..b367d20ef 100644 --- a/chapter06/iproute2.xml +++ b/chapter06/iproute2.xml @@ -41,11 +41,6 @@ <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 diff --git a/packages.ent b/packages.ent index 8eac90da6..4f6a8d292 100644 --- a/packages.ent +++ b/packages.ent @@ -270,10 +270,10 @@ <!ENTITY inetutils-ch6-du "27 MB"> <!ENTITY inetutils-ch6-sbu "0.4 SBU"> -<!ENTITY iproute2-version "3.6.0"> -<!ENTITY iproute2-size "386 KB"> +<!ENTITY iproute2-version "3.7.0"> +<!ENTITY iproute2-size "391 KB"> <!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz"> -<!ENTITY iproute2-md5 "a19e30c8e0099d3197414c96bea6d6f8"> +<!ENTITY iproute2-md5 "bea92f26c8cc04e79f4db02dc1d258d3"> <!ENTITY iproute2-home "&kernel;linux/utils/net/iproute2/"> <!ENTITY iproute2-ch6-du "7.3 MB"> <!ENTITY iproute2-ch6-sbu "0.1 SBU"> diff --git a/patches.ent b/patches.ent index 89caa2fd3..da79b6be4 100644 --- a/patches.ent +++ b/patches.ent @@ -47,11 +47,6 @@ <!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"> |