security-manager: Improve integration

[AGL/meta-agl.git] / meta-security / recipes-security / security-manager / security-manager / 0006-socket-manager-removes-tizen-specific-call.patch

diff --git a/meta-security/recipes-security/security-manager/security-manager/socket-manager-removes-tizen-specific-call.patch b/meta-security/recipes-security/security-manager/security-manager/0006-socket-manager-removes-tizen-specific-call.patch
similarity index 87%
rename from meta-security/recipes-security/security-manager/security-manager/socket-manager-removes-tizen-specific-call.patch
rename to meta-security/recipes-security/security-manager/security-manager/0006-socket-manager-removes-tizen-specific-call.patch
index fa4c21c..3b8aad9 100644 (file)
--- a/meta-security/recipes-security/security-manager/security-manager/socket-manager-removes-tizen-specific-call.patch
+++ b/meta-security/recipes-security/security-manager/security-manager/0006-socket-manager-removes-tizen-specific-call.patch
@@ -1,7 +1,7 @@
-From 75c4852e47217ab85d6840b488ab4b3688091856 Mon Sep 17 00:00:00 2001
+From ec098bf03cea23350ca7d1ea2ad88b9c88228943 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Jos=C3=A9=20Bollo?= <jose.bollo@iot.bzh>
 Date: Fri, 8 Jan 2016 16:53:46 +0100
-Subject: [PATCH 1/2] socket-manager: removes tizen specific call
+Subject: [PATCH 06/14] socket-manager: removes tizen specific call
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -18,7 +18,7 @@ Signed-off-by: José Bollo <jobol@nonadev.net>
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/src/server/main/socket-manager.cpp b/src/server/main/socket-manager.cpp
-index 0366186..c5cec18 100644
+index 94c54c6..5e1a79b 100644
 --- a/src/server/main/socket-manager.cpp
 +++ b/src/server/main/socket-manager.cpp
 @@ -30,6 +30,7 @@
@@ -29,7 +29,7 @@ index 0366186..c5cec18 100644
  #include <sys/un.h>
  #include <sys/stat.h>
  #include <unistd.h>
-@@ -500,9 +501,9 @@ int SocketManager::CreateDomainSocketHelp(
+@@ -493,9 +494,9 @@ int SocketManager::CreateDomainSocketHelp(
      if (smack_check()) {
          LogInfo("Set up smack label: " << desc.smackLabel);
  
@@ -43,5 +43,5 @@ index 0366186..c5cec18 100644
      } else {
          LogInfo("No smack on platform. Socket won't be securied with smack label!");
 -- 
-2.1.4
+2.21.0