set smack rule for valgrand

Change-Id: I5d361b3ec3069fd173a3450764474e47baf9d506
Signed-off-by: yoonki.park <yoonki.park@samsung.com>

diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644 (file)
index 898caea..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,129 +0,0 @@
-sdbd (0.0.2-2) unstable; urgency=low
-
-  * set dir permission to 777
-  * Git: slp/pkgs/s/sdbd
-  * Tag: sdbd_0.0.2-2
-
- -- Yoonki Park <yoonki.park@samsung.com>  Wed, 18 Apr 2012 16:57:03 +0900
-
-sdbd (0.0.2-1) unstable; urgency=low
-
-  * let sshd be daemon and create sshd.pid file
-  * Git: slp/pkgs/s/sdbd
-  * Tag: sdbd_0.0.2-1
-
- -- Yoonki Park <yoonki.park@samsung.com>  Mon, 02 Apr 2012 14:37:44 +0900
-
-sdbd (0.0.2) unstable; urgency=low
-
-  * add rpm spec file
-  * Git: slp/pkgs/s/sdbd
-  * Tag: sdbd_0.0.2
-
- -- Yoonki Park <yoonki.park@samsung.com>  Mon, 19 Mar 2012 17:03:59 +0900
-
-sdbd (0.0.1-13) unstable; urgency=low
-
-  * let start_device_log enable, update maintainer information and set process working directory path to '/'
-  * Git: slp/pkgs/s/sdbd
-  * Tag: sdbd_0.0.1-13
-
- -- Yoonki Park <yoonki.park@samsung.com>  Wed, 14 Mar 2012 17:06:36 +0900
-
-sdbd (0.0.1-12) unstable; urgency=low
-
-  * update changlog file according to package policy  
-  * Git: slp/pkgs/s/sdbd
-  * Tag: sdbd_0.0.1-12
-
- -- Yoonki Park <yoonki.park@samsung.com>  Mon, 05 Mar 2012 10:48:47 +0900
-
-sdbd (0.0.1-11) unstable; urgency=low
-
-  * add loopback interface checking when binding to 26099
-  * Git: pkgs/s/sdbd
-  * Tag: sdbd_0.0.1-11
-
- -- Yoonki Park <yoonki.park@samsung.com>  Wed, 29 Feb 2012 21:09:37 +0900
-
-sdbd (0.0.1-10) unstable; urgency=low
-
-  * Add SIGTERM handler for avoid terminate on the emulator
-  * Git: 165.213.180.234:slp/pkgs/s/sdbd
-  * Tag: sdbd_0.0.1-10
-
- -- Joogwan Kim <joogwan.kim@samsung.com>  Tue, 13 Dec 2011 21:26:01 +0900
-
-sdbd (0.0.1-9) unstable; urgency=low
-
-  * Remove unused files
-  * Git: 165.213.180.234:slp/pkgs/s/sdbd
-  * Tag: sdbd_0.0.1-9
-
- -- Joogwan Kim <joogwan.kim@samsung.com>  Tue, 06 Dec 2011 18:59:38 +0900
-
-sdbd (0.0.1-8) unstable; urgency=low
-
-  * Modify script name to get higher priority
-  * Git: 165.213.180.234:slp/pkgs/s/sdbd
-  * Tag: sdbd_0.0.1-8 
-
- -- Joogwan Kim <joogwan.kim@samsung.com>  Fri, 11 Nov 2011 16:29:46 +0900
-
-sdbd (0.0.1-7) unstable; urgency=low
-
-  * Upload missing files from 0.0.1-6
-  * Git: 165.213.180.234:slp/pkgs/s/sdbd
-  * Tag: sdbd_0.0.1-7 
-
- -- Jinhyung Choi <jinhyung2.choi@samsung.com>  Thu, 13 Oct 2011 22:19:19 +0900
-
-sdbd (0.0.1-6) unstable; urgency=low
-
-  * Supports multi configuration on linux
-  * Change name from Android debug bridge to Samsung Development Bridge in status_window function
-  * Git: 165.213.180.234:slp/pkgs/s/sdbd
-  * Tag: sdbd_0.0.1-6 
-
- -- Jinhyung Choi <jinhyung2.choi@samsung.com>  Thu, 13 Oct 2011 21:22:03 +0900
-
-sdbd (0.0.1-5) unstable; urgency=low
-
-  * Modify dev name from android_adb to samsung_sdb
-  * Git: 165.213.180.234:slp/pkgs/s/sdbd
-  * Tag: sdbd_0.0.1-5 
-
- -- Joogwan Kim <joogwan.kim@samsung.com>  Tue, 11 Oct 2011 22:52:33 +0900
-
-sdbd (0.0.1-4) unstable; urgency=low
-
-  * Change name from android_adb to samsung_sdb and removed unused
-  * Change sdb interface descriptor
-  * Git: 165.213.180.234:slp/pkgs/s/sdbd
-  * Tag: sdbd_0.0.1-4 
-
- -- Joogwan Kim <joogwan.kim@samsung.com>  Tue, 11 Oct 2011 14:35:55 +0900
-
-sdbd (0.0.1-3) unstable; urgency=low
-
-  * Just version up for upload
-  * Git: 165.213.180.234:slp/pkgs/s/sdbd
-  * Tag: sdbd_0.0.1-3
-
- -- Joogwan Kim <joogwan.kim@samsung.com>  Mon, 10 Oct 2011 16:49:02 +0900
-
-sdbd (0.0.1-2) unstable; urgency=low
-
-  * Just version up for upload source package 
-  * Git: 165.213.180.234:slp/pkgs/s/sdbd
-  * Tag: sdbd_0.0.1-2
-
- -- Joogwan Kim <joogwan.kim@samsung.com>  Mon, 10 Oct 2011 16:28:41 +0900
-
-sdbd (0.0.1-1) unstable; urgency=low
-
-  * Initial upload
-  * Git: 165.213.180.234:slp/pkgs/s/sdbd
-  * Tag: sdbd_0.0.1-1
-
- -- Joogwan Kim <joogwan.kim@samsung.com>  Sat, 26 Sep 2011 15:00:56 +0900

