sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (0caeecc5ef77a8864f66a6afca3479e15f4ffcee)

From: Ladislav Hagara <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (0caeecc5ef77a8864f66a6afca3479e15f4ffcee)
Date: Fri, 20 Jan 2012 09:01:43 -0600

GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

net/iproute2/DETAILS | 15 ++++++++-------
net/iproute2/HISTORY | 4 ++++
net/iproute2/PRE_BUILD | 2 --
net/iproute2/m_xt.patch | 28 ----------------------------
4 files changed, 12 insertions(+), 37 deletions(-)

New commits:
commit 0caeecc5ef77a8864f66a6afca3479e15f4ffcee
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

iproute2 3.2.0

diff --git a/net/iproute2/DETAILS b/net/iproute2/DETAILS
index 34e77d9..e7408ff 100755
--- a/net/iproute2/DETAILS
+++ b/net/iproute2/DETAILS
@@ -1,13 +1,14 @@
SPELL=iproute2
- VERSION=2.6.39
- SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE2=${SOURCE}.sign
- SOURCE2_IGNORE=signature
+ VERSION=3.2.0
+ SOURCE=$SPELL-$VERSION.tar.xz
+
SOURCE_HASH=sha512:daa82498a81c0afa322878b4d6d3a448c361a1bb21c1e2f323d8ff4fdf43030106c4e5c9f4c8381f81dd66df2b2d162ac7d62b361b79914e9416d9bfb0c30762
+# SOURCE2=${SOURCE}.sign
+# SOURCE2_IGNORE=signature
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://developer.osdl.org/dev/iproute2/download/$SOURCE
- SOURCE2_URL[0]=http://developer.osdl.org/dev/iproute2/download/$SOURCE2
+ SOURCE_URL[0]=${KERNEL_URL}/pub/linux/utils/net/iproute2/$SOURCE
+# SOURCE2_URL[0]=http://developer.osdl.org/dev/iproute2/download/$SOURCE2
PATCHLEVEL=0
- SOURCE_GPG="iproute2.gpg:${SOURCE2}:VERIFIED_UPSTREAM_KEY"
+# SOURCE_GPG="iproute2.gpg:${SOURCE2}:VERIFIED_UPSTREAM_KEY"
LICENSE[0]=GPL
WEB_SITE=http://linux-net.osdl.org/index.php/Iproute2
ENTERED=20020528
diff --git a/net/iproute2/HISTORY b/net/iproute2/HISTORY
index 0462b34..b74e909 100644
--- a/net/iproute2/HISTORY
+++ b/net/iproute2/HISTORY
@@ -1,3 +1,7 @@
+2012-01-20 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 3.2.0, SOURCE_URL[0] updated
+ * PRE_BUILD, m_xt.patch: patch removed
+
2011-07-19 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.6.39, bz2 -> gz, sig -> sign

diff --git a/net/iproute2/PRE_BUILD b/net/iproute2/PRE_BUILD
index 0f624ed..305a26d 100755
--- a/net/iproute2/PRE_BUILD
+++ b/net/iproute2/PRE_BUILD
@@ -1,8 +1,6 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

-patch -p0 < "$SPELL_DIRECTORY/m_xt.patch" &&
-
sedit "s/-O2/$CFLAGS/" Makefile &&
sedit "s:DESTDIR=/usr/:DESTDIR=:" Makefile &&
sedit "s:/share/:/usr/share/:" Makefile &&
diff --git a/net/iproute2/m_xt.patch b/net/iproute2/m_xt.patch
deleted file mode 100644
index 43ea142..0000000
--- a/net/iproute2/m_xt.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- tc/m_xt.c.orig
-+++ tc/m_xt.c
-@@ -162,7 +162,11 @@ static int parse_ipt(struct action_util *a,int *argc_p,
- return -1;
- }
- tcipt_globals.opts =
-- xtables_merge_options(tcipt_globals.opts,
-+ xtables_merge_options(
-+#if XTABLES_VERSION_CODE > 5
-+
tcipt_globals.orig_opts,
-+#endif
-+ tcipt_globals.opts,
- m->extra_opts,
- &m->option_offset);
- } else {
-@@ -307,7 +311,11 @@ print_ipt(struct action_util *au,FILE * f, struct
rtattr *arg)
- }
-
- tcipt_globals.opts =
-- xtables_merge_options(tcipt_globals.opts,
-+ xtables_merge_options(
-+#if XTABLES_VERSION_CODE > 5
-+ tcipt_globals.orig_opts,
-+#endif
-+ tcipt_globals.opts,
- m->extra_opts,
- &m->option_offset);
- } else {

[SM-Commit] GIT changes to master grimoire by Ladislav Hagara (0caeecc5ef77a8864f66a6afca3479e15f4ffcee), Ladislav Hagara, 01/20/2012