New commits:
commit bb5bd1a9511af7310e2c5f41b0f6595ed32d68f5
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
ffmpeg: => 0.7.1
commit 4366a78e253c344b461cb07bc74b8787495d37a7
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
sqlite: => 3.7.7
commit 6f8aeae13ce5a2ed2afb7d8e7f16c5d096a4d1d2
Author: Elisamuel Resto <ryuji AT simplysam.us>
Commit: Elisamuel Resto <ryuji AT simplysam.us>
libs/libee: updated to 0.3.1 (rsyslog 6.3.1 [devel] needs libee =>0.3.0)
commit b49cab0a680ac6ade5596ad2ea1a5b87f387e09c
Author: Elisamuel Resto <ryuji AT simplysam.us>
Commit: Elisamuel Resto <ryuji AT simplysam.us>
net/rpcbind: HISTORY entry with incorrect format
commit cfa3fcff884cdbca7bed1944f497316fae3ccb6b
Author: Elisamuel Resto <ryuji AT simplysam.us>
Commit: Elisamuel Resto <ryuji AT simplysam.us>
utils/rsyslog: devel updated to 6.3.1, v5stable updated to 5.8.2
commit 31fc84fb8b86af98aad3c702aabab70f5f539f97
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
dbus-python 0.84.0
commit bdbe1e1982ccb568e90a106586e11aff8729a6bf
Author: Elisamuel Resto <ryuji AT simplysam.us>
Commit: Elisamuel Resto <ryuji AT simplysam.us>
net/rpcbind: make rpcbind use 'sunrpc' service name
commit d6344b6a3a94b88ed67925a474de5930803acfbf
Author: Elisamuel Resto <ryuji AT simplysam.us>
Commit: Elisamuel Resto <ryuji AT simplysam.us>
libs/libtirpc: Added patch for possible overflow and fixed bug #11
commit b0507c8154ce2a4e0ba8ddc535d6dc1b9378ac98
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
shotwell 0.10.1
commit a2818e79962c73c14730cf3d7ea585d05b710606
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
libisofs: reimplemented version checking
commit 536bfb30d5ab0adee4e49e834ad4ecbba71d2dcd
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
bison: reimplemented version checking
commit 588384d1a72109e871ccef18a742047701f66b1c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
mesalib: reimplemented version checking
commit 769027dd433ce0136d0e3fb81461ac61462747f0
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
cairo: reimplemented version checking
commit 778306f9824138ccc42249e1b7e2ccc4cf32424a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
xfsdump: reimplemented version checking
commit 924263d20e35d0e5dee34e25b03e8a7723cb1497
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
gnumeric: reimplemented version checking
commit 7d42978e8f19f77f981f1ec09f230dcce3b25a09
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
pango: never forget FUNCTIONS
commit 1cea935f09ce7724e009e248a7ef8a38c4da5212
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
pango: reimplemented version checking
commit 75369fda366a897cb8483459f3621767162ec0f1
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
openswan: reimplemented version checking
commit aff5cfb1f7b18e2e3bdd1c2aa1420f0f94aefdd8
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
glib2: force pcre build when needed
commit 2727ef14411c87aa621ed78b61afb08a74867ebe
Author: Arwed von Merkatz <v.merkatz AT gmx.net>
Commit: Arwed von Merkatz <v.merkatz AT gmx.net>
swig: added optional_depends on pcre
commit cbf48408d1f502ecbcf1043ee2ba99e7d92a1ce0
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
psmisc 22.14
commit c4ce7eee709200d9997e5448e60452e20f173ca0
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
pulseaudio 0.9.23
commit b2274b4918914a06c56f95b5cfaf1c0d03108bda
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
curl 7.21.7, SECURITY_PATCH=8
commit 0d6405bd6326fb127f83a62eedfd0a0557f5fcd2
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Ladislav Hagara <ladislav.hagara AT unob.cz>
linux 2.6.32.42
commit 922234447c294a40fadb6455b5c2dd2fb1d286d9
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Ladislav Hagara <ladislav.hagara AT unob.cz>
linux 2.6.33.15
commit 315cdf172ce244baa9657a86c960c60f0d87522c
Author: Ladislav Hagara <ladislav.hagara AT unob.cz>
Commit: Ladislav Hagara <ladislav.hagara AT unob.cz>
linux 2.6.39.2
commit 0691b6987b430aa95a6f76271f4faccccddf3863
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
ocfs2-tools: => 1.6.4
commit a2c7c9a22079a8c8c34e115f7918b2d1a8c892f7
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
science/wxmaxima: new spell, a GUI for maxima
commit 97378bb354ee11d5af2fe7a02473ca2499f7ba1b
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>
pidgin: updated version to 2.9.0, SECURITY_PATCH++ (CVE-2011-2485)
commit def8faad0ad5891cfef17aa77e08adaf4beba708
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
pyside-tools: => 0.2.10
(cherry picked from commit 6ca29a8b10a8fab3ebe9cf83dea86c6059eea131)
commit 58d88dbc654042abb00e6b1d6d4ddadcea618c9f
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
pyside: => qt4.7+1.0.4
(cherry picked from commit 2e6ff61c618f836695a6fbb4979dcd5788ab6dfd)
commit 2efcf20c1271cbcd77609759a23f48bf5f3a8ca8
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
shiboken: => 1.0.4
(cherry picked from commit b2cb41fbe6a143abdbf9c61fb4101fb9b47c8822)
commit 3028a287c0e26691924283e5a9068ad876ac1d5a
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
generatorrunner: => 0.6.11
(cherry picked from commit a1c114d2601dee6097ad624904582c4da9d91c78)
commit 2fdcf856d6c32f36e6045c3d2ff92fe8c2635dda
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>
apiextractor: => 0.10.4
(cherry picked from commit 8ccedebce70f29863c30bdc303c5c7c2ac87e8dd)
commit aa361faf0090633a3508e672098a4fb8e6ea1ce4
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
science/maxima: added dependency on rlwrap
commit dd8bb9b3569e5be39f49fee17a647cda850168f1
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
nfs-utils: actually add the patch
commit c1f17ebd7be86d4f0f83bcd0e0c8bdd6de529f30
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>
nfs-utils: corrected test mount
commit 58d214f6c8fa23f0ee04f53721cce48fa8106f1c
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
pcsc-lite 1.7.3
commit c9e47c6f5092330505a9232b7bb6ef1119a9ee58
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>
gnutls 2.12.7
diff --git a/ChangeLog b/ChangeLog
index 2e641e6..1e7f460 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2011-06-24 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * science/wxmaxima: new spell, a GUI for maxima
+
2011-06-23 Vlad Glagolev <stealth AT sourcemage.org>
* net/iscsitarget: new spell, iSCSI enterprise target project
* net/open-iscsi: new spell, high performance, multi-platform
diff --git a/audio-drivers/pulseaudio/DETAILS
b/audio-drivers/pulseaudio/DETAILS
index d687f08..9242fe5 100755
--- a/audio-drivers/pulseaudio/DETAILS
+++ b/audio-drivers/pulseaudio/DETAILS
@@ -1,8 +1,8 @@
SPELL=pulseaudio
- VERSION=0.9.22
+ VERSION=0.9.23
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
- SOURCE_URL=http://0pointer.de/lennart/projects/${SPELL}/${SOURCE}
+ SOURCE_URL=http://freedesktop.org/software/$SPELL/releases/$SOURCE
SOURCE_GPG=gurus.gpg:${SOURCE}.sig
WEB_SITE=http://www.pulseaudio.org/
ENTERED=20070504
diff --git a/audio-drivers/pulseaudio/HISTORY
b/audio-drivers/pulseaudio/HISTORY
index b2f98b4..71ebcb3 100644
--- a/audio-drivers/pulseaudio/HISTORY
+++ b/audio-drivers/pulseaudio/HISTORY
@@ -1,3 +1,6 @@
+2011-06-24 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS: 0.9.23, SOURCE_URL updated
+
2010-11-26 Robin Cook <rcook AT wyrms.net>
* DETAILS: updated VERSION to 0.9.22
diff --git a/audio-drivers/pulseaudio/pulseaudio-0.9.22.tar.gz.sig
b/audio-drivers/pulseaudio/pulseaudio-0.9.22.tar.gz.sig
deleted file mode 100644
index d359196..0000000
Binary files a/audio-drivers/pulseaudio/pulseaudio-0.9.22.tar.gz.sig and
/dev/null differ
diff --git a/audio-drivers/pulseaudio/pulseaudio-0.9.23.tar.gz.sig
b/audio-drivers/pulseaudio/pulseaudio-0.9.23.tar.gz.sig
new file mode 100644
index 0000000..791b4ab
Binary files /dev/null and
b/audio-drivers/pulseaudio/pulseaudio-0.9.23.tar.gz.sig differ
diff --git a/chat-im/pidgin/DETAILS b/chat-im/pidgin/DETAILS
index ffc7af4..87a38b9 100755
--- a/chat-im/pidgin/DETAILS
+++ b/chat-im/pidgin/DETAILS
@@ -1,6 +1,6 @@
SPELL=pidgin
- VERSION=2.8.0
- SECURITY_PATCH=9
+ VERSION=2.9.0
+ SECURITY_PATCH=10
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/chat-im/pidgin/HISTORY b/chat-im/pidgin/HISTORY
index bfd545f..dbaba23 100644
--- a/chat-im/pidgin/HISTORY
+++ b/chat-im/pidgin/HISTORY
@@ -1,3 +1,6 @@
+2011-06-24 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 2.9.0, SECURITY_PATCH=10, CVE-2011-2485
+
2011-06-07 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated version to 2.8.0
diff --git a/chat-im/pidgin/pidgin-2.8.0.tar.bz2.sig
b/chat-im/pidgin/pidgin-2.8.0.tar.bz2.sig
deleted file mode 100644
index 4842c51..0000000
Binary files a/chat-im/pidgin/pidgin-2.8.0.tar.bz2.sig and /dev/null differ
diff --git a/chat-im/pidgin/pidgin-2.9.0.tar.bz2.sig
b/chat-im/pidgin/pidgin-2.9.0.tar.bz2.sig
new file mode 100644
index 0000000..a8793fe
Binary files /dev/null and b/chat-im/pidgin/pidgin-2.9.0.tar.bz2.sig differ
diff --git a/cluster/ocfs2-tools/DETAILS b/cluster/ocfs2-tools/DETAILS
index ca2e194..9e61dab 100755
--- a/cluster/ocfs2-tools/DETAILS
+++ b/cluster/ocfs2-tools/DETAILS
@@ -1,9 +1,9 @@
SPELL=ocfs2-tools
- VERSION=1.6.3
+ VERSION=1.6.4
BRANCH=`echo $VERSION|cut -d . -f 1,2`
SOURCE=${SPELL}-${VERSION}.tar.gz
SOURCE_URL[0]=http://oss.oracle.com/projects/${SPELL}/dist/files/source/v${BRANCH}/${SOURCE}
-
SOURCE_HASH=sha512:ab43c1c65e8475931fe7cc8f1f8daf7b5f2f069bbd61a9fb96cf5ed0b785e7fc37d0a3249378f1408ff4c9e1bc7c45b46a6701f43394c8cb91057f00da8dc540
+
SOURCE_HASH=sha512:3b5b834e23467736b2fc522449f3d86b9a4b4764a66ec6812e4ecf497f8d43c2fb1aba1955c6030336d88463e720a5ace0b7cde48853cf3b482c6727ed86a649
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE=http://oss.oracle.com/projects/${SPELL}
ENTERED=20060711
diff --git a/cluster/ocfs2-tools/HISTORY b/cluster/ocfs2-tools/HISTORY
index 2db2e9f..a319720 100644
--- a/cluster/ocfs2-tools/HISTORY
+++ b/cluster/ocfs2-tools/HISTORY
@@ -1,3 +1,6 @@
+2011-06-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 1.6.4
+
2011-01-15 Vlad Glagolev <stealth AT sourcemage.org>
* init.d/ocfs2{,.conf}: added init script and config (adopted from
official vendor-based script in distribution tarball, though without
diff --git a/crypto/gnutls/DETAILS b/crypto/gnutls/DETAILS
index c81b7e8..8b40c4d 100755
--- a/crypto/gnutls/DETAILS
+++ b/crypto/gnutls/DETAILS
@@ -70,9 +70,9 @@ case $GNUTLS_BRANCH in
if ! spell_installed pkgconfig; then
@@ -21,6 +23,12 @@ optional_depends -sub UTFPROP pcre \
"--with-pcre=internal" \
"Use system supplied PCRE. Otherwise, the internal PCRE
library will be used" &&
+if is_depends_enabled $SPELL pcre; then
+ if spell_ok pcre && is_version_less $(installed_version pcre) 8.11; then
+ force_depends pcre
+ fi
+fi &&
+
optional_depends libselinux \
"--enable-selinux" \
"--disable-selinux" \
diff --git a/gnome2-libs/glib2/HISTORY b/gnome2-libs/glib2/HISTORY
index 1a0509f..b61b6d1 100644
--- a/gnome2-libs/glib2/HISTORY
+++ b/gnome2-libs/glib2/HISTORY
@@ -1,3 +1,6 @@
+2011-06-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: force pcre version when needed
+
2011-06-06 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 2.28.8
diff --git a/gnome2-libs/pango/DEPENDS b/gnome2-libs/pango/DEPENDS
index 1988406..80ccad1 100755
--- a/gnome2-libs/pango/DEPENDS
+++ b/gnome2-libs/pango/DEPENDS
@@ -1,3 +1,5 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
depends automake &&
depends cairo &&
depends fontconfig &&
@@ -13,7 +15,7 @@ if is_depends_enabled $SPELL libx11; then
depends libxft &&
depends libxdmcp &&
depends libxrender &&
- if spell_ok cairo && [[ $(installed_version cairo) < 1.8 ]]; then
+ if spell_ok cairo && is_version_less $(installed_version cairo) 1.8; then
force_depends cairo
fi
fi &&
diff --git a/gnome2-libs/pango/HISTORY b/gnome2-libs/pango/HISTORY
index b03ad16..c781dcd 100644
--- a/gnome2-libs/pango/HISTORY
+++ b/gnome2-libs/pango/HISTORY
@@ -1,3 +1,6 @@
+2011-06-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: correctly compare versions
+
2011-04-05 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.28.4
diff --git a/libs/libtirpc/HISTORY b/libs/libtirpc/HISTORY
index cdfc516..d8f3f8c 100644
--- a/libs/libtirpc/HISTORY
+++ b/libs/libtirpc/HISTORY
@@ -1,3 +1,8 @@
+2011-06-24 Elisamuel Resto <ryuji AT sourcemage.org>
+ * PRE_BUILD: Added to apply patches and fix build
+ * libtirpc-0.2.1-fortify.patch: Avoid possible overflow if hp_length
< 4
+ * libtirpc-0.2.2-rpc-des-prot.patch: undeclared references to
`_des_crypt_call' (Bug #11)
+
2011-06-05 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 0.2.2
diff --git a/libs/libtirpc/PRE_BUILD b/libs/libtirpc/PRE_BUILD
new file mode 100755
index 0000000..e9f8dbd
--- /dev/null
+++ b/libs/libtirpc/PRE_BUILD
@@ -0,0 +1,9 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+# Avoid possible overflow if hp_length is less than four
+patch -p1 -i "${SPELL_DIRECTORY}/${SPELL}-0.2.1-fortify.patch" &&
+
+# This fixes the undefined reference to _des_crypt_call (Bug #11)
+patch -p1 -i "${SPELL_DIRECTORY}/${SPELL}-0.2.2-rpc-des-prot.patch" &&
+echo "" > "${SOURCE_DIRECTORY}/src/des_crypt.c"
diff --git a/libs/libtirpc/libtirpc-0.2.1-fortify.patch
b/libs/libtirpc/libtirpc-0.2.1-fortify.patch
new file mode 100644
index 0000000..7375bf8
--- /dev/null
+++ b/libs/libtirpc/libtirpc-0.2.1-fortify.patch
@@ -0,0 +1,18 @@
+Index: libtirpc-0.2.1/src/getrpcport.c
+===================================================================
+--- libtirpc-0.2.1.orig/src/getrpcport.c
++++ libtirpc-0.2.1/src/getrpcport.c
+@@ -54,11 +54,11 @@ getrpcport(host, prognum, versnum, proto
+
+ if ((hp = gethostbyname(host)) == NULL)
+ return (0);
++ if (hp->h_length != sizeof(addr.sin_addr.s_addr))
++ return (0);
+ memset(&addr, 0, sizeof(addr));
+ addr.sin_family = AF_INET;
+ addr.sin_port = 0;
+- if (hp->h_length > sizeof(addr))
+- hp->h_length = sizeof(addr);
+ memcpy(&addr.sin_addr.s_addr, hp->h_addr, (size_t)hp->h_length);
+ /* Inconsistent interfaces need casts! :-( */
+ return (pmap_getport(&addr, (u_long)prognum, (u_long)versnum,
diff --git a/libs/libtirpc/libtirpc-0.2.2-rpc-des-prot.patch
b/libs/libtirpc/libtirpc-0.2.2-rpc-des-prot.patch
new file mode 100644
index 0000000..c5de6da
--- /dev/null
+++ b/libs/libtirpc/libtirpc-0.2.2-rpc-des-prot.patch
@@ -0,0 +1,36 @@
+From f2f43212b33dea42635061c82645287454a70107 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier AT gentoo.org>
+Date: Sat, 11 Jun 2011 15:21:55 -0400
+Subject: [PATCH] add multiple inclusion protection to rpc/des.h
+
+If you try to include this file multiple times, you get a build failure
+due to redefinitions of enums and such.
+
+Signed-off-by: Mike Frysinger <vapier AT gentoo.org>
+---
+ tirpc/rpc/des.h | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/tirpc/rpc/des.h b/tirpc/rpc/des.h
+index e3d6897..d2881ad 100644
+--- a/tirpc/rpc/des.h
++++ b/tirpc/rpc/des.h
+@@ -33,6 +33,9 @@
+ * Copyright (c) 1986 by Sun Microsystems, Inc.
+ */
+
++#ifndef _RPC_DES_H_
++#define _RPC_DES_H_
++
+ #define DES_MAXLEN 65536 /* maximum # of bytes to encrypt */
+ #define DES_QUICKLEN 16 /* maximum # of bytes to encrypt quickly */
+
+@@ -80,3 +83,5 @@ struct desparams {
+ * Software DES.
+ */
+ extern int _des_crypt( char *, int, struct desparams * );
++
++#endif
+--
+1.7.5.3
+
diff --git a/net/nfs-utils/DETAILS b/net/nfs-utils/DETAILS
index 14b1580..bc25096 100755
--- a/net/nfs-utils/DETAILS
+++ b/net/nfs-utils/DETAILS
@@ -1,6 +1,6 @@
SPELL=nfs-utils
VERSION=1.1.6
- PATCHLEVEL=0
+ PATCHLEVEL=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/nfs/$SOURCE
diff --git a/net/nfs-utils/HISTORY b/net/nfs-utils/HISTORY
index ee31401..798c6ab 100644
--- a/net/nfs-utils/HISTORY
+++ b/net/nfs-utils/HISTORY
@@ -1,3 +1,8 @@
+2011-06-23 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL=1
+ * PRE_BUILD: apply the patch
+ * exportfs.patch: added, to fix test mount point
+
2010-10-06 Eric Sandall <sandalle AT sourcemage.org>
* PRE_BUILD: Apply sysstat.h
* sysstat.h: Fix missing includes of <sys/stat.h>
diff --git a/net/nfs-utils/PRE_BUILD b/net/nfs-utils/PRE_BUILD
index 80d2faf..d25ec16 100755
--- a/net/nfs-utils/PRE_BUILD
+++ b/net/nfs-utils/PRE_BUILD
@@ -1,5 +1,7 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
+patch -p0 < "$SPELL_DIRECTORY/exportfs.patch" &&
+
message "${MESSAGE_COLOR}Applying sys/stat.h patch...${DEFAULT_COLOR}" &&
-patch -p1 < "$SPELL_DIRECTORY"/sysstat.patch
+patch -p1 < "$SPELL_DIRECTORY/sysstat.patch"
diff --git a/net/nfs-utils/exportfs.patch b/net/nfs-utils/exportfs.patch
new file mode 100644
index 0000000..845ea15
--- /dev/null
+++ b/net/nfs-utils/exportfs.patch
@@ -0,0 +1,21 @@
+--- support/nfs/exports.c.orig
++++ support/nfs/exports.c
+@@ -142,9 +142,14 @@ getexportent(int fromkernel, int fromexports)
+ return NULL;
+ }
+ first = 0;
+-
+- /* Check for default options */
+- if (exp[0] == '-') {
++
++ /*
++ * Check for default options. The kernel will never have default
++ * options in /proc/fs/nfs/exports, however due to the initial '-' in
++ * the -test-client- string from the test export we have to check that
++ * we're not reading from the kernel.
++ */
++ if (exp[0] == '-' && !fromkernel) {
+ if (parseopts(exp + 1, &def_ee, 0, &has_default_subtree_opts)
< 0)
+ return NULL;
+
+
diff --git a/net/openswan/DEPENDS b/net/openswan/DEPENDS
index 3f2f5ad..c63eeba 100755
--- a/net/openswan/DEPENDS
+++ b/net/openswan/DEPENDS
@@ -1,16 +1,13 @@
+. "$GRIMOIRE/FUNCTIONS" &&
+
depends gmp &&
depends iproute2 &&
depends iptables &&
-local IPR2VER=$(installed_version iproute2) &&
-
-if spell_ok iproute2 && [[ $IPR2VER < 2.6.08 ]]; then
+if spell_ok iproute2 && is_version_less $(installed_version iproute2) 2.6.8;
then
force_depends iproute2
fi &&
-. "$GRIMOIRE/FUNCTIONS" &&
-local KVER=$(get_kernel_version) &&
-
-if [[ $KVER < 2.6.09 ]]; then
+if is_version_less $(get_kernel_version) 2.6.9; then
depends ipsec-tools
fi
diff --git a/net/openswan/HISTORY b/net/openswan/HISTORY
index fe442ce..2d48929 100644
--- a/net/openswan/HISTORY
+++ b/net/openswan/HISTORY
@@ -1,3 +1,6 @@
+2011-06-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DEPENDS: use is_version_less() to compare versions carefully
+
2011-06-20 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: corrected version check
diff --git a/net/rpcbind/HISTORY b/net/rpcbind/HISTORY
index 05573c6..7b2bc7f 100644
--- a/net/rpcbind/HISTORY
+++ b/net/rpcbind/HISTORY
@@ -1,3 +1,6 @@
+2011-06-24 ELisamuel Resto <ryuji AT sourcemage.org>
+ * PRE_BUILD, rpcbind-sunrpc.patch: Make rpcbind use 'sunrpc' service
name
+
2010-04-07 Elisamuel Resto <ryuji AT sourcemage.org>
* CONFLICTS, DEPENDS, DETAILS, PROVIDES: spell created