Minor fixes: chmod files, rename dbus conf file, etc.

Change-Id: Ia23bfea0d18dd65f9c3a7a504f0b7b4817980d89
Signed-off-by: Hyotaek Shim <hyotaek.shim@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index 4fefdc7..e949ab8
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,6 +29,7 @@ SET(PKG_MODULES
 )
 
 ADD_DEFINITIONS("-DLIBPATH=\"${LIB_INSTALL_DIR}\"")
+ADD_DEFINITIONS("-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64")
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(${PROJECT_NAME}_pkgs REQUIRED ${PKG_MODULES})
@@ -38,7 +39,6 @@ FOREACH(flag ${${PROJECT_NAME}_pkgs_CFLAGS})
 ENDFOREACH(flag)
 
 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden -Werror -rdynamic -Wno-deprecated-declarations")
-SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64")
 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -g -fno-omit-frame-pointer -finstrument-functions")
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -lrt -fPIE")
 SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")
@@ -47,7 +47,7 @@ ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS})
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${${PROJECT_NAME}_pkgs_LDFLAGS} "-ldl" "-lm")
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin)
 
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/scripts/storaged.conf DESTINATION /etc/dbus-1/system.d)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/conf/org.tizen.system.storage.conf DESTINATION /etc/dbus-1/system.d)
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/systemd/ DESTINATION lib/systemd/system
        FILES_MATCHING
        PATTERN "storaged.service")

diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/apps/extended-sd/CMakeLists.txt b/apps/extended-sd/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/apps/extended-sd/org.tizen.extended-sd.xml b/apps/extended-sd/org.tizen.extended-sd.xml
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/apps/extended-sd/resource/images/extended_storage_sd_card.png b/apps/extended-sd/resource/images/extended_storage_sd_card.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/conf/org.tizen.system.storage.conf b/conf/org.tizen.system.storage.conf
new file mode 100644 (file)
index 0000000..8657f26
--- /dev/null
+++ b/conf/org.tizen.system.storage.conf
@@ -0,0 +1,60 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+
+<busconfig>
+    <policy user="root">
+        <allow own="org.tizen.system.storage"/>
+        <allow send_destination="org.tizen.system.storage"/>
+    </policy>
+
+    <policy user="security_fw">
+        <allow send_destination="org.tizen.system.storage"
+                send_path="/Org/Tizen/System/Storage/Block/Manager"
+                send_member="GetControl"/>
+        <allow send_destination="org.tizen.system.storage"
+                send_path="/Org/Tizen/System/Storage/Block/Manager"
+                send_member="Control"/>
+    </policy>
+
+    <policy context="default">
+        <deny send_destination="org.tizen.system.storage"/>
+        <allow send_destination="org.tizen.system.storage" send_type="signal"/>
+
+        <check send_destination="org.tizen.system.storage"
+                send_path="/Org/Tizen/System/Storage/Block/Manager"
+                privilege="http://tizen.org/privilege/externalstorage"/>
+
+        <allow send_destination="org.tizen.system.storage"
+                send_path="/Org/Tizen/System/Storage/Storage"
+                send_member="GetStatus"/>
+        <allow send_destination="org.tizen.system.storage"
+                send_path="/Org/Tizen/System/Storage/Storage"
+                send_member="getstorage"/>
+        <allow send_destination="org.tizen.system.storage"
+                send_path="/Org/Tizen/System/Storage/Storage"
+                send_member="GetStatvfs"/>
+
+        <deny send_destination="org.tizen.system.storage"
+                send_path="/Org/Tizen/System/Storage/Block/Manager"
+                send_member="GetControl"/>
+        <deny send_destination="org.tizen.system.storage"
+                send_path="/Org/Tizen/System/Storage/Block/Manager"
+                send_member="Control"/>
+
+        <allow send_destination="org.tizen.system.storage"
+                send_path="/Org/Tizen/System/Storage/Block/Manager"
+                send_member="ShowDeviceList"/>
+        <allow send_destination="org.tizen.system.storage"
+                send_path="/Org/Tizen/System/Storage/Block/Manager"
+                send_member="GetDeviceList"/>
+        <allow send_destination="org.tizen.system.storage"
+                send_path="/Org/Tizen/System/Storage/Block/Manager"
+                send_member="GetDeviceList2"/>
+        <allow send_destination="org.tizen.system.storage"
+                send_path="/Org/Tizen/System/Storage/Block/Manager"
+                send_member="GetDeviceInfo"/>
+        <allow send_destination="org.tizen.system.storage"
+                send_path="/Org/Tizen/System/Storage/Block/Manager"
+                send_member="GetMmcPrimary"/>
+    </policy>
+</busconfig>

