recipes-tizen/security-server/security-server/remove-dlog-for-native-build.patch

   1 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
   2 index 1bb5feb..cf169e2 100644
   3 --- a/src/CMakeLists.txt
   4 +++ b/src/CMakeLists.txt
   5 @@ -1,9 +1,7 @@
   6  PKG_CHECK_MODULES(SECURITY_SERVER_DEP
   7 -    dlog
   8      openssl
   9      libsmack
  10      libprivilege-control
  11 -    libsystemd-daemon
  12      REQUIRED
  13      )
  14
  15
  16 diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt
  17 index 0fad220..d4aa492 100644
  18 --- a/src/server/CMakeLists.txt
  19 +++ b/src/server/CMakeLists.txt
  20 @@ -1,5 +1,4 @@
  21  PKG_CHECK_MODULES(COMMON_DEP
  22 -    dlog
  23      REQUIRED
  24      )
  25
  26 @@ -10,7 +9,6 @@ SET(COMMON_SOURCES
  27      ${COMMON_PATH}/common/message-buffer.cpp
  28      ${COMMON_PATH}/common/smack-check.cpp
  29      ${COMMON_PATH}/dpl/log/src/abstract_log_provider.cpp
  30 -    ${COMMON_PATH}/dpl/log/src/dlog_log_provider.cpp
  31      ${COMMON_PATH}/dpl/log/src/log.cpp
  32      ${COMMON_PATH}/dpl/log/src/old_style_log_provider.cpp
  33      ${COMMON_PATH}/dpl/log/src/audit-smack-log.cpp
  34 diff --git a/src/server/dpl/log/src/log.cpp b/src/server/dpl/log/src/log.cpp
  35 index ef67fb2..4db0665 100644
  36 --- a/src/server/dpl/log/src/log.cpp
  37 +++ b/src/server/dpl/log/src/log.cpp
  38 @@ -24,7 +24,6 @@
  39
  40  #include <dpl/log/log.h>
  41  #include <dpl/singleton_impl.h>
  42 -#include <dpl/log/dlog_log_provider.h>
  43  #include <dpl/log/old_style_log_provider.h>
  44  #include <dpl/log/audit-smack-log.h>
  45
  46 @@ -118,12 +117,7 @@ LogSystem::LogSystem() :
  47                                              oldStyleWarningLogs,
  48                                              oldStyleErrorLogs,
  49                                              oldStylePedanticLogs));
  50 -    } else {
  51 -        // DLOG
  52 -        AddProvider(new DLOGLogProvider());
  53      }
  54 -#else // BUILD_TYPE_DEBUG
  55 -    AddProvider(new DLOGLogProvider());
  56  #endif // BUILD_TYPE_DEBUG
  57  }
  58
  59 diff --git a/src/server/dpl/log/src/old_style_log_provider.cpp b/src/server/dpl/log/src/old_style_log_provider.cpp
  60 index 4c10749..497d955 100644
  61 --- a/src/server/dpl/log/src/old_style_log_provider.cpp
  62 +++ b/src/server/dpl/log/src/old_style_log_provider.cpp
  63 @@ -27,7 +27,6 @@
  64  #include <sstream>
  65  #include <sys/time.h>
  66  #include <unistd.h>
  67 -#include <dlog.h>
  68
  69  namespace SecurityServer {
  70  namespace Log {
  71 diff --git a/src/server/main/socket-manager.cpp b/src/server/main/socket-manager.cpp
  72 index 69b278e..cc3f2f2 100644
  73 --- a/src/server/main/socket-manager.cpp
  74 +++ b/src/server/main/socket-manager.cpp
  75 @@ -38,7 +38,7 @@
  76  #include <errno.h>
  77  #include <time.h>
  78
  79 -#include <systemd/sd-daemon.h>
  80 +//#include <systemd/sd-daemon.h>
  81
  82  #include <dpl/log/log.h>
  83  #include <dpl/assert.h>
  84 @@ -339,8 +339,6 @@ void SocketManager::MainLoop() {
  85      // uncomment it after removing old security-server code
  86      // sd_listen_fds(1);
  87
  88 -    // Daemon is ready to work.
  89 -    sd_notify(0, "READY=1");
  90
  91      m_working = true;
  92      while(m_working) {
  93 @@ -451,34 +449,6 @@ void SocketManager::MainLoopStop()
  94      NotifyMe();
  95  }
  96
  97 -int SocketManager::GetSocketFromSystemD(
  98 -    const GenericSocketService::ServiceDescription &desc)
  99 -{
 100 -    int fd;
 101 -
 102 -    // TODO optimalization - do it once in object constructor
 103 -    //                       and remember all information path->sockfd
 104 -    int n = sd_listen_fds(0);
 105 -
 106 -    LogInfo("sd_listen_fds returns: " << n);
 107 -
 108 -    if (n < 0) {
 109 -        LogError("Error in sd_listend_fds");
 110 -        ThrowMsg(Exception::InitFailed, "Error in sd_listend_fds");
 111 -    }
 112 -
 113 -    for(fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START+n; ++fd) {
 114 -        if (0 < sd_is_socket_unix(fd, SOCK_STREAM, 1,
 115 -                                  desc.serviceHandlerPath.c_str(), 0))
 116 -        {
 117 -            LogInfo("Useable socket " << desc.serviceHandlerPath <<
 118 -                " was passed by SystemD under descriptor " << fd);
 119 -            return fd;
 120 -        }
 121 -    }
 122 -    LogInfo("No useable sockets were passed by systemd.");
 123 -    return -1;
 124 -}
 125
 126  int SocketManager::CreateDomainSocketHelp(
 127      const GenericSocketService::ServiceDescription &desc)
 128 @@ -552,7 +522,7 @@ void SocketManager::CreateDomainSocket(
 129      GenericSocketService *service,
 130      const GenericSocketService::ServiceDescription &desc)
 131  {
 132 -    int sockfd = GetSocketFromSystemD(desc);
 133 +    int sockfd = -1;
 134      if (-1 == sockfd)
 135          sockfd = CreateDomainSocketHelp(desc);
 136