Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (dd631fdc6743473d0cda4d6b7a3074097a8d09eb)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (dd631fdc6743473d0cda4d6b7a3074097a8d09eb)
  • Date: Sat, 28 Feb 2009 18:36:36 -0600

GIT changes to master grimoire by Ladislav Hagara <ladislav.hagara AT unob.cz>:

net/iproute2/BUILD | 1 -
net/iproute2/DETAILS | 8 ++++----
net/iproute2/HISTORY | 5 +++++
net/iproute2/PRE_BUILD | 16 +++++-----------
net/iproute2/ip.patch | 13 -------------
5 files changed, 14 insertions(+), 29 deletions(-)

New commits:
commit dd631fdc6743473d0cda4d6b7a3074097a8d09eb
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Ladislav Hagara <ladislav.hagara AT unob.cz>

iproute2 2.6.28

diff --git a/net/iproute2/BUILD b/net/iproute2/BUILD
index 5807b35..2b9650d 100755
--- a/net/iproute2/BUILD
+++ b/net/iproute2/BUILD
@@ -1,4 +1,3 @@
-chmod a+x configure &&
./configure &&

if gcc -include netinet/in.h -E - < /dev/null | grep -q IPPROTO_SCTP ; then
diff --git a/net/iproute2/DETAILS b/net/iproute2/DETAILS
index 5b36e19..c81bd6a 100755
--- a/net/iproute2/DETAILS
+++ b/net/iproute2/DETAILS
@@ -1,12 +1,12 @@
SPELL=iproute2
- VERSION=2.6.22-070710
- SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE2=${SOURCE}.sign
+ VERSION=2.6.28
+ SOURCE=$SPELL-$VERSION.tar.bz2
+ SOURCE2=${SOURCE}.sig
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
- PATCHLEVEL=1
+ PATCHLEVEL=0
SOURCE_GPG="iproute2.gpg:${SOURCE2}:VERIFIED_UPSTREAM_KEY"
LICENSE[0]=GPL
WEB_SITE=http://linux-net.osdl.org/index.php/Iproute2
diff --git a/net/iproute2/HISTORY b/net/iproute2/HISTORY
index 47bb7f8..0962580 100644
--- a/net/iproute2/HISTORY
+++ b/net/iproute2/HISTORY
@@ -1,3 +1,8 @@
+2009-03-01 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 2.6.28, gz -> bz2, sign -> sig
+ * BUILD, PRE_BUILD: updated, used default_pre_build now
+ * PRE_BUILD, ip.patch: removed patch
+
2008-04-15 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: PATCHLEVEL++
* PRE_BUILD: Install network scripts to /sbin, not /usr/sbin, so they
diff --git a/net/iproute2/PRE_BUILD b/net/iproute2/PRE_BUILD
index b9df730..a669f2a 100755
--- a/net/iproute2/PRE_BUILD
+++ b/net/iproute2/PRE_BUILD
@@ -1,24 +1,18 @@
-mk_source_dir $SOURCE_DIRECTORY &&
-cd $SOURCE_DIRECTORY &&
-unpack_file '' &&
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&

sedit "s/-O2/$CFLAGS/" Makefile &&
-sedit 's/-g//' Makefile &&
-sedit "s!^CFLAGS =!& -include ${PWD}/sctpfix.h !" Makefile &&
+sedit "s:DESTDIR=/usr/:DESTDIR=:" Makefile &&
+sedit "s:/share/:/usr/share/:" Makefile &&
sedit "s:/usr:${INSTALL_ROOT}/usr:g" Makefile &&
sedit "s:/etc:${INSTALL_ROOT}/etc:g" Makefile &&
-sedit "s:SBINDIR=.*:SBINDIR=$INSTALL_ROOT/sbin:" Makefile &&
+sedit 's:$(DESTDIR)/lib/:$(LIBDIR):' netem/Makefile &&

# Fix document install directory
if [ "$BUILD_DOCS" = y ]; then
sedit
"s:PAGESPERPAGE=2:PAGESPERPAGE=2\nDOCDIR=${INSTALL_ROOT}/usr/share/doc/${SPELL}:"
doc/Makefile
fi &&

-# This fixes a compile error, thanks to Lunar:
-# http://lunar-linux.org/pipermail/lunar-bugs/2004-May/002350.html
-patch -p1 < $SCRIPT_DIRECTORY/ip.patch
-
-
if ! is_depends_enabled ${SPELL} db
then
patch -p1 < ${SCRIPT_DIRECTORY}/no-arpd.diff
diff --git a/net/iproute2/ip.patch b/net/iproute2/ip.patch
deleted file mode 100644
index 4c0a742..0000000
--- a/net/iproute2/ip.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur iproute2-2.6.22-070710.orig/ip/iptunnel.c
iproute2-2.6.22-070710/ip/iptunnel.c
---- iproute2-2.6.22-070710.orig/ip/iptunnel.c 2007-07-11 08:22:31.526850990
-0700
-+++ iproute2-2.6.22-070710/ip/iptunnel.c 2007-07-11 08:22:44.024944328
-0700
-@@ -28,6 +28,9 @@
- #include <linux/if_arp.h>
- #include <linux/ip.h>
- #include <linux/if_tunnel.h>
-+#include <endian.h>
-+#include <asm/byteorder.h>
-+#include <linux/byteorder/swab.h>
-
- #include "rt_names.h"
- #include "utils.h"



  • [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (dd631fdc6743473d0cda4d6b7a3074097a8d09eb), Ladislav Hagara, 02/28/2009

Archive powered by MHonArc 2.6.24.

Top of Page