Source Mage code commit list

[Florian Franzmann <scm AT sourcemage.org>]

GIT changes to master grimoire by Florian Franzmann 
<siflfran AT hawo.stw.uni-erlangen.de>:

 net/samba/HISTORY                |    4 ++++
 net/samba/PRE_BUILD              |    1 +
 net/samba/valgrind-include.patch |   20 ++++++++++++++++++++
 3 files changed, 25 insertions(+)

New commits:
commit c3faee9b0f21830397c5e43dad3711718420b80a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

    net/samba: fixed a compile error

diff --git a/net/samba/HISTORY b/net/samba/HISTORY
index c8e2413..3c24219 100644
--- a/net/samba/HISTORY
+++ b/net/samba/HISTORY
@@ -1,3 +1,7 @@
+2008-05-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+       * PRE_BUILD, valgrind-include.patch: added a patch to fix a
+         compile error
+
 2008-05-22 Ladislav Hagara <hgr AT vabo.cz>
        * DETAILS: 3.0.29
 
diff --git a/net/samba/PRE_BUILD b/net/samba/PRE_BUILD
index dd1e6db..775e18c 100755
--- a/net/samba/PRE_BUILD
+++ b/net/samba/PRE_BUILD
@@ -2,6 +2,7 @@ default_pre_build      &&
 cd  $SOURCE_DIRECTORY  &&
 
 patch -p1 < $SCRIPT_DIRECTORY/libcap.patch  &&
+patch -p1 < $SCRIPT_DIRECTORY/valgrind-include.patch  &&
 
 sedit  's!libsmbclient.*\$(LIBDIR)!&/..!'  source/Makefile.in  &&
 
diff --git a/net/samba/valgrind-include.patch 
b/net/samba/valgrind-include.patch
new file mode 100644
index 0000000..e4f5463
--- /dev/null
+++ b/net/samba/valgrind-include.patch
@@ -0,0 +1,20 @@
+diff -Naupr samba-3.0.29.orig/source/include/includes.h 
samba-3.0.29/source/include/includes.h
+--- samba-3.0.29.orig/source/include/includes.h        2008-05-25 
15:19:04.092291327 +0200
++++ samba-3.0.29/source/include/includes.h     2008-05-25 15:19:34.167036737 
+0200
+@@ -255,6 +255,7 @@ typedef int ber_int_t;
+ #include <aio.h>
+ #endif
+ 
++#if 0
+ /* skip valgrind headers on 64bit AMD boxes */
+ #ifndef HAVE_64BIT_LINUX
+ /* Special macros that are no-ops except when run under Valgrind on
+@@ -275,7 +276,7 @@ typedef int ber_int_t;
+ #define VALGRIND
+ #endif
+ #endif
+-
++#endif
+ 
+ /* we support ADS if we want it and have krb5 and ldap libs */
+ #if defined(WITH_ADS) && defined(HAVE_KRB5) && defined(HAVE_LDAP)