From a0522ca9878cba689b87dbd2fc8f0dfd303b4948 Mon Sep 17 00:00:00 2001 From: Hwankyu Jhun Date: Fri, 2 Feb 2024 10:16:12 +0900 Subject: [PATCH 01/16] Release version 1.0.11 Changes: - Remove unnecessary header inclusion Change-Id: I6d9f88ab6eca10274932d7a87de8cc51662a36cb Signed-off-by: Hwankyu Jhun --- packaging/esd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/esd.spec b/packaging/esd.spec index bdb6a31..8662f26 100644 --- a/packaging/esd.spec +++ b/packaging/esd.spec @@ -1,6 +1,6 @@ Name: esd Summary: Event system daemon -Version: 1.0.10 +Version: 1.0.11 Release: 1 Group: Application Framework/Service License: Apache-2.0 -- 2.7.4 From b74add0955efcb082ad16c6da63d73c4442826ab Mon Sep 17 00:00:00 2001 From: Hwankyu Jhun Date: Tue, 12 Mar 2024 13:58:43 +0900 Subject: [PATCH 02/16] Fix lcov option "mismatch,unused" options are added. Change-Id: I57e15e6e729093e4a4411973eaf653aedfc6c113 Signed-off-by: Hwankyu Jhun --- packaging/esd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/esd.spec b/packaging/esd.spec index 8662f26..2a0934b 100644 --- a/packaging/esd.spec +++ b/packaging/esd.spec @@ -116,7 +116,7 @@ make %{?jobs:-j%jobs} ctest -V %if 0%{?gcov:1} -lcov -c --ignore-errors graph --no-external -b . -d . -o %{name}.info +lcov -c --ignore-errors mismatch,graph,unused --no-external -b . -d . -o %{name}.info genhtml %{name}.info -o out --legend --show-details %endif -- 2.7.4 From 365ce528b1d7940cb3a873f8dd9d32d1144a5784 Mon Sep 17 00:00:00 2001 From: Hwankyu Jhun Date: Tue, 12 Mar 2024 14:14:20 +0900 Subject: [PATCH 03/16] Release version 1.0.12 Changes: - Fix lcov option Change-Id: I6975f2fa3be577070fd1f3e1ad48af5f7a0c1a8d Signed-off-by: Hwankyu Jhun --- packaging/esd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/esd.spec b/packaging/esd.spec index 2a0934b..fff9540 100644 --- a/packaging/esd.spec +++ b/packaging/esd.spec @@ -1,6 +1,6 @@ Name: esd Summary: Event system daemon -Version: 1.0.11 +Version: 1.0.12 Release: 1 Group: Application Framework/Service License: Apache-2.0 -- 2.7.4 From 56fd0548bc5f7d9e7622bfd524ca0e1ba41f7dc0 Mon Sep 17 00:00:00 2001 From: Inkyun Kil Date: Tue, 26 Mar 2024 10:56:23 +0900 Subject: [PATCH 04/16] Adds privilege for pkgmgr event Releated patch : https://review.tizen.org/gerrit/c/platform/core/appfw/libeventsystem/+/307316 Change-Id: I883d31dc98262805bac0ea49f874c165aef72974 Signed-off-by: Inkyun Kil --- src/modules/dbus_event/privilege_checker.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/modules/dbus_event/privilege_checker.cc b/src/modules/dbus_event/privilege_checker.cc index c3c5c4c..09ac697 100644 --- a/src/modules/dbus_event/privilege_checker.cc +++ b/src/modules/dbus_event/privilege_checker.cc @@ -37,7 +37,9 @@ const std::map kPrivilegeInfoMap = { {std::string(SYS_EVENT_DISPLAY_STATE), std::string("http://tizen.org/privilege/display")}, {std::string(SYS_EVENT_WIFI_STATE), std::string("http://tizen.org/privilege/network.get")}, {std::string(SYS_EVENT_INCOMMING_MSG), std::string("http://tizen.org/privilege/message.read")}, - {std::string(SYS_EVENT_OUTGOING_MSG), std::string("http://tizen.org/privilege/message.read")} + {std::string(SYS_EVENT_OUTGOING_MSG), std::string("http://tizen.org/privilege/message.read")}, + {std::string(RESERVED_NAME_FOR_USER_PKGMGRSIGNAL), // This is for pkgmgr-server signal + std::string("http://tizen.org/privilege/packagemanager.info")}, }; } // namespace -- 2.7.4 From 9c08564f91002744cca2b0a20a98dff664dad774 Mon Sep 17 00:00:00 2001 From: Inkyun Kil Date: Wed, 27 Mar 2024 09:25:07 +0900 Subject: [PATCH 05/16] Release version 1.0.13 changes: - Adds privilege for pkgmgr event Change-Id: I17a4e9ff36137be417d29fe94c53c49a9613c812 Signed-off-by: Inkyun Kil --- packaging/esd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/esd.spec b/packaging/esd.spec index fff9540..5d12c2b 100644 --- a/packaging/esd.spec +++ b/packaging/esd.spec @@ -1,6 +1,6 @@ Name: esd Summary: Event system daemon -Version: 1.0.12 +Version: 1.0.13 Release: 1 Group: Application Framework/Service License: Apache-2.0 -- 2.7.4 From 494fec0dde5a6cb75a31804238be5798ae0a4900 Mon Sep 17 00:00:00 2001 From: ilho kim Date: Fri, 29 Mar 2024 00:30:45 +0900 Subject: [PATCH 06/16] Prevent the execution of unit tests temporarily Signed-off-by: ilho kim --- packaging/esd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/esd.spec b/packaging/esd.spec index 5d12c2b..fa0c97b 100644 --- a/packaging/esd.spec +++ b/packaging/esd.spec @@ -113,7 +113,7 @@ MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` make %{?jobs:-j%jobs} %check -ctest -V +##ctest -V %if 0%{?gcov:1} lcov -c --ignore-errors mismatch,graph,unused --no-external -b . -d . -o %{name}.info -- 2.7.4 From aabcb1fd9b96ca696f4f42a6ef5fcc11c00b5bf9 Mon Sep 17 00:00:00 2001 From: Inkyun Kil Date: Fri, 29 Mar 2024 10:13:28 +0900 Subject: [PATCH 07/16] Fix build issue for cion-mod-unittest Change-Id: I0c1d93d3b2f5bc26b3d61fa6e43fff97940b387a Signed-off-by: Inkyun Kil --- packaging/esd.spec | 2 +- tests/cion_unit_tests/CMakeLists.txt | 17 +++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/packaging/esd.spec b/packaging/esd.spec index fa0c97b..5d12c2b 100644 --- a/packaging/esd.spec +++ b/packaging/esd.spec @@ -113,7 +113,7 @@ MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` make %{?jobs:-j%jobs} %check -##ctest -V +ctest -V %if 0%{?gcov:1} lcov -c --ignore-errors mismatch,graph,unused --no-external -b . -d . -o %{name}.info diff --git a/tests/cion_unit_tests/CMakeLists.txt b/tests/cion_unit_tests/CMakeLists.txt index 2ae201c..7fa082e 100644 --- a/tests/cion_unit_tests/CMakeLists.txt +++ b/tests/cion_unit_tests/CMakeLists.txt @@ -1,19 +1,27 @@ AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../../src/modules/cion/ ESD_MOD_CION_SRCS) AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../../src/lib/ ESD_LIB_SRCS) AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/src/ ESD_MOD_CION_TEST_SRCS) -AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../mock/ ESD_MOD_CION_MOCK_SRCS) + +SET(MOCK_SRCS + ${CMAKE_CURRENT_SOURCE_DIR}/../mock/tzplatform_config_mock.cc + ${CMAKE_CURRENT_SOURCE_DIR}/../mock/pkgmgr_info_mock.cc + ${CMAKE_CURRENT_SOURCE_DIR}/../mock/test_fixture.cc + ${CMAKE_CURRENT_SOURCE_DIR}/../mock/cion_mock.cc +) + ADD_EXECUTABLE(${TARGET_ESD_MOD_CION_UNITTESTS} ${ESD_MOD_CION_SRCS} ${ESD_LIB_SRCS} ${ESD_MOD_CION_TEST_SRCS} - ${ESD_MOD_CION_MOCK_SRCS} + ${MOCK_SRCS} ) TARGET_INCLUDE_DIRECTORIES(${TARGET_ESD_MOD_CION_UNITTESTS} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../src/modules) TARGET_INCLUDE_DIRECTORIES(${TARGET_ESD_MOD_CION_UNITTESTS} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../) - +TARGET_INCLUDE_DIRECTORIES(${TARGET_ESD_MOD_CION_UNITTESTS} PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/../mock/) TARGET_LINK_LIBRARIES(${TARGET_ESD_MOD_CION_UNITTESTS} PRIVATE ${TARGET_LIB_ESD}) APPLY_PKG_CONFIG(${TARGET_ESD_MOD_CION_UNITTESTS} PUBLIC @@ -32,9 +40,6 @@ APPLY_PKG_CONFIG(${TARGET_ESD_MOD_CION_UNITTESTS} PUBLIC SQLITE3_DEPS DATABASE_DEPS SECURITY_MANAGER_DEPS - CYNARA_CLIENT_DEPS - CYNARA_CREDS_DBUS_DEPS - CYNARA_SESSION_DEPS GMOCK_DEPS ) -- 2.7.4 From 9de375472cff1cf7631aed5b2eba39df66e6cd73 Mon Sep 17 00:00:00 2001 From: Inkyun Kil Date: Wed, 3 Apr 2024 08:01:49 +0900 Subject: [PATCH 08/16] Release version 1.0.14 chagnes: - Fix build issue for cion-mod-unittest - Revert "Prevent the execution of unit tests temporarily" Change-Id: Ibc4821b6242de16fa95ef651a2e3f460e588dbe6 Signed-off-by: Inkyun Kil --- packaging/esd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/esd.spec b/packaging/esd.spec index 5d12c2b..c69d8b3 100644 --- a/packaging/esd.spec +++ b/packaging/esd.spec @@ -1,6 +1,6 @@ Name: esd Summary: Event system daemon -Version: 1.0.13 +Version: 1.0.14 Release: 1 Group: Application Framework/Service License: Apache-2.0 -- 2.7.4 From 4b9370c2199fda2febf5c340ec9ebfa0206f277f Mon Sep 17 00:00:00 2001 From: Hwankyu Jhun Date: Mon, 8 Apr 2024 18:07:19 +0900 Subject: [PATCH 09/16] Add a new environment variable for using blink feature "AUL_BLINK=1" is added to the service file. Requires: - https://review.tizen.org/gerrit/#/c/platform/core/appfw/aul-1/+/309293/ Change-Id: I58a21534a74ea23eeee5d0ba02c30b26e163e66a Signed-off-by: Hwankyu Jhun --- packaging/esd.service | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packaging/esd.service b/packaging/esd.service index 277f18c..aedfa6b 100644 --- a/packaging/esd.service +++ b/packaging/esd.service @@ -9,10 +9,11 @@ Group=app_fw Type=dbus SmackProcessLabel=System BusName=tizen.system.event.app2esd +Environment=AUL_BLINK=1 ExecStart=/usr/bin/esd Restart=on-failure RestartSec=0 MemoryLimit=100M [Install] -WantedBy=multi-user.target \ No newline at end of file +WantedBy=multi-user.target -- 2.7.4 From 08433158d1aafd48e2dff3ca7dfad74565b019cb Mon Sep 17 00:00:00 2001 From: Hwankyu Jhun Date: Thu, 11 Apr 2024 13:00:44 +0900 Subject: [PATCH 10/16] Add DefaultDependencies=no option To disable non-essential dependencies, we should set 'DefaultDependencies=no' to the service file. The esd.service file is moved to the basic.target. The dbus.socket dependency is added. Change-Id: I91be5113ea64731683e3755681eabaa22496ba8c Signed-off-by: Hwankyu Jhun --- packaging/esd.service | 7 ++++--- packaging/esd.spec | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/packaging/esd.service b/packaging/esd.service index aedfa6b..1a14b96 100644 --- a/packaging/esd.service +++ b/packaging/esd.service @@ -1,7 +1,8 @@ [Unit] Description=Start the Event System Daemon -Requires=buxton2.service -After=buxton2.service +Requires=buxton2.service dbus.socket +After=buxton2.service dbus.socket +DefaultDependencies=no [Service] User=app_fw @@ -16,4 +17,4 @@ RestartSec=0 MemoryLimit=100M [Install] -WantedBy=multi-user.target +WantedBy=basic.target diff --git a/packaging/esd.spec b/packaging/esd.spec index c69d8b3..f4d2087 100644 --- a/packaging/esd.spec +++ b/packaging/esd.spec @@ -151,9 +151,9 @@ EOF mkdir -p %{buildroot}%{_bindir}/tizen-unittests/%{name} install -m 0755 run-unittest.sh %{buildroot}%{_bindir}/tizen-unittests/%{name}/ -mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants +mkdir -p %{buildroot}%{_unitdir}/basic.target.wants install -m 0644 %SOURCE1 %{buildroot}%{_unitdir}/esd.service -ln -sf ../esd.service %{buildroot}%{_unitdir}/multi-user.target.wants/esd.service +ln -sf ../esd.service %{buildroot}%{_unitdir}/basic.target.wants/esd.service %if 0%{?gcov:1} builddir=$(basename $PWD) @@ -173,7 +173,7 @@ find . -name '*.gcno' -exec cp --parents '{}' "$gcno_obj_dir" ';' %{_bindir}/esd %{_libdir}/libesd.so.* %{_unitdir}/esd.service -%{_unitdir}/multi-user.target.wants/esd.service +%{_unitdir}/basic.target.wants/esd.service %attr(0644,root,root) %{_datadir}/dbus-1/system-services/tizen.system.event.app2esd.service %license LICENSE -- 2.7.4 From d29f4f3c94a1ede21b4841490fc54748d7a7d5ee Mon Sep 17 00:00:00 2001 From: Hwankyu Jhun Date: Thu, 11 Apr 2024 16:37:50 +0900 Subject: [PATCH 11/16] Release version 1.0.15 Changes: - Add a new environment variable for using blink feature - Add DefaultDependencies=no option Change-Id: I1dbeeca84da3660102aba66685c5ccb0b00d030a Signed-off-by: Hwankyu Jhun --- packaging/esd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/esd.spec b/packaging/esd.spec index f4d2087..3cf1cd0 100644 --- a/packaging/esd.spec +++ b/packaging/esd.spec @@ -1,6 +1,6 @@ Name: esd Summary: Event system daemon -Version: 1.0.14 +Version: 1.0.15 Release: 1 Group: Application Framework/Service License: Apache-2.0 -- 2.7.4 From 90494de361db3d10a06865ce68333deeb769fa2b Mon Sep 17 00:00:00 2001 From: Inkyun Kil Date: Thu, 11 Apr 2024 17:01:42 +0900 Subject: [PATCH 12/16] Fix error for checking pkgmgr privilege Change-Id: I9813154ec8da8ef7316e261bac162158beab6f1a Signed-off-by: Inkyun Kil --- src/modules/dbus_event/privilege_checker.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/dbus_event/privilege_checker.cc b/src/modules/dbus_event/privilege_checker.cc index 09ac697..5309ddf 100644 --- a/src/modules/dbus_event/privilege_checker.cc +++ b/src/modules/dbus_event/privilege_checker.cc @@ -38,7 +38,7 @@ const std::map kPrivilegeInfoMap = { {std::string(SYS_EVENT_WIFI_STATE), std::string("http://tizen.org/privilege/network.get")}, {std::string(SYS_EVENT_INCOMMING_MSG), std::string("http://tizen.org/privilege/message.read")}, {std::string(SYS_EVENT_OUTGOING_MSG), std::string("http://tizen.org/privilege/message.read")}, - {std::string(RESERVED_NAME_FOR_USER_PKGMGRSIGNAL), // This is for pkgmgr-server signal + {std::string(RESERVED_NAME_FOR_SYSTEM_PKGMGRSIGNAL), // This is for pkgmgr-server signal std::string("http://tizen.org/privilege/packagemanager.info")}, }; -- 2.7.4 From d626a24c1d0eb400b8cba4fe16bd3e0b0dbdcf6d Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C5=81ukasz=20Stelmach?= Date: Tue, 4 Jun 2024 11:31:22 +0200 Subject: [PATCH 13/16] MemoryLimit has been replaced by MemoryMax MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The MemoryLimit option is marked as deprecated in systemd and needs to be changed to MemoryMax in unit files. Change-Id: I3ffada20db4dd091729f26fed017615efdf6f691 Signed-off-by: Łukasz Stelmach --- packaging/esd.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/esd.service b/packaging/esd.service index 1a14b96..91ec8f3 100644 --- a/packaging/esd.service +++ b/packaging/esd.service @@ -14,7 +14,7 @@ Environment=AUL_BLINK=1 ExecStart=/usr/bin/esd Restart=on-failure RestartSec=0 -MemoryLimit=100M +MemoryMax=100M [Install] WantedBy=basic.target -- 2.7.4 From 8f8c93f2eaa422196bfdd0f4ea93552a73daddb1 Mon Sep 17 00:00:00 2001 From: jusung son Date: Wed, 5 Jun 2024 09:34:31 +0900 Subject: [PATCH 14/16] Release version 1.0.16 Changes: - Fix error for checking pkgmgr privilege - MemoryLimit has been replaced by MemoryMax Change-Id: I09d42530727ab940e8889ef41938a77cd6f7eaf3 Signed-off-by: jusung son --- packaging/esd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/esd.spec b/packaging/esd.spec index 3cf1cd0..dc84419 100644 --- a/packaging/esd.spec +++ b/packaging/esd.spec @@ -1,6 +1,6 @@ Name: esd Summary: Event system daemon -Version: 1.0.15 +Version: 1.0.16 Release: 1 Group: Application Framework/Service License: Apache-2.0 -- 2.7.4 From deab169cdbeb570d8f8c068df1ef2b2aaaecc62d Mon Sep 17 00:00:00 2001 From: Inkyun Kil Date: Wed, 10 Jul 2024 13:54:02 +0900 Subject: [PATCH 15/16] Fix static analysis - LIB.INSECURE_STRNCMP Change-Id: Idaea85bfb404f83a4b31f53a169dcf682b276697 Signed-off-by: Inkyun Kil --- src/modules/dbus_event/dbus_event_module.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/dbus_event/dbus_event_module.cc b/src/modules/dbus_event/dbus_event_module.cc index f4666f6..04d19dc 100644 --- a/src/modules/dbus_event/dbus_event_module.cc +++ b/src/modules/dbus_event/dbus_event_module.cc @@ -1320,7 +1320,7 @@ int DbusEventModule::PkgmgrEventCb(uid_t target_uid, int req_id, _D("target_uid(%d), req_id(%d), pkg_type(%s), pkgid(%s), key(%s), val(%s)", target_uid, req_id, pkg_type, pkgid, key, val); - if (strncmp(key, "start", strlen(key)) == 0) { + if (strcmp(key, "start") == 0) { if (strcmp(val, "install") == 0) { _D("install start"); obj->pkg_event_type_ = INSTALL; -- 2.7.4 From ffa387c790eaa8f456d0343ffab06f67665d86ec Mon Sep 17 00:00:00 2001 From: Inkyun Kil Date: Wed, 10 Jul 2024 14:01:29 +0900 Subject: [PATCH 16/16] Release version 1.0.17 changes: - Fix static analysis Change-Id: Ia2fdde84e71c5a4ed3e76be30fbe2a6079130f12 Signed-off-by: Inkyun Kil --- packaging/esd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/esd.spec b/packaging/esd.spec index dc84419..480c330 100644 --- a/packaging/esd.spec +++ b/packaging/esd.spec @@ -1,6 +1,6 @@ Name: esd Summary: Event system daemon -Version: 1.0.16 +Version: 1.0.17 Release: 1 Group: Application Framework/Service License: Apache-2.0 -- 2.7.4