diff --git a/debian/compat b/debian/compat
deleted file mode 100644 (file)
index 7813681..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-5
\ No newline at end of file

diff --git a/debian/control b/debian/control
deleted file mode 100644 (file)
index aa3ba16..0000000
--- a/debian/control
+++ /dev/null
@@ -1,10 +0,0 @@
-Source: sdbd
-Section: net
-Priority: extra
-Maintainer: Kangho Kim <kh5325.kim@samsung.com>, Yoonki Park <yoonki.park@samsung.com>, Ho Namkoong <ho.namkoong@samsung.com> 
-Build-Depends: debhelper (>= 5), libc6-dev
-Standards-Version: 0.0.1
-
-Package: sdbd
-Architecture: any 
-Description: SDB daemon

diff --git a/debian/rules b/debian/rules
deleted file mode 100755 (executable)
index 6ebe31f..0000000
--- a/debian/rules
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/make -f
-
-UNAME := $(shell uname -sm)
-ifneq (,$(findstring 86,$(UNAME)))
-       HOST_ARCH := x86
-endif
-
-configure: configure-stamp
-
-configure-stamp:
-       dh_testdir
-       touch configure-stamp
-
-build: build-stamp
-
-build-stamp: configure-stamp
-       dh_testdir
-       $(MAKE)
-       touch build-stamp
-
-install: build
-       dh_testdir
-       dh_testroot
-       $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
-binary: build install
-       dh_testdir
-       dh_testroot
-ifeq ($(HOST_ARCH),x86)
-       dh_install --sourcedir=debian/tmp
-else
-       dh_install --sourcedir=debian/tmp -XS06sdbd
-endif
-       dh_strip
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-clean:
-       dh_testdir
-       rm -f build-stamp configure-stamp
-       $(MAKE) clean
-       dh_clean
-

diff --git a/debian/sdbd.install b/debian/sdbd.install
deleted file mode 100644 (file)
index 5ac7294..0000000
--- a/debian/sdbd.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/sbin/sdbd
-etc/init.d/sdbd
-etc/rc.d/rc3.d/S06sdbd

diff --git a/packaging/sdbd.manifest b/packaging/sdbd.manifest
deleted file mode 100644 (file)
index 86dbb26..0000000
--- a/packaging/sdbd.manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest>
-    <request>
-        <domain name="_" />
-    </request>
-</manifest>

diff --git a/packaging/sdbd.spec b/packaging/sdbd.spec
index 0b6edba..3785bb1 100644 (file)
--- a/packaging/sdbd.spec
+++ b/packaging/sdbd.spec
@@ -1,16 +1,17 @@
 Name:       sdbd
 Summary:    SDB daemon
