Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

 libs/libnl/DETAILS    |    6 +++---
 libs/libnl/HISTORY    |    4 ++++
 libs/libnl/libnl-1.pc |   11 -----------
 libs/libnl/libnl-3.pc |   11 +++++++++++
 net/iproute2/BUILD    |    2 ++
 net/iproute2/DEPENDS  |    6 ++++++
 net/iproute2/HISTORY  |    4 ++++
 7 files changed, 30 insertions(+), 14 deletions(-)

New commits:
commit 5e033208bbcaefb01635660754b53306b5287949
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    iproute2: fixed compilation with kernel 2.6

commit 265c1f1802e97d44dc7db5e99f3c0d93f66fcba3
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    libnl: => 3.2.7

diff --git a/libs/libnl/DETAILS b/libs/libnl/DETAILS
index 585e34d..7e0c256 100755
--- a/libs/libnl/DETAILS
+++ b/libs/libnl/DETAILS
@@ -1,9 +1,9 @@
            SPELL=libnl
-         VERSION=3.2.3
-     
SOURCE_HASH=sha512:43b1140f92c920536e526f137a6f6cb1ea3b28090b1f7094724e3875c6ad7de1db66278f653aea3547f92ca452bc8d2bbcdbfb4312c615aa93de78a49fcdc8c3
+         VERSION=3.2.7
+     
SOURCE_HASH=sha512:be060ca030a83869575e22761b106e206c9545be92c18e61f09dce99476237ea71ebfb777ebb7ee17da6a2e3886fdfd30ae1fc6b37b775ba6a74cdd79568d1f3
 #      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
           SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=http://people.suug.ch/~tgr/libnl/files/$SOURCE
       LICENSE[0]=LGPL
         KEYWORDS="network libs"
diff --git a/libs/libnl/HISTORY b/libs/libnl/HISTORY
index 570fb8a..8237df5 100644
--- a/libs/libnl/HISTORY
+++ b/libs/libnl/HISTORY
@@ -1,3 +1,7 @@
+2012-01-27 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: updated spell to 3.2.7; quoting paths
+       * libnl-1.pc -> libnl-3.pc
+
 2011-12-22 Treeve Jelbert <treeve AT sourcemage.org>
        * DETAILS: version 3.2.3
        * libnl: deleted
diff --git a/libs/libnl/libnl-1.pc b/libs/libnl/libnl-1.pc
deleted file mode 100644
index aa12401..0000000
--- a/libs/libnl/libnl-1.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-sysconfdir=/etc
-
-Name: libnl
-Description: Netlink socket library
-Version: 1.0-pre5
-Libs: -L${libdir} -lnl
-Cflags: -I${includedir}/netlink
diff --git a/libs/libnl/libnl-3.pc b/libs/libnl/libnl-3.pc
new file mode 100644
index 0000000..7647e82
--- /dev/null
+++ b/libs/libnl/libnl-3.pc
@@ -0,0 +1,11 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+sysconfdir=/etc
+
+Name: libnl
+Description: Netlink socket library
+Version: 3.2.7
+Libs: -L${libdir} -lnl
+Cflags: -I${includedir}/netlink
diff --git a/net/iproute2/BUILD b/net/iproute2/BUILD
index 2b9650d..31036fd 100755
--- a/net/iproute2/BUILD
+++ b/net/iproute2/BUILD
@@ -1,5 +1,7 @@
 ./configure  &&
 
+echo "CFLAGS += -I$INSTALL_ROOT/usr/include/libnl3" >> ip/Makefile &&
+
 if gcc -include netinet/in.h -E - < /dev/null | grep -q IPPROTO_SCTP ; then
   echo "" > sctpfix.h
 else
diff --git a/net/iproute2/DEPENDS b/net/iproute2/DEPENDS
index 3502de8..3866c1e 100755
--- a/net/iproute2/DEPENDS
+++ b/net/iproute2/DEPENDS
@@ -1,5 +1,11 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
 depends  bison  &&
 
+if is_version_less $(get_kernel_version) 3.2; then
+  depends libnl
+fi &&
+
 if  [  "$BUILD_DOCS" ==  "y"  ];  then
   depends  linuxdoc-tools  &&
   depends  psutils         &&
diff --git a/net/iproute2/HISTORY b/net/iproute2/HISTORY
index b74e909..64c7593 100644
--- a/net/iproute2/HISTORY
+++ b/net/iproute2/HISTORY
@@ -1,3 +1,7 @@
+2012-01-28 Vlad Glagolev <stealth AT sourcemage.org>
+       * BUILD: fixed compilation with 2.6.35 and such
+       * DEPENDS: added missing dependency
+
 2012-01-20 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 3.2.0, SOURCE_URL[0] updated
        * PRE_BUILD, m_xt.patch: patch removed