Changeset 44cadbb

Timestamp:

Sep 16, 2015, 5:19:04 PM (9 years ago)

Author:

William Harrington <kb0iic@…>

Branches:

master, systemd

Children:

94b2a47

Parents:

f489a14

Message:

Update IProute2 to 4.1.1 from 3.14.0.

Files:

• BOOK/introduction/common/changelog.xml (modified) (1 diff)
• BOOK/packages.ent (modified) (1 diff)
• BOOK/patches.ent (modified) (1 diff)
• patches/iproute2-4.1.1-libdir-1.patch (moved) (moved from patches/iproute2-3.14.0-libdir-1.patch ) (4 diffs)

BOOK/introduction/common/changelog.xml

@@ -41 +41 @@
       <itemizedlist>
         <listitem>
+          <para>[William Harrington] - Update IProute2 to 4.1.1. Fixes ticket
+          <ulink url="&clfs-ticket-root;992">#992.</ulink></para> 
+        </listitem>
+        <listitem>
           <para>[William Harrington] - Update Linux to 4.1.7. Fixes ticket
           <ulink url="&clfs-ticket-root;995">#995.</ulink></para> 

BOOK/packages.ent

@@ -272 +272 @@
 <!ENTITY intltool-home "http://freedesktop.org/wiki/Software/intltool">
 
-<!ENTITY iproute2-version "3.14.0">
-<!ENTITY iproute2-size "436 KB">
+<!ENTITY iproute2-version "4.1.1">
+<!ENTITY iproute2-size "496 KB">
 <!ENTITY iproute2-url "&kernel;linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz">
-<!ENTITY iproute2-md5 "bd9d7567bbb987c88120669f5e1a1092">
+<!ENTITY iproute2-md5 "39290cb3a55d38dd8d10e19a3094109f">
 <!ENTITY iproute2-home "http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2">
 

BOOK/patches.ent

@@ -82 +82 @@
 
 <!ENTITY iproute2-libdir-patch "iproute2-&iproute2-version;-libdir-1.patch">
-<!ENTITY iproute2-libdir-patch-md5 "6b965a6f1017c47ab3111e9ae8fcdd3f">
-<!ENTITY iproute2-libdir-patch-size "1.990 KB">
+<!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">

patches/iproute2-4.1.1-libdir-1.patch

@@ -1 +1 @@
 Submitted By: Joe Ciccone <jciccone@gmail.com>
-Date: 14-06-2010
+Date: 16-09-2015
 Initial Package Version: 2.6.18
 Upstream Status: Unknown
@@ -13 +13 @@
              Renamed for Iproute2-3.12.0 by William Harrington
              Renamed for Iproute2-3.14.0 by William Harrington
+             Rediffed for Iproute2-4.1.1 by William Harrington
 
-diff -Naur iproute2-3.8.0.orig/Makefile iproute2-3.8.0/Makefile
---- iproute2-3.8.0.orig/Makefile        2013-02-21 16:41:20.000000000 +0000
-+++ iproute2-3.8.0/Makefile     2013-06-03 12:31:18.891352195 +0000
+diff -Naur iproute2-4.1.1.orig/Makefile iproute2-4.1.1/Makefile
+--- iproute2-4.1.1.orig/Makefile        2015-07-06 21:57:34.000000000 +0000
++++ iproute2-4.1.1/Makefile     2015-09-16 23:57:03.117721908 +0000
 @@ -13,7 +13,7 @@
  
@@ -26 +27 @@
  DEFINES+= -DNO_SHARED_LIBS
  endif
-diff -Naur iproute2-3.8.0.orig/include/iptables.h iproute2-3.8.0/include/iptables.h
---- iproute2-3.8.0.orig/include/iptables.h      2013-02-21 16:41:20.000000000 +0000
-+++ iproute2-3.8.0/include/iptables.h   2013-06-03 12:31:18.891352195 +0000
+diff -Naur iproute2-4.1.1.orig/include/iptables.h iproute2-4.1.1/include/iptables.h
+--- iproute2-4.1.1.orig/include/iptables.h      2015-07-06 21:57:34.000000000 +0000
++++ iproute2-4.1.1/include/iptables.h   2015-09-16 23:57:03.118722035 +0000
 @@ -4,8 +4,12 @@
  #include "iptables_common.h"
@@ -43 +44 @@
  
  #ifndef IPPROTO_SCTP
-diff -Naur iproute2-3.8.0.orig/misc/arpd.c iproute2-3.8.0/misc/arpd.c
---- iproute2-3.8.0.orig/misc/arpd.c     2013-02-21 16:41:20.000000000 +0000
-+++ iproute2-3.8.0/misc/arpd.c  2013-06-03 12:31:18.891352195 +0000
-@@ -40,7 +40,7 @@
+diff -Naur iproute2-4.1.1.orig/misc/arpd.c iproute2-4.1.1/misc/arpd.c
+--- iproute2-4.1.1.orig/misc/arpd.c     2015-07-06 21:57:34.000000000 +0000
++++ iproute2-4.1.1/misc/arpd.c  2015-09-16 23:57:03.118722035 +0000
+@@ -41,7 +41,7 @@
  int resolve_hosts;