diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index b293ec9d3..d8cd81fca 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -39,6 +39,10 @@ 2012-10-02 + + [matthew] - Upgrade to IPRoute2-3.6.0. Fixes + #3196. + [matthew] - Upgrade to Linux-3.6. Fixes #3195. diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml index 9ae260646..02a63ae2a 100644 --- a/chapter01/whatsnew.xml +++ b/chapter01/whatsnew.xml @@ -106,9 +106,9 @@ - + @@ -234,6 +234,10 @@ &glibc-installation-patch; + + &iproute2-ipset-patch; + + &kmod-test_fix-patch; diff --git a/chapter03/patches.xml b/chapter03/patches.xml index 1ee768e9c..e960a65c2 100644 --- a/chapter03/patches.xml +++ b/chapter03/patches.xml @@ -74,23 +74,14 @@ - Kbd Loadkeys Fix Patch - &kbd-fixes-patch-size;: diff --git a/chapter06/iproute2.xml b/chapter06/iproute2.xml index e62a450b6..f2d259592 100644 --- a/chapter06/iproute2.xml +++ b/chapter06/iproute2.xml @@ -41,6 +41,11 @@ Installation of IPRoute2 + Apply a patch to fix a compilation issue caused by the absence of the + iptables package: + +patch -Np1 -i ../&iproute2-ipset-patch; + The arpd binary included in this package is dependent on Berkeley DB. Because arpd 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 1abc85dec..091369a79 100644 --- a/packages.ent +++ b/packages.ent @@ -270,10 +270,10 @@ - - + + - + diff --git a/patches.ent b/patches.ent index 7a46473ed..968ca6537 100644 --- a/patches.ent +++ b/patches.ent @@ -52,6 +52,11 @@ + + + + +