Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

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

 database/tdb/CONFLICTS |    3 +++
 database/tdb/HISTORY   |    3 +++
 libs/talloc/CONFLICTS  |    3 +++
 libs/talloc/HISTORY    |    3 +++
 net/samba/CONFIGURE    |    9 ++++++++-
 net/samba/CONFLICTS    |    7 ++++++-
 net/samba/DEPENDS      |   30 +++++++++++++++++++++---------
 net/samba/HISTORY      |    4 ++++
 8 files changed, 51 insertions(+), 11 deletions(-)

New commits:
commit 1b8ea892f36b7f74ac3b46a5684cf330d67b9d20
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    samba: handle conflicts more precisely

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

    talloc: fixed conflict with samba's internal lib

commit 4de64596b35689c1e0ff7f976d98ab3ad3d1eaa2
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    tdb: fixed conflict with samba's internal lib

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

    samba: fixed conflicts with tdb and talloc

diff --git a/database/tdb/CONFLICTS b/database/tdb/CONFLICTS
new file mode 100755
index 0000000..125f2d3
--- /dev/null
+++ b/database/tdb/CONFLICTS
@@ -0,0 +1,3 @@
+if ! is_depends_enabled samba tdb; then
+  conflicts samba
+fi
diff --git a/database/tdb/HISTORY b/database/tdb/HISTORY
index 6498440..89709a1 100644
--- a/database/tdb/HISTORY
+++ b/database/tdb/HISTORY
@@ -1,3 +1,6 @@
+2013-02-02 Vlad Glagolev <stealth AT sourcemage.org>
+       * CONFLICTS: conflicts with samba's internal lib
+
 2012-12-12 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: added FTP mirror
 
diff --git a/libs/talloc/CONFLICTS b/libs/talloc/CONFLICTS
new file mode 100755
index 0000000..1f6fb26
--- /dev/null
+++ b/libs/talloc/CONFLICTS
@@ -0,0 +1,3 @@
+if ! is_depends_enabled samba talloc; then
+  conflicts samba
+fi
diff --git a/libs/talloc/HISTORY b/libs/talloc/HISTORY
index bd41760..36bcf3d 100644
--- a/libs/talloc/HISTORY
+++ b/libs/talloc/HISTORY
@@ -1,3 +1,6 @@
+2013-02-02 Vlad Glagolev <stealth AT sourcemage.org>
+       * CONFLICTS: conflicts with samba's internal lib
+
 2012-12-09 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 2.0.8
 
diff --git a/net/samba/CONFIGURE b/net/samba/CONFIGURE
index 9397bb1..22f87ac 100755
--- a/net/samba/CONFIGURE
+++ b/net/samba/CONFIGURE
@@ -15,4 +15,11 @@ config_query_option  SAMBA_QUOTA  "Enable disk-quota 
support?"       n  \
 
 message "Samba can use samba-vfs with a virus scanner,"               &&
 message "You will still have to select which scanner to use."        &&
-config_query  SAMBA_VSCAN  "Do you want to add support for on-acces virus 
scannning?" n
+config_query  SAMBA_VSCAN  "Do you want to add support for on-acces virus 
scannning?" n &&
+
+# must be the last query
+if spell_ok tdb || spell_ok talloc; then
+  message "${MESSAGE_COLOR}Installed versions of tdb and/or talloc spells 
detected." &&
+  message "You won't be able to use internal copies of them from 
$SPELL.${DEFAULT_COLOR}" &&
+  config_query SAMBA_CROSSLIB "Do you want to avoid that and run conflicts 
procedure?" n
+fi
diff --git a/net/samba/CONFLICTS b/net/samba/CONFLICTS
index dc88904..2d8d6f0 100755
--- a/net/samba/CONFLICTS
+++ b/net/samba/CONFLICTS
@@ -1 +1,6 @@
-conflicts  samba4
+conflicts  samba4 &&
+
+if [[ $SAMBA_CROSSLIB == y ]]; then
+  conflicts tdb y
+  conflicts talloc y
+fi
diff --git a/net/samba/DEPENDS b/net/samba/DEPENDS
index 2d7e83e..48e457e 100755
--- a/net/samba/DEPENDS
+++ b/net/samba/DEPENDS
@@ -11,15 +11,27 @@ else
                     "for LDAP support"
 fi  &&
 
-optional_depends  talloc \
-                  "--enable-external-libtalloc" \
-                  "--disable-external-libtalloc" \
-                  "to use system talloc library" &&
-
-optional_depends  tdb \
-                  "--enable-external-libtdb" \
-                  "--disable-external-libtdb" \
-                  "to use system tdb library" &&
+if ! spell_ok talloc; then
+  optional_depends talloc \
+                   "--enable-external-libtalloc" \
+                   "--disable-external-libtalloc" \
+                   "to use system talloc library"
+else
+  if [[ $SAMBA_CROSSLIB == n ]]; then
+    depends talloc '--enable-external-libtalloc'
+  fi
+fi &&
+
+if ! spell_ok tdb; then
+  optional_depends tdb \
+                   "--enable-external-libtdb" \
+                   "--disable-external-libtdb" \
+                   "to use system tdb library"
+else
+  if [[ $SAMBA_CROSSLIB == n ]]; then
+    depends tdb '--enable-external-libtdb'
+  fi
+fi &&
 
 optional_depends  libcap "" "" "for POSIX capability support" &&
 
diff --git a/net/samba/HISTORY b/net/samba/HISTORY
index 3608d9c..d0fb138 100644
--- a/net/samba/HISTORY
+++ b/net/samba/HISTORY
@@ -1,3 +1,7 @@
+2013-02-02 Vlad Glagolev <stealth AT sourcemage.org>
+       * CONFLICTS, CONFIGURE, DEPENDS: both samba and tdb/talloc install
+         libtdb.so / libtalloc.so when ext. lib usage is disabled
+
 2013-01-23 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: updated spell to 3.6.11