summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Franzmann2012-01-28 01:20:33 +0100
committerFlorian Franzmann2012-01-28 01:20:33 +0100
commitf0dc0451f3a5d42e3e659a85f3471d808baaa3d6 (patch)
tree0906bc0d2a3e0aaa0cfa804cfa6870952c71e246
parentbcecf20348aa882e65f9201674dc33b47e29e805 (diff)
parent259adeb53b96eae26e209f232247de3922159f10 (diff)
Merge branch 'master' of ssh://scm.sourcemage.org/smgl/grimoire
-rwxr-xr-xlibs/libnl/DETAILS6
-rw-r--r--libs/libnl/HISTORY4
-rw-r--r--libs/libnl/libnl-3.pc (renamed from libs/libnl/libnl-1.pc)2
-rwxr-xr-xnet/iproute2/BUILD2
-rwxr-xr-xnet/iproute2/DEPENDS6
-rw-r--r--net/iproute2/HISTORY4
-rwxr-xr-xx11-libs/wine/DETAILS2
-rw-r--r--x11-libs/wine/HISTORY3
8 files changed, 24 insertions, 5 deletions
diff --git a/libs/libnl/DETAILS b/libs/libnl/DETAILS
index 585e34d2fb..7e0c25613c 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 570fb8af29..8237df5401 100644
--- a/libs/libnl/HISTORY
+++ b/libs/libnl/HISTORY
@@ -1,3 +1,7 @@
+2012-01-27 Vlad Glagolev <stealth@sourcemage.org>
+ * DETAILS: updated spell to 3.2.7; quoting paths
+ * libnl-1.pc -> libnl-3.pc
+
2011-12-22 Treeve Jelbert <treeve@sourcemage.org>
* DETAILS: version 3.2.3
* libnl: deleted
diff --git a/libs/libnl/libnl-1.pc b/libs/libnl/libnl-3.pc
index aa12401a5d..7647e8255b 100644
--- a/libs/libnl/libnl-1.pc
+++ b/libs/libnl/libnl-3.pc
@@ -6,6 +6,6 @@ sysconfdir=/etc
Name: libnl
Description: Netlink socket library
-Version: 1.0-pre5
+Version: 3.2.7
Libs: -L${libdir} -lnl
Cflags: -I${includedir}/netlink
diff --git a/net/iproute2/BUILD b/net/iproute2/BUILD
index 2b9650d216..31036fdbe0 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 3502de87f4..3866c1e663 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 b74e909dc7..64c7593b95 100644
--- a/net/iproute2/HISTORY
+++ b/net/iproute2/HISTORY
@@ -1,3 +1,7 @@
+2012-01-28 Vlad Glagolev <stealth@sourcemage.org>
+ * BUILD: fixed compilation with 2.6.35 and such
+ * DEPENDS: added missing dependency
+
2012-01-20 Ladislav Hagara <hgr@vabo.cz>
* DETAILS: 3.2.0, SOURCE_URL[0] updated
* PRE_BUILD, m_xt.patch: patch removed
diff --git a/x11-libs/wine/DETAILS b/x11-libs/wine/DETAILS
index 566b5df56b..c42abe789e 100755
--- a/x11-libs/wine/DETAILS
+++ b/x11-libs/wine/DETAILS
@@ -12,7 +12,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
FORCE_DOWNLOAD=1
else
if [[ $WINE_BRANCH == devel ]]; then
- VERSION=1.3.37
+ VERSION=1.4-rc1
else
VERSION=1.2.3
fi
diff --git a/x11-libs/wine/HISTORY b/x11-libs/wine/HISTORY
index dd9a10e091..151b51389e 100644
--- a/x11-libs/wine/HISTORY
+++ b/x11-libs/wine/HISTORY
@@ -1,3 +1,6 @@
+2012-01-27 Eric Sandall <sandalle@sourcemage.org>
+ * DETAILS: Updated devel to 1.4-rc1
+
2012-01-13 Eric Sandall <sandalle@sourcemage.org>
* DETAILS: Updated devel to 1.3.37