security-manager: Improve integration

This fixes some issues encountered by the current
integration of the security-manager:

 - its recipes is spread in too much directories (see SPEC-2092)
 - its initialization should be checked (see SPEC-2091)
 - the location of the database has to be changed
   (see SPEC-1717 that provided a workaround)

All in one, I decided to create that ticket that summarize
the work that can be quickly achieved to answer all this
issues that are tightly coupled.

Bug-AGL: SPEC-2972
Bug-AGL: SPEC-2092
Bug-AGL: SPEC-2091
Bug-AGL: SPEC-1717

Change-Id: I7af941c25cfa1624d76c2e8f512f6535918912f0
Signed-off-by: José Bollo <jose.bollo@iot.bzh>

1 files changed, 0 insertions, 78 deletions

diff --git a/meta-security/recipes-security/security-manager/security-manager/removes-dependency-to-libslp-db-utils.patch b/meta-security/recipes-security/security-manager/security-manager/removes-dependency-to-libslp-db-utils.patch
deleted file mode 100644
index f94973074..000000000
--- a/meta-security/recipes-security/security-manager/security-manager/removes-dependency-to-libslp-db-utils.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 1e2f8f58d4320afa1d83a6f94822e53346108ee8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jos=C3=A9=20Bollo?= <jose.bollo@iot.bzh>
-Date: Mon, 16 Nov 2015 15:56:27 +0100
-Subject: [PATCH] removes dependency to libslp-db-utils
-
-Change-Id: I90471e77d20e04bae58cc42eb2639e4aef97fdec
----
- src/common/CMakeLists.txt         |  1 ++-
- src/dpl/db/src/sql_connection.cpp | 17 +----------------
- 2 files changed, 3 additions(+), 17 deletions(-)
-
-diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
-index 968c7c1..d1fe644 100644
---- a/src/common/CMakeLists.txt
-+++ b/src/common/CMakeLists.txt
-@@ -5,7 +5,8 @@ PKG_CHECK_MODULES(COMMON_DEP
-     REQUIRED
-     libsystemd
-     libsmack
--    db-util
-+    sqlite3 
-+    icu-i18n
-     cynara-admin
-     cynara-client
-     )
-diff --git a/src/dpl/db/src/sql_connection.cpp b/src/dpl/db/src/sql_connection.cpp
-index fdb4fe4..1fb97be 100644
---- a/src/dpl/db/src/sql_connection.cpp
-+++ b/src/dpl/db/src/sql_connection.cpp
-@@ -26,7 +26,6 @@
- #include <memory>
- #include <dpl/noncopyable.h>
- #include <dpl/assert.h>
--#include <db-util.h>
- #include <unistd.h>
- #include <cstdio>
- #include <cstdarg>
-@@ -606,16 +605,7 @@ void SqlConnection::Connect(const std::string &address,
- 
-     // Connect to database
-     int result;
--    if (type & Flag::UseLucene) {
--        result = db_util_open_with_options(
--                address.c_str(),
--                &m_connection,
--                flag,
--                NULL);
--
--        m_usingLucene = true;
--        LogPedantic("Lucene index enabled");
--    } else {
-+    (void)type;
-         result = sqlite3_open_v2(
-                 address.c_str(),
-                 &m_connection,
-@@ -624,7 +614,6 @@ void SqlConnection::Connect(const std::string &address,
- 
-         m_usingLucene = false;
-         LogPedantic("Lucene index disabled");
--    }
- 
-     if (result == SQLITE_OK) {
-         LogPedantic("Connected to DB");
-@@ -653,11 +642,7 @@ void SqlConnection::Disconnect()
- 
-     int result;
- 
--    if (m_usingLucene) {
--        result = db_util_close(m_connection);
--    } else {
-         result = sqlite3_close(m_connection);
--    }
- 
-     if (result != SQLITE_OK) {
-         const char *error = sqlite3_errmsg(m_connection);
--- 
-2.1.4
-