From 0006ff8a3f73db336c7cd53d764ecfa0e721b1b1 Mon Sep 17 00:00:00 2001
From: Sungbae Yoo <sungbae.yoo@samsung.com>
Date: Fri, 19 Aug 2016 18:38:56 +0900
Subject: [PATCH 01/16] Add managing author package and put their infomation in
 manifest

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
Change-Id: Ie0b3891958ad256258faf861a9d414564ee1117b
---
 server/manager.cpp | 28 +++++++++++++++++++++++++---
 server/server.cpp  | 12 ++++++++++++
 server/server.h    |  2 ++
 3 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/server/manager.cpp b/server/manager.cpp
index 5d6bc03..0bf09d0 100644
--- a/server/manager.cpp
+++ b/server/manager.cpp
@@ -514,7 +514,9 @@ Manager::~Manager()
 
 int Manager::createKrate(const std::string& name, const std::string& manifest)
 {
-	auto provisioningWorker = [name, manifest, this]() {
+	const std::string& pkgId = context.getPeerPackageId();
+
+	auto provisioningWorker = [name, manifest, pkgId, this]() {
 		std::unique_ptr<xml::Document> manifestFile;
 
 		try {
@@ -537,10 +539,13 @@ int Manager::createKrate(const std::string& name, const std::string& manifest)
 			maskUserServices(user);
 
 			manifestFile.reset(xml::Parser::parseString(manifest));
+			//write container author info
+			if (!pkgId.empty()) {
+				std::cout << manifestFile->getRootNode().getName() << std::endl;
+				manifestFile->getRootNode().addNewChild("author").setContent(pkgId);
+			}
 			manifestFile->write(CONF_PATH "/" + name + ".xml", "UTF-8", true);
 
-			//TODO: write container owner info
-
 			//unlock the user
 			setKrateState(user.getUid(), 1);
 
@@ -564,6 +569,23 @@ int Manager::createKrate(const std::string& name, const std::string& manifest)
 
 int Manager::removeKrate(const std::string& name)
 {
+	const std::string& pkgId = context.getPeerPackageId();
+	std::unique_ptr<xml::Document> manifestFile;
+	bool canRemove = false;
+
+	manifestFile.reset(xml::Parser::parseFile(CONF_PATH "/" + name + ".xml"));
+	xml::Node::NodeList authors = manifestFile->evaluate("/manifest/author");
+	for (const xml::Node& author : authors) {
+		if (author.getContent() == pkgId) {
+			canRemove = true;
+			break;
+		}
+	}
+
+	if (!canRemove) {
+		return -1;
+	}
+
 	if (lockKrate(name) != 0) {
 		return -1;
 	}
diff --git a/server/server.cpp b/server/server.cpp
index 4db963d..227429f 100644
--- a/server/server.cpp
+++ b/server/server.cpp
@@ -15,6 +15,7 @@
  */
 #include <functional>
 
+#include <aul.h>
 #include <cynara-client.h>
 #include <cynara-session.h>
 
@@ -65,6 +66,17 @@ void Server::terminate()
 	service->stop();
 }
 
+const std::string Server::getPeerPackageId() const
+{
+	char pkgid[PATH_MAX];
+
+	if (aul_app_get_pkgid_bypid_for_uid(getPeerPid(), pkgid, sizeof(pkgid), getPeerUid()) != AUL_R_OK) {
+		return "";
+	}
+
+	return pkgid;
+}
+
 runtime::FileDescriptor Server::registerNotificationSubscriber(const std::string& name)
 {
 	return runtime::FileDescriptor(service->subscribeNotification(name), true);
diff --git a/server/server.h b/server/server.h
index 6d07bbe..a8a1850 100644
--- a/server/server.h
+++ b/server/server.h
@@ -60,6 +60,8 @@ public:
 		return service->getPeerPid();
 	}
 
+	const std::string getPeerPackageId() const;
+
 	void createNotification(const std::string& name)
 	{
 		service->createNotification(name);
-- 
2.7.4


From 33bd97c33e0bd4f943c81834e51c1fa93cd929de Mon Sep 17 00:00:00 2001
From: Sungbae Yoo <sungbae.yoo@samsung.com>
Date: Mon, 29 Aug 2016 16:41:31 +0900
Subject: [PATCH 02/16] Add an indicator icon that shows foreground app is in
 krate

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
Change-Id: I0fefb395ecaf8f40f34b2c2f7456c378135ef24b
---
 server/manager.cpp | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/server/manager.cpp b/server/manager.cpp
index 0bf09d0..ec6f58a 100644
--- a/server/manager.cpp
+++ b/server/manager.cpp
@@ -226,7 +226,7 @@ void krateProcessCallback(GDBusConnection *connection,
 	static runtime::User owner(KRATE_DEFAULT_OWNER);
 	int pid, status;
 
-//	notification_h noti = reinterpret_cast<notification_h>(userData);
+	notification_h noti = reinterpret_cast<notification_h>(userData);
 
 	g_variant_get(params, "(ii)", &status, &pid);
 
@@ -240,20 +240,18 @@ void krateProcessCallback(GDBusConnection *connection,
 		return;
 	}
 
-	// this will have been commented until notification_delete_for_uid can work
-	/*
-	if (owner.getUid() != st.st_uid) {
+	if (st.st_uid == owner.getUid() || st.st_uid == 0) {
+		if (isKrateForeground) {
+			notification_delete_for_uid(noti, owner.getUid());
+			isKrateForeground = false;
+		}
+	} else {
 		if (!isKrateForeground) {
 			notification_set_text(noti, NT_CONTENT, NT_APPINFO, NULL, NT_NONE);
 			notification_post_for_uid(noti, owner.getUid());
 			isKrateForeground = true;
 		}
-	} else {
-		if (isKrateForeground) {
-			notification_delete_for_uid(noti, owner.getUid());
-			isKrateForeground = false;
-		}
-	}*/
+	}
 }
 
 notification_h createNotification()
-- 
2.7.4


From 0f6bae77ecfaefb2c5628e2c402eb6192b207c34 Mon Sep 17 00:00:00 2001
From: Sungbae Yoo <sungbae.yoo@samsung.com>
Date: Mon, 29 Aug 2016 16:51:41 +0900
Subject: [PATCH 03/16] Remove unnecessary notification privilege in kaskit

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
Change-Id: I4ead8a241a0f1fa8d8af33fac66250fc21d3c361
---
 tools/apps/kaskit/org.tizen.kaskit.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/apps/kaskit/org.tizen.kaskit.xml b/tools/apps/kaskit/org.tizen.kaskit.xml
index e51ac98..846be83 100644
--- a/tools/apps/kaskit/org.tizen.kaskit.xml
+++ b/tools/apps/kaskit/org.tizen.kaskit.xml
@@ -5,7 +5,6 @@
         <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
         <privilege>http://tizen.org/privilege/packagemanager.info</privilege>
         <privilege>http://tizen.org/privilege/packagemanager.admin</privilege>
-        <privilege>http://tizen.org/privilege/notification</privilege>
     </privileges>
     <ui-application appid="org.tizen.kaskit" exec="/usr/apps/org.tizen.kaskit/bin/org.tizen.kaskit" multiple="false" nodisplay="true" taskmanage="true" type="capp">
         <label>Kaskit</label>
-- 
2.7.4


From ead59944dc03a80684034430c949e3ac95ba26ea Mon Sep 17 00:00:00 2001
From: Sungbae Yoo <sungbae.yoo@samsung.com>
Date: Mon, 5 Sep 2016 17:10:43 +0900
Subject: [PATCH 04/16] Add functions to support lazymount

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
Change-Id: Ide13f73d52c5340d26b5382d7dabc9ef10050b0a
---
 module/krate-builder.cpp |  6 ++++-
 module/krate-builder.h   |  3 ++-
 module/krate.cpp         | 64 +++++++++++++++++++++++++++++++++++-------------
 packaging/krate.spec     |  2 +-
 4 files changed, 55 insertions(+), 20 deletions(-)

diff --git a/module/krate-builder.cpp b/module/krate-builder.cpp
index bbb8797..9a568b7 100644
--- a/module/krate-builder.cpp
+++ b/module/krate-builder.cpp
@@ -48,7 +48,7 @@ void KrateBuilder::bindFilesystemNode(const std::string& source, const std::stri
 	runtime::Mount::mountEntry(source, target, type, options);
 }
 
-void KrateBuilder::containerize(bool create)
+void KrateBuilder::unshareNamespace()
 {
 	int nsFlags = CLONE_NEWIPC | CLONE_NEWNS;
 
@@ -59,6 +59,10 @@ void KrateBuilder::containerize(bool create)
 	if (::mount(NULL, "/", NULL, MS_SLAVE | MS_REC, NULL) == -1) {
 		throw runtime::Exception("Failed to mount root filesystem");
 	}
+}
+
+void KrateBuilder::mountOwnFilesystem() {
+	manifest.reset(xml::Parser::parseFile("/opt/etc/krate/owner.xml"));
 
 	xml::Node::NodeList entries = manifest->evaluate("/manifest/filesystem/entry");
 	for (const xml::Node& entry : entries) {
diff --git a/module/krate-builder.h b/module/krate-builder.h
index 1e03ef8..5bb05d5 100644
--- a/module/krate-builder.h
+++ b/module/krate-builder.h
@@ -29,7 +29,8 @@ public:
 	KrateBuilder(const runtime::User& user, const std::string& manifestPath);
 	virtual ~KrateBuilder();
 
-	void containerize(bool create = true);
+	void unshareNamespace();
+	void mountOwnFilesystem();
 
 protected:
 	void bindFilesystemNode(const std::string& source, const std::string& target,
diff --git a/module/krate.cpp b/module/krate.cpp
index 84496cf..ff21670 100644
--- a/module/krate.cpp
+++ b/module/krate.cpp
@@ -20,6 +20,7 @@
 
 #include <string>
 #include <vector>
+#include <iostream>
 
 #include "session.h"
 #include "krate-guard.h"
@@ -30,6 +31,8 @@
 #include <klay/xml/parser.h>
 #include <klay/xml/document.h>
 
+#define LAZYMOUNT_EXTERN extern
+
 std::string buildKrateManifestPath(const std::string& name)
 {
 	return CONF_PATH "/" + name + ".xml";
@@ -46,31 +49,58 @@ std::string getKrateName(pam_handle_t* handle)
 	return static_cast<const char*>(retItem);
 }
 
-void openKrateSession(const std::string& name)
-{
-	auto sessionBuilder = [](const runtime::User& user) {
-		KrateBuilder builder(user, buildKrateManifestPath(user.getName()));
-		builder.containerize();
-	};
+extern "C" {
+LAZYMOUNT_EXTERN  __attribute__((visibility("default")))
+int container_preprocess(char* id) {
+	std::cout << "kraterize (UID " << id << ")..." << std::endl << std::flush;
+	try {
+		runtime::User user(std::stoi(std::string(id)));
+		KrateGuard krateGuard(user.getName());
+		krateGuard.wait();
 
-	createSession(runtime::User(name), sessionBuilder);
+		auto sessionBuilder = [](const runtime::User& user) {
+			KrateBuilder builder(user, buildKrateManifestPath(user.getName()));
+			builder.unshareNamespace();
+		};
+		createSession(user, sessionBuilder);
+	} catch (runtime::Exception& e) {
+		std::cerr << "krate error : " << e.what() <<std::endl << std::flush;
+		return -1;
+	}
+
+	std::cout << "krate preprocess completed!" << std::endl << std::flush;
+	return 0;
 }
 
-void closeKrateSession(const std::string& name)
-{
-	destroySession(runtime::User(name));
+LAZYMOUNT_EXTERN  __attribute__((visibility("default")))
+int container_postprocess(char* id) {
+	try {
+		runtime::User user(std::stoi(std::string(id)));
+		KrateBuilder builder(user, buildKrateManifestPath(user.getName()));
+		builder.mountOwnFilesystem();
+	} catch (runtime::Exception& e) {
+		std::cerr << "krate error : " << e.what() << std::endl << std::flush;
+		return -1;
+	}
+	std::cout << "krate postprocess completed!" << std::endl << std::flush;
+	std::cout << "kraterized!" << std::endl << std::flush;
+	return 0;
 }
 
-extern "C" {
 PAM_EXTERN  __attribute__((visibility("default")))
 int pam_sm_open_session(pam_handle_t* pamh, int flags, int argc, const char* argv[])
 {
 	try {
-		std::string name = getKrateName(pamh);
-		KrateGuard krateGuard(name);
+		runtime::User user(getKrateName(pamh));
+		KrateGuard krateGuard(user.getName());
 		krateGuard.wait();
 
-		openKrateSession(name);
+		auto sessionBuilder = [](const runtime::User& user) {
+			KrateBuilder builder(user, buildKrateManifestPath(user.getName()));
+			builder.unshareNamespace();
+			builder.mountOwnFilesystem();
+		};
+		createSession(user, sessionBuilder);
 	} catch (runtime::Exception& e) {
 		::pam_syslog(pamh, LOG_ERR, "%s", e.what());
 		return PAM_SESSION_ERR;
@@ -83,11 +113,11 @@ PAM_EXTERN  __attribute__((visibility("default")))
 int pam_sm_close_session(pam_handle_t* pamh, int flags, int argc, const char* argv[])
 {
 	try {
-		std::string name = getKrateName(pamh);
-		KrateGuard krateGuard(name);
+		runtime::User user(getKrateName(pamh));
+		KrateGuard krateGuard(user.getName());
 		krateGuard.wait();
 
-		closeKrateSession(name);
+		destroySession(user);
 	} catch (runtime::Exception& e) {
 		::pam_syslog(pamh, LOG_ERR, "%s", e.what());
 		return PAM_SESSION_ERR;
diff --git a/packaging/krate.spec b/packaging/krate.spec
index 2ee7289..bf3a23c 100644
--- a/packaging/krate.spec
+++ b/packaging/krate.spec
@@ -44,7 +44,7 @@ krates.
 %attr(644,root,root) %{TZ_SYS_RO_ICONS}/krate/notification_sub_icon.png
 %attr(700,root,root) %dir %{TZ_SYS_ETC}/krate
 %attr(600,root,root) %config %{TZ_SYS_ETC}/krate/owner.xml
-%attr(700,root,root) %{_libdir}/security/pam_*.so
+%attr(755,root,root) %{_libdir}/security/pam_krate.so
 %attr(700,root,root) %{_sbindir}/krate-admin-cli
 %config /etc/pam.d/*
 
-- 
2.7.4


From 462afb96e10657e0db353007366418b7f1880c66 Mon Sep 17 00:00:00 2001
From: Sungbae Yoo <sungbae.yoo@samsung.com>
Date: Wed, 7 Sep 2016 17:06:37 +0900
Subject: [PATCH 05/16] Add a shortcut icon for krate

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
Change-Id: I6ff54bbb3c862641c18b74739db9a9be3ed64f2d
---
 data/shortcut_icon.png             | Bin 0 -> 9846 bytes
 packaging/krate.spec               |   1 +
 server/CMakeLists.txt              |   1 +
 tools/apps/keyguard/CMakeLists.txt |   4 ++++
 tools/apps/keyguard/src/main.c     |   2 +-
 5 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 data/shortcut_icon.png

diff --git a/data/shortcut_icon.png b/data/shortcut_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..69d95149a8d4420fe40e223d6bc664cf4ee1b6fe
GIT binary patch
literal 9846
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

literal 0
HcmV?d00001

diff --git a/packaging/krate.spec b/packaging/krate.spec
index bf3a23c..ab57878 100644
--- a/packaging/krate.spec
+++ b/packaging/krate.spec
@@ -40,6 +40,7 @@ krates.
 %{_unitdir}/multi-user.target.wants/krate.service
 %attr(700,root,root) /etc/gumd/useradd.d/20_krate-add.post
 %attr(700,root,root) /etc/gumd/userdel.d/20_krate-remove.post
+%attr(644,root,root) %{TZ_SYS_RO_ICONS}/krate/shortcut_icon.png
 %attr(644,root,root) %{TZ_SYS_RO_ICONS}/krate/indicator_icon.png
 %attr(644,root,root) %{TZ_SYS_RO_ICONS}/krate/notification_sub_icon.png
 %attr(700,root,root) %dir %{TZ_SYS_ETC}/krate
diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index 942f7e0..c8aba95 100644
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -71,3 +71,4 @@ INSTALL(FILES ${KRATE_TOOLS}/gumd-scripts/20_krate-remove.post DESTINATION /etc/
 INSTALL(FILES ${KRATE_DATA}/DefaultManifest.xml DESTINATION ${CONF_DIR} RENAME owner.xml)
 INSTALL(FILES ${KRATE_DATA}/indicator_icon.png DESTINATION ${ICON_DIR})
 INSTALL(FILES ${KRATE_DATA}/notification_sub_icon.png DESTINATION ${ICON_DIR})
+INSTALL(FILES ${KRATE_DATA}/shortcut_icon.png DESTINATION ${ICON_DIR})
diff --git a/tools/apps/keyguard/CMakeLists.txt b/tools/apps/keyguard/CMakeLists.txt
index b119716..0bb2d21 100644
--- a/tools/apps/keyguard/CMakeLists.txt
+++ b/tools/apps/keyguard/CMakeLists.txt
@@ -24,6 +24,10 @@ INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${APP_INSTALL_PREFIX}/${PROJECT_NAME
 
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${EFL_APP_LIBRARIES} ${KEYGUARD_LIBRARIES} krate)
 
+TARGET_COMPILE_DEFINITIONS(${PROJECT_NAME} PRIVATE
+    ICON_PATH="${ICON_DIR}"
+)
+
 ADD_CUSTOM_TARGET(${PROJECT_NAME}.edj
         COMMAND edje_cc -no-save -id ${CMAKE_CURRENT_SOURCE_DIR}/res/images
         ${CMAKE_CURRENT_SOURCE_DIR}/res/edje/${PROJECT_NAME}.edc
diff --git a/tools/apps/keyguard/src/main.c b/tools/apps/keyguard/src/main.c
index 25b272c..f04bc21 100644
--- a/tools/apps/keyguard/src/main.c
+++ b/tools/apps/keyguard/src/main.c
@@ -77,7 +77,7 @@ static void __add_shortcut(const char* krate_name)
 	char uri[PATH_MAX];
 
 	snprintf(uri, sizeof(uri), "krate://enter/%s", krate_name);
-	shortcut_add_to_home(krate_name, LAUNCH_BY_URI, uri, "", 0, NULL, NULL);
+	shortcut_add_to_home(krate_name, LAUNCH_BY_URI, uri, ICON_PATH "/shortcut_icon.png", 0, NULL, NULL);
 }
 
 static bool __app_create(void *data)
-- 
2.7.4


From ce1caca3c640482b1787893c610cad2cd36dd4b5 Mon Sep 17 00:00:00 2001
From: Jaemin Ryu <jm77.ryu@samsung.com>
Date: Wed, 21 Sep 2016 09:17:23 +0900
Subject: [PATCH 06/16] Remove default manifest

Change-Id: I64f56020d7efbd77551094dc4ea0e1d3d84c2da7
Signed-off-by: Jaemin Ryu <jm77.ryu@samsung.com>
---
 module/krate-builder.cpp                | 20 ++++++++++++--------
 packaging/krate.spec                    |  5 +----
 server/CMakeLists.txt                   |  4 ----
 tools/gumd-scripts/20_krate-add.post    |  4 ----
 tools/gumd-scripts/20_krate-remove.post |  4 ----
 5 files changed, 13 insertions(+), 24 deletions(-)
 delete mode 100644 tools/gumd-scripts/20_krate-add.post
 delete mode 100644 tools/gumd-scripts/20_krate-remove.post

diff --git a/module/krate-builder.cpp b/module/krate-builder.cpp
index 9a568b7..b50e3b6 100644
--- a/module/krate-builder.cpp
+++ b/module/krate-builder.cpp
@@ -27,7 +27,10 @@
 KrateBuilder::KrateBuilder(const runtime::User& user, const std::string& manifestPath) :
 	name(user.getName()), uid(user.getUid()), gid(user.getGid())
 {
-	manifest.reset(xml::Parser::parseFile(manifestPath));
+	runtime::File data(manifestPath);
+	if (data.exists()) {
+		manifest.reset(xml::Parser::parseFile(manifestPath));
+	}
 }
 
 KrateBuilder::~KrateBuilder()
@@ -61,13 +64,14 @@ void KrateBuilder::unshareNamespace()
 	}
 }
 
-void KrateBuilder::mountOwnFilesystem() {
-	manifest.reset(xml::Parser::parseFile("/opt/etc/krate/owner.xml"));
-
-	xml::Node::NodeList entries = manifest->evaluate("/manifest/filesystem/entry");
-	for (const xml::Node& entry : entries) {
-		bindFilesystemNode(entry.getProp("source"), entry.getProp("target"),
-						   entry.getProp("type"), entry.getProp("options"));
+void KrateBuilder::mountOwnFilesystem()
+{
+	if (manifest.get()) {
+		xml::Node::NodeList entries = manifest->evaluate("/manifest/filesystem/entry");
+		for (const xml::Node& entry : entries) {
+			bindFilesystemNode(entry.getProp("source"), entry.getProp("target"),
+							   entry.getProp("type"), entry.getProp("options"));
+		}
 	}
 
 	bindFilesystemNode("/home/" + name,
diff --git a/packaging/krate.spec b/packaging/krate.spec
index ab57878..62c6508 100644
--- a/packaging/krate.spec
+++ b/packaging/krate.spec
@@ -38,13 +38,10 @@ krates.
 %attr(700,root,root) %{_sbindir}/krate-volume-manager
 %{_unitdir}/krate.service
 %{_unitdir}/multi-user.target.wants/krate.service
-%attr(700,root,root) /etc/gumd/useradd.d/20_krate-add.post
-%attr(700,root,root) /etc/gumd/userdel.d/20_krate-remove.post
 %attr(644,root,root) %{TZ_SYS_RO_ICONS}/krate/shortcut_icon.png
 %attr(644,root,root) %{TZ_SYS_RO_ICONS}/krate/indicator_icon.png
 %attr(644,root,root) %{TZ_SYS_RO_ICONS}/krate/notification_sub_icon.png
-%attr(700,root,root) %dir %{TZ_SYS_ETC}/krate
-%attr(600,root,root) %config %{TZ_SYS_ETC}/krate/owner.xml
+#%attr(700,root,root) %dir %{TZ_SYS_ETC}/krate
 %attr(755,root,root) %{_libdir}/security/pam_krate.so
 %attr(700,root,root) %{_sbindir}/krate-admin-cli
 %config /etc/pam.d/*
diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index c8aba95..c973a82 100644
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -65,10 +65,6 @@ CONFIGURE_FILE(systemd/krate.service.in systemd/krate.service)
 INSTALL(TARGETS ${SERVER_NAME} DESTINATION ${BIN_DIR})
 INSTALL(FILES systemd/krate.service DESTINATION ${SYSTEMD_UNIT_DIR})
 
-INSTALL(FILES ${KRATE_TOOLS}/gumd-scripts/20_krate-add.post DESTINATION /etc/gumd/useradd.d)
-INSTALL(FILES ${KRATE_TOOLS}/gumd-scripts/20_krate-remove.post DESTINATION /etc/gumd/userdel.d)
-
-INSTALL(FILES ${KRATE_DATA}/DefaultManifest.xml DESTINATION ${CONF_DIR} RENAME owner.xml)
 INSTALL(FILES ${KRATE_DATA}/indicator_icon.png DESTINATION ${ICON_DIR})
 INSTALL(FILES ${KRATE_DATA}/notification_sub_icon.png DESTINATION ${ICON_DIR})
 INSTALL(FILES ${KRATE_DATA}/shortcut_icon.png DESTINATION ${ICON_DIR})
diff --git a/tools/gumd-scripts/20_krate-add.post b/tools/gumd-scripts/20_krate-add.post
deleted file mode 100644
index fcaf715..0000000
--- a/tools/gumd-scripts/20_krate-add.post
+++ /dev/null
@@ -1,4 +0,0 @@
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-
-export `tzplatform-get TZ_SYS_ETC`
-cp ${TZ_SYS_ETC}/krate/owner.xml ${TZ_SYS_ETC}/krate/${1}.xml
diff --git a/tools/gumd-scripts/20_krate-remove.post b/tools/gumd-scripts/20_krate-remove.post
deleted file mode 100644
index 73112eb..0000000
--- a/tools/gumd-scripts/20_krate-remove.post
+++ /dev/null
@@ -1,4 +0,0 @@
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-
-export `tzplatform-get TZ_SYS_ETC`
-rm ${TZ_SYS_ETC}/krate/${1}.xml
-- 
2.7.4


From 24d339f4b82adbd02cb0f9023c078e5041e137b4 Mon Sep 17 00:00:00 2001
From: Sungbae Yoo <sungbae.yoo@samsung.com>
Date: Thu, 22 Sep 2016 11:49:34 +0900
Subject: [PATCH 07/16] Add to wait for lazymount when user is krate

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
Change-Id: If8427749f902ad78088644772cc3c26e5ff8a444
---
 module/krate.cpp | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/module/krate.cpp b/module/krate.cpp
index ff21670..b81a901 100644
--- a/module/krate.cpp
+++ b/module/krate.cpp
@@ -14,6 +14,7 @@
  *  limitations under the License
  */
 
+#include <dlfcn.h>
 #include <syslog.h>
 #include <security/pam_ext.h>
 #include <security/pam_modules.h>
@@ -31,7 +32,11 @@
 #include <klay/xml/parser.h>
 #include <klay/xml/document.h>
 
+#define KRATE_UID_MIN 60001
+#define KRATE_UID_MAX 60100
+
 #define LAZYMOUNT_EXTERN extern
+#define LAZYMOUNT_LIB "/usr/lib/liblazymount.so.0"
 
 std::string buildKrateManifestPath(const std::string& name)
 {
@@ -49,6 +54,45 @@ std::string getKrateName(pam_handle_t* handle)
 	return static_cast<const char*>(retItem);
 }
 
+static int wait_condition(void)
+{
+    int r;
+    void *h;
+
+    int (*wait_mount_user)(void);
+
+    r = access(LAZYMOUNT_LIB,F_OK);
+    if (r < 0){
+        fprintf(stderr, "cannot find lazymount module - No support lazymount\n");
+        return 0;
+    }
+
+    h = dlopen(LAZYMOUNT_LIB, RTLD_LAZY);
+    if (!h) {
+        fprintf(stderr, "lazymount module dlopen error\n");
+        return -1;
+    }
+
+	do{
+        wait_mount_user = (int (*)())dlsym(h,"wait_mount_user");
+        if (!wait_mount_user) {
+            fprintf(stderr, "dlsym wait_mount_user error\n");
+            dlclose(h);
+            return -1;
+        }
+    } while (0);
+
+    r = wait_mount_user();
+    if (r < 0) {
+        fprintf(stderr, "wait_mout_user failed\n");
+        dlclose(h);
+        return r;
+    }
+
+    dlclose(h);
+    return 0;
+}
+
 extern "C" {
 LAZYMOUNT_EXTERN  __attribute__((visibility("default")))
 int container_preprocess(char* id) {
@@ -63,6 +107,10 @@ int container_preprocess(char* id) {
 			builder.unshareNamespace();
 		};
 		createSession(user, sessionBuilder);
+
+		if (user.getUid() >= KRATE_UID_MIN && user.getUid() <= KRATE_UID_MAX ) {
+			wait_condition();
+		}
 	} catch (runtime::Exception& e) {
 		std::cerr << "krate error : " << e.what() <<std::endl << std::flush;
 		return -1;
-- 
2.7.4


From d8278e97c604bc29b0fddbc027b69ae21bb4c776 Mon Sep 17 00:00:00 2001
From: Sungbae Yoo <sungbae.yoo@samsung.com>
Date: Mon, 26 Sep 2016 17:42:58 +0900
Subject: [PATCH 08/16] Change manifest file path into each home directories

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
Change-Id: Ife496f7bf33b129120cf5eb6c34818e713d82e6d
---
 CMakeLists.txt        |  4 ----
 module/CMakeLists.txt |  4 ----
 module/krate.cpp      |  2 +-
 packaging/krate.spec  |  2 --
 server/CMakeLists.txt |  1 -
 server/manager.cpp    | 55 ++++++++++++++++++++++++++++++++++++++++-----------
 6 files changed, 45 insertions(+), 23 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c7e3422..bb54602 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,10 +80,6 @@ IF(NOT DEFINED SYSTEMD_UNIT_DIR)
 	SET(SYSTEMD_UNIT_DIR "${CMAKE_INSTALL_PREFIX}/lib/systemd/system")
 ENDIF(NOT DEFINED SYSTEMD_UNIT_DIR)
 
-IF(NOT DEFINED CONF_DIR)
-	SET(CONF_INSTALL_DIR "${SYSCONF_INSTALL_DIR}/krate")
-ENDIF(NOT DEFINED CONF_DIR)
-
 ADD_DEFINITIONS(-DUG_WAYLAND)
 
 ADD_SUBDIRECTORY(${KRATE_LIB})
diff --git a/module/CMakeLists.txt b/module/CMakeLists.txt
index ab4f5e3..9a7295f 100644
--- a/module/CMakeLists.txt
+++ b/module/CMakeLists.txt
@@ -44,10 +44,6 @@ PKG_CHECK_MODULES(PAM_DEPS	REQUIRED
 INCLUDE_DIRECTORIES(${PAM_INCLUDE_DIR} ${PAM_DEPS_INCLUDE_DIRS})
 TARGET_LINK_LIBRARIES(${PAM_NAME} ${PAM_LIBRARY} ${PAM_DEPS_LIBRARIES} pthread)
 
-TARGET_COMPILE_DEFINITIONS(${PAM_NAME} PRIVATE
-	CONF_PATH="${CONF_DIR}"
-)
-
 CONFIGURE_FILE(pam.d/systemd-user.in pam.d/systemd-user-${PROJECT_NAME})
 
 INSTALL(TARGETS ${PAM_NAME} DESTINATION ${LIB_INSTALL_DIR}/security)
diff --git a/module/krate.cpp b/module/krate.cpp
index b81a901..409b12e 100644
--- a/module/krate.cpp
+++ b/module/krate.cpp
@@ -40,7 +40,7 @@
 
 std::string buildKrateManifestPath(const std::string& name)
 {
-	return CONF_PATH "/" + name + ".xml";
+	return "/home/" + name + "/.config/krate/krate.xml";
 }
 
 std::string getKrateName(pam_handle_t* handle)
diff --git a/packaging/krate.spec b/packaging/krate.spec
index 62c6508..9454f00 100644
--- a/packaging/krate.spec
+++ b/packaging/krate.spec
@@ -41,7 +41,6 @@ krates.
 %attr(644,root,root) %{TZ_SYS_RO_ICONS}/krate/shortcut_icon.png
 %attr(644,root,root) %{TZ_SYS_RO_ICONS}/krate/indicator_icon.png
 %attr(644,root,root) %{TZ_SYS_RO_ICONS}/krate/notification_sub_icon.png
-#%attr(700,root,root) %dir %{TZ_SYS_ETC}/krate
 %attr(755,root,root) %{_libdir}/security/pam_krate.so
 %attr(700,root,root) %{_sbindir}/krate-admin-cli
 %config /etc/pam.d/*
@@ -67,7 +66,6 @@ krates.
          -DHOME_DIR=%{TZ_SYS_HOME} \
          -DSYSTEMD_UNIT_DIR=%{_unitdir} \
          -DPAMD_DIR=/etc/pam.d \
-         -DCONF_DIR=%{TZ_SYS_ETC}/krate \
          -DICON_DIR="%{TZ_SYS_RO_ICONS}/krate" \
          -DAPP_INSTALL_PREFIX="%{TZ_SYS_RO_APP}" \
          -DAPP_SHARE_PACKAGES_DIR="%{TZ_SYS_RO_PACKAGES}"
diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index c973a82..91bc477 100644
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -55,7 +55,6 @@ SET_TARGET_PROPERTIES(${SERVER_NAME} PROPERTIES COMPILE_FLAGS "-fPIE")
 SET_TARGET_PROPERTIES(${SERVER_NAME} PROPERTIES LINK_FLAGS "-pie")
 
 TARGET_COMPILE_DEFINITIONS(${SERVER_NAME} PRIVATE
-	CONF_PATH="${CONF_DIR}"
 	RUN_PATH="${RUN_DIR}"
 	ICON_PATH="${ICON_DIR}"
 )
diff --git a/server/manager.cpp b/server/manager.cpp
index ec6f58a..ad7fb6a 100644
--- a/server/manager.cpp
+++ b/server/manager.cpp
@@ -25,6 +25,7 @@
 #include <tzplatform_config.h>
 #include <auth-passwd-admin.h>
 #include <gum/gum-user.h>
+#include <gum/gum-user-service.h>
 #include <gum/common/gum-user-types.h>
 #include <klay/error.h>
 #include <klay/process.h>
@@ -191,17 +192,35 @@ int packageEventHandler(uid_t target_uid, int req_id,
 	return 0;
 }
 
-void initializeCreatedKrateList() {
-	try {
-		runtime::DirectoryIterator iter(CONF_PATH "/"), end;
+void initializeCreatedKrateList()
+{
+	const gchar *type[] = {"security", NULL};
+	gchar *username;
+	GumUserService *service;
+	GumUserList *users;
+	GumUser *user;
+
+	service = gum_user_service_create_sync(FALSE);
+	if (!service) {
+		return;
+	}
+
+	users = gum_user_service_get_user_list_sync(service, type);
+	if (!users) {
+		return;
+	}
 
-		while (iter != end) {
-			const std::string& file = iter->getName();
-			const std::string& name(file.substr(0, file.rfind(".xml")));
-			createdKrateList.push_back(name);
-			++iter;
+	for (GumUserList *src_list = users; src_list != NULL; src_list = g_list_next(src_list)) {
+		user = (GumUser*) src_list->data;
+		if (user) {
+			g_object_get(G_OBJECT(user), "username", &username, NULL);
+			createdKrateList.push_back(username);
+			g_free(username);
 		}
-	} catch (runtime::Exception& e) {}
+	}
+
+	gum_user_service_list_free(users);
+	g_object_unref(service);
 }
 
 #define NT_TITLE     NOTIFICATION_TEXT_TYPE_TITLE
@@ -536,13 +555,21 @@ int Manager::createKrate(const std::string& name, const std::string& manifest)
 
 			maskUserServices(user);
 
+		    ::tzplatform_set_user(user.getUid());
+			runtime::File confDir(std::string(::tzplatform_getenv(TZ_USER_HOME)) + "/.config/krate");
+		    ::tzplatform_reset_user();
+			if (!confDir.exists()) {
+				confDir.makeDirectory(true);
+				confDir.chmod(700);
+			}
+
 			manifestFile.reset(xml::Parser::parseString(manifest));
 			//write container author info
 			if (!pkgId.empty()) {
 				std::cout << manifestFile->getRootNode().getName() << std::endl;
 				manifestFile->getRootNode().addNewChild("author").setContent(pkgId);
 			}
-			manifestFile->write(CONF_PATH "/" + name + ".xml", "UTF-8", true);
+			manifestFile->write(confDir.getPath() + "/" + name + ".xml", "UTF-8", true);
 
 			//unlock the user
 			setKrateState(user.getUid(), 1);
@@ -571,7 +598,13 @@ int Manager::removeKrate(const std::string& name)
 	std::unique_ptr<xml::Document> manifestFile;
 	bool canRemove = false;
 
-	manifestFile.reset(xml::Parser::parseFile(CONF_PATH "/" + name + ".xml"));
+	runtime::User user(name);
+    ::tzplatform_set_user(user.getUid());
+	std::string confPath(::tzplatform_getenv(TZ_USER_HOME));
+	confPath += "/.config/krate";
+    ::tzplatform_reset_user();
+
+	manifestFile.reset(xml::Parser::parseFile(confPath + "/" + name + ".xml"));
 	xml::Node::NodeList authors = manifestFile->evaluate("/manifest/author");
 	for (const xml::Node& author : authors) {
 		if (author.getContent() == pkgId) {
-- 
2.7.4


From fbee0fd6119ab083792e670e09e88fc5ae849de2 Mon Sep 17 00:00:00 2001
From: Sungbae Yoo <sungbae.yoo@samsung.com>
Date: Mon, 17 Oct 2016 13:40:05 +0900
Subject: [PATCH 09/16] Add NULL checking after get an value of entry

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
Change-Id: I330045d29440b9c1652dabfdc9e7ed977861e542
---
 tools/apps/setup-wizard/src/security.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tools/apps/setup-wizard/src/security.c b/tools/apps/setup-wizard/src/security.c
index c80dc54..6a75fa5 100644
--- a/tools/apps/setup-wizard/src/security.c
+++ b/tools/apps/setup-wizard/src/security.c
@@ -210,6 +210,9 @@ static void security_password_entry_changed_cb(void *data, Evas_Object *obj, voi
 	Evas_Object *button;
 	const char *entry_data = elm_entry_entry_get(obj);
 
+	if (entry_data == NULL)
+		return;
+
 	if (security_passphrase_mode < PASSPHRASE_STATE_VERIFY)
 		button = (Evas_Object *)evas_object_data_get(ud.nf, "setup_button");
 	else
-- 
2.7.4


From 2f9751c858f40faa97100caa84436da0c39cd21f Mon Sep 17 00:00:00 2001
From: Sungbae Yoo <sungbae.yoo@samsung.com>
Date: Mon, 17 Oct 2016 13:44:19 +0900
Subject: [PATCH 10/16] Fix to apply whitespace coding rules

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
Change-Id: Ia2992812c94045a19b5133deccab9f250c690270
---
 module/krate.cpp    |  4 ++--
 rmi/app-proxy.h     | 10 +++-------
 rmi/package-proxy.h |  6 ++----
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/module/krate.cpp b/module/krate.cpp
index 409b12e..f057748 100644
--- a/module/krate.cpp
+++ b/module/krate.cpp
@@ -61,7 +61,7 @@ static int wait_condition(void)
 
     int (*wait_mount_user)(void);
 
-    r = access(LAZYMOUNT_LIB,F_OK);
+    r = access(LAZYMOUNT_LIB, F_OK);
     if (r < 0){
         fprintf(stderr, "cannot find lazymount module - No support lazymount\n");
         return 0;
@@ -74,7 +74,7 @@ static int wait_condition(void)
     }
 
 	do{
-        wait_mount_user = (int (*)())dlsym(h,"wait_mount_user");
+        wait_mount_user = (int (*)())dlsym(h, "wait_mount_user");
         if (!wait_mount_user) {
             fprintf(stderr, "dlsym wait_mount_user error\n");
             dlclose(h);
diff --git a/rmi/app-proxy.h b/rmi/app-proxy.h
index 61c0f64..2790f28 100644
--- a/rmi/app-proxy.h
+++ b/rmi/app-proxy.h
@@ -44,10 +44,8 @@ public:
 		bool isTaskManaged;
 
 		REFLECTABLE
-		(
-			krate, id, locale, package, type, icon, label,
-			componentType, isNoDisplayed, isTaskManaged
-		);
+		(krate, id, locale, package, type, icon, label,
+		 componentType, isNoDisplayed, isTaskManaged);
 	};
 
 	AppInfo getAppInfo(const std::string& name, const std::string& appid);
@@ -72,9 +70,7 @@ public:
 		std::vector<Extra> extraData;
 
 		REFLECTABLE
-		(
-			operation, uri, mime, category, appId, extraData
-		);
+		(operation, uri, mime, category, appId, extraData);
 	};
 
 	int launch(const std::string& name, const Bundle& bundle);
diff --git a/rmi/package-proxy.h b/rmi/package-proxy.h
index 271d838..c4671ef 100644
--- a/rmi/package-proxy.h
+++ b/rmi/package-proxy.h
@@ -53,10 +53,8 @@ public:
 		bool isPreload;
 
 		REFLECTABLE
-		(
-			krate, id, locale, type, icon, label, description, author,
-			version, apiVersion, mainAppId, isSystem, isRemovable, isPreload
-		);
+		(krate, id, locale, type, icon, label, description, author,
+		 version, apiVersion, mainAppId, isSystem, isRemovable, isPreload);
 	};
 
 	PackageInfo getPackageInfo(const std::string& name, const std::string& pkgid);
-- 
2.7.4


From 230616d8f1f4a46ff2b5c961a0d7c718e3db734f Mon Sep 17 00:00:00 2001
From: Sungbae Yoo <sungbae.yoo@samsung.com>
Date: Fri, 4 Nov 2016 11:07:23 +0900
Subject: [PATCH 11/16] Change to apply pkgmgrinfo API changes

pkgmgrinfo_client_set_status_type, pkgmgrinfo_handler are renamed

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
Change-Id: I169b800c16ea75b8bc36a48060128852be00c43a
---
 lib/krate/package-proxy.cpp | 2 +-
 server/packman.cpp          | 2 +-
 server/packman.h            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/krate/package-proxy.cpp b/lib/krate/package-proxy.cpp
index a78db06..e4afea6 100644
--- a/lib/krate/package-proxy.cpp
+++ b/lib/krate/package-proxy.cpp
@@ -271,7 +271,7 @@ int krate_package_proxy_set_event_status(krate_package_proxy_h handle, int statu
 	auto instance = getInstance(handle);
 
 	int ret;
-	ret = pkgmgrinfo_client_set_status_type(instance->pNativeHandle, status_type);
+	ret = pkgmgr_client_set_status_type(instance->pNativeHandle, status_type);
 
 	if (ret != PACKAGE_MANAGER_ERROR_NONE)
 		return KRATE_ERROR_INVALID_PARAMETER;
diff --git a/server/packman.cpp b/server/packman.cpp
index 1a80e12..9425374 100644
--- a/server/packman.cpp
+++ b/server/packman.cpp
@@ -337,7 +337,7 @@ PackageManager& PackageManager::instance()
 	return __instance__;
 }
 
-void PackageManager::setEventCallback(pkgmgrinfo_handler callback, void* user_data)
+void PackageManager::setEventCallback(pkgmgr_handler callback, void* user_data)
 {
 	int ret;
 	ret = ::pkgmgr_client_listen_status(nativeListenHandle, callback, user_data);
diff --git a/server/packman.h b/server/packman.h
index ab54341..b8b2860 100644
--- a/server/packman.h
+++ b/server/packman.h
@@ -91,7 +91,7 @@ public:
 	std::vector<std::string> getPackageList(const uid_t user);
 	std::vector<ApplicationInfo> getAppList(const uid_t user);
 
-	void setEventCallback(pkgmgrinfo_handler callback, void* user_data);
+	void setEventCallback(pkgmgr_handler callback, void* user_data);
 	void unsetEventCallback();
 
 	void setModeRestriction(int mode, uid_t user);
-- 
2.7.4


From 61e1e98af64c0fb6b645b044936f7e7c60794015 Mon Sep 17 00:00:00 2001
From: Sungbae Yoo <sungbae.yoo@samsung.com>
Date: Mon, 7 Nov 2016 14:36:01 +0900
Subject: [PATCH 12/16] Add privilege(notification) to kaskit for supporting
 badge

Change-Id: I8fd4f4bcf4b6afb2d1e8cb790d4ec4e91586e4a2
Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
---
 tools/apps/kaskit/org.tizen.kaskit.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/apps/kaskit/org.tizen.kaskit.xml b/tools/apps/kaskit/org.tizen.kaskit.xml
index 846be83..e51ac98 100644
--- a/tools/apps/kaskit/org.tizen.kaskit.xml
+++ b/tools/apps/kaskit/org.tizen.kaskit.xml
@@ -5,6 +5,7 @@
         <privilege>http://tizen.org/privilege/appmanager.launch</privilege>
         <privilege>http://tizen.org/privilege/packagemanager.info</privilege>
         <privilege>http://tizen.org/privilege/packagemanager.admin</privilege>
+        <privilege>http://tizen.org/privilege/notification</privilege>
     </privileges>
     <ui-application appid="org.tizen.kaskit" exec="/usr/apps/org.tizen.kaskit/bin/org.tizen.kaskit" multiple="false" nodisplay="true" taskmanage="true" type="capp">
         <label>Kaskit</label>
-- 
2.7.4


From faf413561a6d0bfde3b50190bbfcdb2fe1af2c7b Mon Sep 17 00:00:00 2001
From: Sungbae Yoo <sungbae.yoo@samsung.com>
Date: Mon, 7 Nov 2016 14:37:19 +0900
Subject: [PATCH 13/16] Fix offesets not to be cut for badge images

Change-Id: I4ffd776e82cda1027835514ec0d5aafcd4da3c56
Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
---
 tools/apps/kaskit/res/edje/app_icon.edc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/apps/kaskit/res/edje/app_icon.edc b/tools/apps/kaskit/res/edje/app_icon.edc
index 3af232f..98e5b8e 100644
--- a/tools/apps/kaskit/res/edje/app_icon.edc
+++ b/tools/apps/kaskit/res/edje/app_icon.edc
@@ -124,8 +124,8 @@ group { name: "icon";
 			scale: 0;
 			description {
 				state: "default" 0.0;
-				rel1{relative: 0.0 0.0; offset: -10 -1; to: "badge_text";}
-				rel2{relative: 1.0 1.0; offset: 13 1; to: "badge_text";}
+				rel1{relative: 0.0 0.0; offset: -10 1; to: "badge_text";}
+				rel2{relative: 1.0 1.0; offset: 13 3; to: "badge_text";}
 				visible: 0;
 				image
 				{
@@ -147,8 +147,8 @@ group { name: "icon";
 				visible: 0;
 				fixed: 1 1;
 				color: 255 255 255 255;
-				rel1{relative: 0.95 -0.05; to: "icon_content";}
-				rel2{relative: 0.95 -0.05; to: "icon_content";}
+				rel1{relative: 0.95 -0.05; offset: 0 2; to: "icon_content";}
+				rel2{relative: 0.95 -0.05; offset: 0 2; to: "icon_content";}
 				align: 1.0 0.0;
 				text {
 					font: "arial";
-- 
2.7.4


From f76f433350fe6d73186d82d1937f78bddfa04d6e Mon Sep 17 00:00:00 2001
From: "seolheui,kim" <s414.kim@samsung.com>
Date: Mon, 7 Nov 2016 14:59:40 +0900
Subject: [PATCH 14/16] Modify security page of setup-wizard

Change-Id: I8c45c67860be3f0c444cc7afeba0ca6052f575c6
Signed-off-by: seolheui,kim <s414.kim@samsung.com>
---
 tools/apps/setup-wizard/src/security.c | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/tools/apps/setup-wizard/src/security.c b/tools/apps/setup-wizard/src/security.c
index 6a75fa5..60ba4cd 100644
--- a/tools/apps/setup-wizard/src/security.c
+++ b/tools/apps/setup-wizard/src/security.c
@@ -24,6 +24,9 @@
 #define PASSPHRASE_STATE_SETUP		1
 #define PASSPHRASE_STATE_VERIFY		2
 
+#define ARRAY_SIZE(_array_) \
+        (sizeof(_array_) / sizeof(_array_[0]))
+
 extern uidata_s ud;
 
 struct security_lock_type {
@@ -31,14 +34,12 @@ struct security_lock_type {
 	int index;
 };
 
-struct security_lock_type security_lock_types[2] = {
+struct security_lock_type security_lock_types[] = {
 	{ "Password", 0 },
-	{ "PIN", 1 }
 };
 
-char* security_group_text[2] = {
+char* security_group_text[] = {
 	"Unlock method",
-	"Security options"
 };
 
 static char* security_password_setup_data = NULL;
@@ -73,6 +74,7 @@ static char *security_group_text_get(void *data, Evas_Object *obj, const char *p
 	return NULL;
 }
 
+#if 0
 static char *security_double_label_text_get(void *data, Evas_Object *obj, const char *part)
 {
 	char text[PATH_MAX] = "\0";
@@ -85,6 +87,7 @@ static char *security_double_label_text_get(void *data, Evas_Object *obj, const
 
 	return strdup(text);
 }
+#endif
 
 static char *security_lock_type_text_get(void *data, Evas_Object *obj, const char *part)
 {
@@ -311,7 +314,7 @@ void _create_security_view(appdata_s *ad)
 	_append_genlist_item(genlist, itc, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY, security_group_text[0]);
 
 	itc = _create_genlist_item_class("one_icon", security_lock_type_text_get, security_lock_type_content_get);
-	for (index = 0; index < 2; index++) {
+	for (index = 0; index < ARRAY_SIZE(security_lock_types); index++) {
 		item = elm_genlist_item_append(genlist,
 									   itc,
 									   &security_lock_types[index],
@@ -323,7 +326,7 @@ void _create_security_view(appdata_s *ad)
 			elm_object_item_disabled_set(item, EINA_TRUE);
 		}
 	}
-
+#if 0
 	/* Timeout list group*/
 	itc = _create_genlist_item_class("group_index", security_group_text_get, NULL);
 	_append_genlist_item(genlist, itc, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY, security_group_text[1]);
@@ -331,7 +334,7 @@ void _create_security_view(appdata_s *ad)
 	itc = _create_genlist_item_class("double_label", security_double_label_text_get, NULL);
 	item = _append_genlist_item(genlist, itc, ELM_OBJECT_SELECT_MODE_DISPLAY_ONLY, NULL);
 	elm_object_item_disabled_set(item, EINA_TRUE); /* [TBD] enable timeout options */
-
+#endif
 	left_button = _create_button(layout, PREV_BUTTON, security_previous_view_cb, NULL);
 	right_button = _create_button(layout, NEXT_BUTTON, security_password_setup_cb, ad);
 	_create_two_button_layout(layout, left_button, right_button);
-- 
2.7.4


From a76de2a530fa7eb054fb4488c35b1e1ee63468d8 Mon Sep 17 00:00:00 2001
From: MyungJoo Ham <myungjoo.ham@samsung.com>
Date: Fri, 4 Nov 2016 17:28:34 +0900
Subject: [PATCH 15/16] Remove Profile Build Dependencies

1. This is for Tizen 4.0

The cdefine "TIZEN_PROFILE_NAME" has been completely useless.
So, let's remove it.

$ grep -r "TIZEN_PROFILE_NAME" *
packaging/krate.spec:         -DTIZEN_PROFILE_NAME=%{profile} \
$

Change-Id: I7f1d6d22e9199ef665d0983daf461cd52f286358
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
---
 packaging/krate.spec | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packaging/krate.spec b/packaging/krate.spec
index 9454f00..da84733 100644
--- a/packaging/krate.spec
+++ b/packaging/krate.spec
@@ -56,11 +56,8 @@ krates.
 	CXXFLAGS="$CXXFLAGS -Wp,-U_FORTIFY_SOURCE"
 %endif
 
-%{!?profile:%define profile "mobile"}
-
 %cmake . -DVERSION=%{version} \
          -DCMAKE_BUILD_TYPE=%{build_type} \
-         -DTIZEN_PROFILE_NAME=%{profile} \
          -DRUN_DIR=%{TZ_SYS_RUN} \
          -DBIN_DIR=%{TZ_SYS_BIN} \
          -DHOME_DIR=%{TZ_SYS_HOME} \
-- 
2.7.4


From d148d7fac4ea933d0819fbc1c80be92c42a9a218 Mon Sep 17 00:00:00 2001
From: Sungbae Yoo <sungbae.yoo@samsung.com>
Date: Thu, 20 Oct 2016 11:45:31 +0900
Subject: [PATCH 16/16] Add to remove the shortcut when container is removed

Signed-off-by: Sungbae Yoo <sungbae.yoo@samsung.com>
Change-Id: I04fc0f358ec32a9873839ba1af16084144f01a7d
---
 tools/apps/keyguard/src/main.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/tools/apps/keyguard/src/main.c b/tools/apps/keyguard/src/main.c
index f04bc21..8ddae52 100644
--- a/tools/apps/keyguard/src/main.c
+++ b/tools/apps/keyguard/src/main.c
@@ -51,7 +51,7 @@ unsigned int _get_left_attempts()
 {
 	unsigned int attempt = 0, max_attempt = 0, expire_sec;
 
-        auth_passwd_check_passwd_state(AUTH_PWD_NORMAL, &attempt, &max_attempt, &expire_sec);
+		auth_passwd_check_passwd_state(AUTH_PWD_NORMAL, &attempt, &max_attempt, &expire_sec);
 
 	if (max_attempt == 0) {
 		return 0xffffffff;
@@ -80,6 +80,11 @@ static void __add_shortcut(const char* krate_name)
 	shortcut_add_to_home(krate_name, LAUNCH_BY_URI, uri, ICON_PATH "/shortcut_icon.png", 0, NULL, NULL);
 }
 
+static void __remove_shortcut(const char* krate_name)
+{
+	shortcut_remove_from_home(krate_name, NULL, NULL);
+}
+
 static bool __app_create(void *data)
 {
 	return true;
@@ -128,6 +133,13 @@ static void __app_control(app_control_h app_control, void *data)
 		__add_shortcut(krate_name);
 		ui_app_exit();
 		return;
+	} else if (strncmp(tmp, "cleanup/", sizeof("cleanup/") - 1) == 0) {
+		char *krate_name;
+
+		krate_name = tmp + sizeof("cleanup/") - 1;
+		__remove_shortcut(krate_name);
+		ui_app_exit();
+		return;
 	} else if (strncmp(tmp, "enter/", sizeof("enter/") - 1) == 0) {
 		char* krate_name, *launch_parameter;
 		char new_uri[PATH_MAX];
@@ -137,7 +149,7 @@ static void __app_control(app_control_h app_control, void *data)
 		if (launch_parameter != NULL) {
 			*(launch_parameter++) = '\0';
 			if (launch_parameter[0] == '\0') {
-				launch_parameter = KASKIT_PACKAGE;	
+				launch_parameter = KASKIT_PACKAGE;
 			}
 		} else {
 			launch_parameter = KASKIT_PACKAGE;
@@ -153,7 +165,7 @@ static void __app_control(app_control_h app_control, void *data)
 		__launch_krate_app(krate_name, app_control);
 		ui_app_exit();
 		return;
-	}else if (strncmp(tmp, "launch/", sizeof("launch/") - 1) == 0) {
+	} else if (strncmp(tmp, "launch/", sizeof("launch/") - 1) == 0) {
 		char* app_id;
 
 		app_id = tmp + sizeof("launch/") - 1;
-- 
2.7.4