diff --git a/packaging/storaged.spec b/packaging/storaged.spec
index 1b2122c2420700b8a6bf0ffede6743728cff78e2..15b86c98f51d798e1b01a0854696d38c76767463 100644 (file)
--- a/packaging/storaged.spec
+++ b/packaging/storaged.spec
@@ -132,7 +132,7 @@ systemctl daemon-reload
 %files
 %manifest %{name}.manifest
 %license LICENSE.Apache-2.0
-%config %{_sysconfdir}/dbus-1/system.d/storaged.conf
+%config %{_sysconfdir}/dbus-1/system.d/org.tizen.system.storage.conf
 %{_unitdir}/multi-user.target.wants/storaged.service
 %{_unitdir}/storaged.service
 %{_bindir}/storaged

diff --git a/scripts/storaged.conf b/scripts/storaged.conf
deleted file mode 100755 (executable)
index 8657f26..0000000
--- a/scripts/storaged.conf
+++ /dev/null
@@ -1,60 +0,0 @@
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-
-<busconfig>
-    <policy user="root">
-        <allow own="org.tizen.system.storage"/>
-        <allow send_destination="org.tizen.system.storage"/>
-    </policy>
-
-    <policy user="security_fw">
-        <allow send_destination="org.tizen.system.storage"
-                send_path="/Org/Tizen/System/Storage/Block/Manager"
-                send_member="GetControl"/>
-        <allow send_destination="org.tizen.system.storage"
-                send_path="/Org/Tizen/System/Storage/Block/Manager"
-                send_member="Control"/>
-    </policy>
-
-    <policy context="default">
-        <deny send_destination="org.tizen.system.storage"/>
-        <allow send_destination="org.tizen.system.storage" send_type="signal"/>
-
-        <check send_destination="org.tizen.system.storage"
-                send_path="/Org/Tizen/System/Storage/Block/Manager"
-                privilege="http://tizen.org/privilege/externalstorage"/>
-
-        <allow send_destination="org.tizen.system.storage"
-                send_path="/Org/Tizen/System/Storage/Storage"
-                send_member="GetStatus"/>
-        <allow send_destination="org.tizen.system.storage"
-                send_path="/Org/Tizen/System/Storage/Storage"
-                send_member="getstorage"/>
-        <allow send_destination="org.tizen.system.storage"
-                send_path="/Org/Tizen/System/Storage/Storage"
-                send_member="GetStatvfs"/>
-
-        <deny send_destination="org.tizen.system.storage"
-                send_path="/Org/Tizen/System/Storage/Block/Manager"
-                send_member="GetControl"/>
-        <deny send_destination="org.tizen.system.storage"
-                send_path="/Org/Tizen/System/Storage/Block/Manager"
-                send_member="Control"/>
-
-        <allow send_destination="org.tizen.system.storage"
-                send_path="/Org/Tizen/System/Storage/Block/Manager"
-                send_member="ShowDeviceList"/>
-        <allow send_destination="org.tizen.system.storage"
-                send_path="/Org/Tizen/System/Storage/Block/Manager"
-                send_member="GetDeviceList"/>
-        <allow send_destination="org.tizen.system.storage"
-                send_path="/Org/Tizen/System/Storage/Block/Manager"
-                send_member="GetDeviceList2"/>
-        <allow send_destination="org.tizen.system.storage"
-                send_path="/Org/Tizen/System/Storage/Block/Manager"
-                send_member="GetDeviceInfo"/>
-        <allow send_destination="org.tizen.system.storage"
-                send_path="/Org/Tizen/System/Storage/Block/Manager"
-                send_member="GetMmcPrimary"/>
-    </policy>
-</busconfig>

diff --git a/src/auto-test/block.c b/src/auto-test/block.c
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/auto-test/storage.c b/src/auto-test/storage.c
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/shared/apps.c b/src/shared/apps.c
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/shared/apps.h b/src/shared/apps.h
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/shared/dbus_macro.h b/src/shared/dbus_macro.h
old mode 100755 (executable)
new mode 100644 (file)