[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. clfs-2.0.0-53-g4996aa5
git
git at cross-lfs.org
Mon Jun 3 05:39:12 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 4996aa596b6691e8b17ca144d4f19d7709550f50 (commit)
via b76dd4cce3bfb4be68bf4cc075c719974d51e0ee (commit)
via 0e6aea8391e4e54b4055b294f429fb966a469a26 (commit)
via ec8cdfb0efee31ae86e1349061c5427a728326bb (commit)
via 52dbae7e627e8ded8dc4157306f7895ec01e6dc7 (commit)
from 8a86625a2622a12ea35da69a795aa5e0cdbd7f52 (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 4996aa596b6691e8b17ca144d4f19d7709550f50
Author: William Harrington <kb0iic at berzerkula.org>
Date: Mon Jun 3 07:39:02 2013 -0500
Add iproute2 3.8.0 patch.
diff --git a/patches/iproute2-3.8.0-libdir-1.patch b/patches/iproute2-3.8.0-libdir-1.patch
new file mode 100644
index 0000000..aa92d1a
--- /dev/null
+++ b/patches/iproute2-3.8.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 b76dd4cce3bfb4be68bf4cc075c719974d51e0ee
Author: William Harrington <kb0iic at berzerkula.org>
Date: Mon Jun 3 07:38:35 2013 -0500
Add Iproute2 update entry to master change log.
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 8f6a9c4..bf4b73c 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -36,6 +36,15 @@
</listitem>
-->
<listitem>
+ <para>03 June 2013</para>
+ <itemizedlist>
+ <listitem>
+ <para>[William Harrington] - Update Iproute2 to 3.8.0.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>02 June 2013</para>
<itemizedlist>
<listitem>
commit 0e6aea8391e4e54b4055b294f429fb966a469a26
Author: William Harrington <kb0iic at berzerkula.org>
Date: Mon Jun 3 07:38:21 2013 -0500
Update Iproute2 to 3.8.0.
diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index 3dfd8c7..c93b21c 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -219,8 +219,8 @@
<!-- <!ENTITY iana-etc-home "http://sethwklein.net/iana-etc"> -->
-<!ENTITY iproute2-version "3.4.0">
-<!ENTITY iproute2-size "376 KB">
+<!ENTITY iproute2-version "3.8.0">
+<!ENTITY iproute2-size "400 KB">
<!ENTITY iproute2-url "&kernel;/linux/utils/net/iproute2/iproute2-&iproute2-version;.tar.xz">
<!ENTITY iproute2-md5 "879d3fac4e90809598b2864ec4a0cbf8">
<!ENTITY iproute2-home "http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2">
commit ec8cdfb0efee31ae86e1349061c5427a728326bb
Author: William Harrington <kb0iic at berzerkula.org>
Date: Mon Jun 3 07:38:10 2013 -0500
Update Iproute2 patch to 3.8.0.
diff --git a/BOOK/patches.ent b/BOOK/patches.ent
index 62b758d..fc33eab 100644
--- a/BOOK/patches.ent
+++ b/BOOK/patches.ent
@@ -98,8 +98,8 @@
<!-- Start of multilib patches -->
<!ENTITY iproute2-libdir-patch "iproute2-&iproute2-version;-libdir-1.patch">
-<!ENTITY iproute2-libdir-patch-md5 "cf8948c05f3a641912e6bd1b38a8a382">
-<!ENTITY iproute2-libdir-patch-size "2.0 KB">
+<!ENTITY iproute2-libdir-patch-md5 "828830c40f04916ac44d8e0a410ba650">
+<!ENTITY iproute2-libdir-patch-size "4.0 KB">
<!ENTITY perl-multilib-patch "perl-&perl-version;-Configure_multilib-1.patch">
<!ENTITY perl-multilib-patch-md5 "107a7414a230c798a3af22fcbb24307e">
commit 52dbae7e627e8ded8dc4157306f7895ec01e6dc7
Author: William Harrington <kb0iic at berzerkula.org>
Date: Mon Jun 3 07:37:49 2013 -0500
Update date.
diff --git a/BOOK/general.ent b/BOOK/general.ent
index fc600b7..40938b8 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -2,7 +2,7 @@
<!ENTITY month "06"> <!-- Use two digits -->
<!ENTITY month_name "June">
-<!ENTITY day "02"> <!-- Use two digits -->
+<!ENTITY day "03"> <!-- Use two digits -->
<!ENTITY year "2013"> <!-- Use four digits -->
<!ENTITY releasedate "&month_name; &day;, &year;">
diff --git a/patches/iproute2-3.4.0-libdir-1.patch b/patches/iproute2-3.4.0-libdir-1.patch
deleted file mode 100644
index 4cf3298..0000000
--- a/patches/iproute2-3.4.0-libdir-1.patch
+++ /dev/null
@@ -1,53 +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
-
-diff -Naur iproute2-3.4.0.orig/Makefile iproute2-3.4.0/Makefile
---- iproute2-3.4.0.orig/Makefile 2012-10-25 19:59:31.824412361 +0000
-+++ iproute2-3.4.0/Makefile 2012-10-25 20:00:11.334366911 +0000
-@@ -12,7 +12,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.4.0.orig/include/iptables.h iproute2-3.4.0/include/iptables.h
---- iproute2-3.4.0.orig/include/iptables.h 2012-05-21 21:12:19.000000000 +0000
-+++ iproute2-3.4.0/include/iptables.h 2012-10-25 20:00:56.064367711 +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.4.0.orig/misc/arpd.c iproute2-3.4.0/misc/arpd.c
---- iproute2-3.4.0.orig/misc/arpd.c 2012-05-21 21:12:19.000000000 +0000
-+++ iproute2-3.4.0/misc/arpd.c 2012-10-25 20:01:19.474370303 +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/general.ent | 2 +-
BOOK/introduction/common/changelog.xml | 9 ++++++++
BOOK/packages.ent | 4 +-
BOOK/patches.ent | 4 +-
...ibdir-1.patch => iproute2-3.8.0-libdir-1.patch} | 21 ++++++++++---------
5 files changed, 25 insertions(+), 15 deletions(-)
rename patches/{iproute2-3.4.0-libdir-1.patch => iproute2-3.8.0-libdir-1.patch} (64%)
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list