3 files changed, 62 insertions, 0 deletions
diff --git a/mail/dbmail/files/extra-patch-acinclude.m4 b/mail/dbmail/files/extra-patch-acinclude.m4
new file mode 100644
index 000000000000..f0eb87c767d7
--- /dev/null
+++ b/mail/dbmail/files/extra-patch-acinclude.m4
@@ -0,0 +1,20 @@
+--- acinclude.m4.orig	2012-05-30 16:42:44.000000000 +0100
++++ acinclude.m4	2012-05-30 16:44:28.000000000 +0100
+@@ -235,7 +235,7 @@
+         dnl See if we already have the paths we need in the environment.
+ 	dnl ...but only if --with-ldap was given without a specific path.
+         if ( test [ "x$lookforldap" = "xyes" ] || test [ "x$lookforauthldap" = "xyes" ] ); then
+-            AC_CHECK_HEADERS([ldap.h],[LDAPLIB="-lldap"], [LDAPLIB="failed"])
++            AC_CHECK_HEADERS([ldap.h],[LDAPLIB="-lldap_r"], [LDAPLIB="failed"])
+             if test [ "x$LDAPLIB" != "xfailed" ]; then
+                 break
+             fi
+@@ -247,7 +247,7 @@
+             SAVE_CFLAGS=$CFLAGS
+ 	    dnl The headers might be in a funny place, so we need to use -Ipath
+             CFLAGS="$CFLAGS -L$TEST_PATH $LDAPINC"
+-            AC_CHECK_HEADERS([ldap.h],[LDAPLIB="-L$TEST_PATH -lldap"], [LDAPLIB="failed"])
++            AC_CHECK_HEADERS([ldap.h],[LDAPLIB="-L$TEST_PATH -lldap_r"], [LDAPLIB="failed"])
+             CFLAGS=$SAVE_CFLAGS
+             if test [ "x$LDAPLIB" != "xfailed" ]; then
+                 break 2
diff --git a/mail/dbmail/files/extra-patch-configure b/mail/dbmail/files/extra-patch-configure
new file mode 100644
index 000000000000..05a0660366c3
--- /dev/null
+++ b/mail/dbmail/files/extra-patch-configure
@@ -0,0 +1,29 @@
++++ configure.orig	2012-03-11 08:02:30.000000000 +0000
+--- configure	2012-05-31 12:47:22.000000000 +0100
+@@ -4420,7 +4420,7 @@
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LDAP_H 1
+ _ACEOF
+- LDAPLIB="-lldap"
++ LDAPLIB="-lldap_r"
+ else
+   LDAPLIB="failed"
+ fi
+@@ -4443,7 +4443,7 @@
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LDAP_H 1
+ _ACEOF
+- LDAPLIB="-L$TEST_PATH -lldap"
++ LDAPLIB="-L$TEST_PATH -lldap_r"
+ else
+   LDAPLIB="failed"
+ fi
+@@ -4489,7 +4489,7 @@
+   return 0;
+ }
+ _ACEOF
+-for ac_lib in '' ldap; do
++for ac_lib in '' ldap_r; do
+   if test -z "$ac_lib"; then
+     ac_res="none required"
+   else
diff --git a/mail/dbmail/files/patch-src_dbmail.h.in b/mail/dbmail/files/patch-src_dbmail.h.in
new file mode 100644
index 000000000000..fd54aff09470
--- /dev/null
+++ b/mail/dbmail/files/patch-src_dbmail.h.in
@@ -0,0 +1,13 @@
+--- src/dbmail.h.in.orig	2012-05-31 13:06:26.000000000 +0100
++++ src/dbmail.h.in	2012-05-31 13:07:01.000000000 +0100
+@@ -150,6 +150,10 @@
+ #include <endian.h>
+ #endif
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#endif
++
+ #define GETCONFIGVALUE(key, sect, var) \
+ 	config_get_value(key, sect, var); \
+ 	if (strlen(var) > 0) \