[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. clfs-2.0.0-161-ge4beebf
git
git at cross-lfs.org
Tue Jul 23 22:00:59 PDT 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Book".
The branch, master has been updated
via e4beebf6de59d78549f3d200f5c705478ccec387 (commit)
via 7993322fe18bf8305bb5d2bac39e7271a28bd81a (commit)
via 5ecce60753cbe96c03c316809d8317ec64555ac6 (commit)
via ae3d9e390a2fb43c9d96cce8651ece9da2e3696c (commit)
from 52e68e2962287fe027c59f7ea571319c1363fad1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e4beebf6de59d78549f3d200f5c705478ccec387
Author: William Harrington <kb0iic at berzerkula.org>
Date: Wed Jul 24 00:00:53 2013 -0500
Add iproute2 3.10.0 entry to master changelog.
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 45ea5fe..45c88ea 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -44,6 +44,9 @@
<listitem>
<para>[William Harrington] - Update Linux kernel version to 3.10.2.</para>
</listitem>
+ <listitem>
+ <para>[William Harrington] - Update IPRoute2 to 3.10.0.</para>
+ </listitem>
</itemizedlist>
</listitem>
commit 7993322fe18bf8305bb5d2bac39e7271a28bd81a
Author: William Harrington <kb0iic at berzerkula.org>
Date: Wed Jul 24 00:00:36 2013 -0500
Add iproute2 3.10.0 update entries.
diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index d022686..ff5e5e2 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -221,9 +221,9 @@
<!ENTITY iproute2-version "3.8.0">
-<!ENTITY iproute2-size "400 KB">
+<!ENTITY iproute2-size "412 KB">
<!ENTITY iproute2-url "&kernel;/linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz">
-<!ENTITY iproute2-md5 "951622fd770428116dc165acba375414">
+<!ENTITY iproute2-md5 "45fb5427fc723a0001c72b92c931ba02">
<!ENTITY iproute2-home "http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2">
<!ENTITY iputils-version "s20101006">
commit 5ecce60753cbe96c03c316809d8317ec64555ac6
Author: William Harrington <kb0iic at berzerkula.org>
Date: Wed Jul 24 00:00:24 2013 -0500
Add iproute2 3.10.0 libdir patch.
diff --git a/patches/iproute2-3.10.0-libdir-1.patch b/patches/iproute2-3.10.0-libdir-1.patch
new file mode 100644
index 0000000..aa92d1a
--- /dev/null
+++ b/patches/iproute2-3.10.0-libdir-1.patch
@@ -0,0 +1,54 @@
+Submitted By: Joe Ciccone <jciccone at gmail.com>
+Date: 14-06-2010
+Initial Package Version: 2.6.18
+Upstream Status: Unknown
+Origin: Joe Ciccone
+Description: This patch gives the ability to change the libdir.
+ Updated for Iproute2-2.6.28 by Jim Gifford
+ Updated for Iproute2-2.6.34 by Joe Ciccone
+ Updated for Iproute2-2.6.37 by Joe Ciccone
+ Renamed for Iproute2-2.6.38 by Jonathan Norman
+ Rediffed for Iproute2-3.4.0 by William Harrington
+ Rediffed for Iproute2-3.8.0 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
+@@ -13,7 +13,7 @@
+
+ SHARED_LIBS = y
+
+-DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\"
++DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\" -DARPDDIR=\"$(ARPDDIR)\"
+ ifneq ($(SHARED_LIBS),y)
+ 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
+@@ -4,8 +4,12 @@
+ #include "iptables_common.h"
+ #include "libiptc/libiptc.h"
+
++#ifndef LIBDIR
++#define LIBDIR "/usr/lib"
++#endif
++
+ #ifndef IPT_LIB_DIR
+-#define IPT_LIB_DIR "/usr/local/lib/iptables"
++#define IPT_LIB_DIR LIBDIR "/iptables"
+ #endif
+
+ #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 @@
+ int resolve_hosts;
+
+ DB *dbase;
+-char *dbname = "/var/lib/arpd/arpd.db";
++char *dbname = ARPDDIR "/arpd.db";
+
+ int ifnum;
+ int *ifvec;
commit ae3d9e390a2fb43c9d96cce8651ece9da2e3696c
Author: William Harrington <kb0iic at berzerkula.org>
Date: Wed Jul 24 00:00:11 2013 -0500
Remove iproute2 3.8.0 libdir patch.
diff --git a/patches/iproute2-3.8.0-libdir-1.patch b/patches/iproute2-3.8.0-libdir-1.patch
deleted file mode 100644
index aa92d1a..0000000
--- a/patches/iproute2-3.8.0-libdir-1.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Submitted By: Joe Ciccone <jciccone at gmail.com>
-Date: 14-06-2010
-Initial Package Version: 2.6.18
-Upstream Status: Unknown
-Origin: Joe Ciccone
-Description: This patch gives the ability to change the libdir.
- Updated for Iproute2-2.6.28 by Jim Gifford
- Updated for Iproute2-2.6.34 by Joe Ciccone
- Updated for Iproute2-2.6.37 by Joe Ciccone
- Renamed for Iproute2-2.6.38 by Jonathan Norman
- Rediffed for Iproute2-3.4.0 by William Harrington
- Rediffed for Iproute2-3.8.0 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
-@@ -13,7 +13,7 @@
-
- SHARED_LIBS = y
-
--DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\"
-+DEFINES= -DRESOLVE_HOSTNAMES -DLIBDIR=\"$(LIBDIR)\" -DARPDDIR=\"$(ARPDDIR)\"
- ifneq ($(SHARED_LIBS),y)
- 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
-@@ -4,8 +4,12 @@
- #include "iptables_common.h"
- #include "libiptc/libiptc.h"
-
-+#ifndef LIBDIR
-+#define LIBDIR "/usr/lib"
-+#endif
-+
- #ifndef IPT_LIB_DIR
--#define IPT_LIB_DIR "/usr/local/lib/iptables"
-+#define IPT_LIB_DIR LIBDIR "/iptables"
- #endif
-
- #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 @@
- int resolve_hosts;
-
- DB *dbase;
--char *dbname = "/var/lib/arpd/arpd.db";
-+char *dbname = ARPDDIR "/arpd.db";
-
- int ifnum;
- int *ifvec;
-----------------------------------------------------------------------
Summary of changes:
BOOK/introduction/common/changelog.xml | 3 +++
BOOK/packages.ent | 4 ++--
...bdir-1.patch => iproute2-3.10.0-libdir-1.patch} | 0
3 files changed, 5 insertions(+), 2 deletions(-)
rename patches/{iproute2-3.8.0-libdir-1.patch => iproute2-3.10.0-libdir-1.patch} (100%)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list