-Version:    2.1.2
+Version:    2.1.3
 Release:    4
 Group:      TO_BE/FILLED_IN
 License:    TO BE FILLED IN
 Source0:    %{name}-%{version}.tar.gz
-Requires(post) : pkgmgr
-Requires(post) : pkgmgr-server
-Requires(post) : wrt
-Requires(post) : aul
-Requires : default-files-tizen
+Requires(post): pkgmgr
+Requires(post): pkgmgr-server
+Requires(post): wrt
+Requires(post): aul
+Requires: default-files-tizen
 Requires: sys-assert
+Requires: debug-launchpad
 
 %description
 Description: SDB daemon

diff --git a/src/file_sync_service.c b/src/file_sync_service.c
index 276469d..19da335 100644 (file)
--- a/src/file_sync_service.c
+++ b/src/file_sync_service.c
@@ -32,7 +32,7 @@
 #include "sdb.h"
 #include "file_sync_service.h"
 
-#define SYNC_TIMEOUT 10
+#define SYNC_TIMEOUT 15
 
 struct sync_permit_rule
 {

diff --git a/src/sdktools.c b/src/sdktools.c
index 837af3b..7d2f739 100644 (file)
--- a/src/sdktools.c
+++ b/src/sdktools.c
@@ -96,22 +96,25 @@ int verify_root_commands(const char *arg1) {
         break;
     }
     case 3: {
-        if (cnt == 3) {
-            if (!strcmp(tokens[1], "valgrind")) {
-                char *appid = NULL;
-                int rc = smack_lgetlabel(tokens[2], &appid, SMACK_LABEL_ACCESS);
-                if (rc == 0 && appid != NULL) {
-                    if (apply_sdb_rules(SDBD_LABEL_NAME, appid, "rwax") < 0) {
-                        D("unable to set %s %s rules\n", SDBD_LABEL_NAME, appid);
-                    }
-                    if (apply_sdb_rules(appid, SDBD_LABEL_NAME, "rwax") < 0) {
-                        D("unable to set %s %s rules\n", appid, SDBD_LABEL_NAME);
-                    }
-                    //apply_app_process();
-                    free(appid);
+        if (!strcmp(tokens[1], "valgrind")) {
+            char *appid = NULL;
+            int rc = smack_lgetlabel(tokens[cnt-1], &appid, SMACK_LABEL_ACCESS);
+            if (rc == 0 && appid != NULL) {
+                if (apply_sdb_rules(SDBD_LABEL_NAME, appid, "rwax") < 0) {
+                    D("unable to set %s %s rules\n", SDBD_LABEL_NAME, appid);
+                } else {
+                    D("apply rule to '%s %s rwax' rules\n", SDBD_LABEL_NAME, appid);
                 }
-                D("standalone launch for valgrind\n");
+                if (apply_sdb_rules(appid, SDBD_LABEL_NAME, "rwax") < 0) {
+                    D("unable to set %s %s rules\n", appid, SDBD_LABEL_NAME);
+                } else {
+                    D("apply rule to '%s %s rwax' rules\n", appid, SDBD_LABEL_NAME);
+                }
+                //apply_app_process();
+
+                free(appid);
             }
+            D("standalone launch for valgrind\n");
         }
 
         ret = 1;
@@ -251,8 +254,15 @@ int exec_app_standalone(const char* path) {
                 char *appid = NULL;
                 int rc = smack_lgetlabel(path, &appid, SMACK_LABEL_ACCESS);
                 if (rc == 0 && appid != NULL) {
-                    if (apply_sdb_rules(SDBD_LABEL_NAME, appid, "rxax") < 0) {
-                        D("unable to set sdbd rules to %s\n", appid);
+                    if (apply_sdb_rules(SDBD_LABEL_NAME, appid, "rwax") < 0) {
+                        D("unable to set sdbd rules to %s %s rwax\n", SDBD_LABEL_NAME, appid);
+                    } else {
+                        D("set sdbd rules to %s %s rwax\n", SDBD_LABEL_NAME, appid);
+                    }
+                    if (apply_sdb_rules(appid, SDBD_LABEL_NAME, "rwax") < 0) {
+                        D("unable to set sdbd rules to %s %s rwax\n", appid, SDBD_LABEL_NAME);
+                    } else {
+                        D("set sdbd rules to %s %s rwax\n", appid, SDBD_LABEL_NAME);
                     }
                     if (smack_set_label_for_self(appid) != -1) {
                         D("set smack lebel [%s] appid to %s\n", appid, SMACK_LEBEL_SUBJECT_PATH);