From 5b6f99d7ec6bc3a179294951197d214fa689ae76 Mon Sep 17 00:00:00 2001 From: Hwankyu Jhun Date: Mon, 6 Aug 2018 07:46:50 +0900 Subject: [PATCH 01/16] Use strerror_r function Change-Id: Icd59265066036fc0b4a5417e882ecb57920ab1e9 Signed-off-by: Hwankyu Jhun --- src/launchpad_common.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/src/launchpad_common.c b/src/launchpad_common.c index f8a9a3b..df893cd 100644 --- a/src/launchpad_common.c +++ b/src/launchpad_common.c @@ -678,6 +678,21 @@ error: return -1; } +#ifdef TIZEN_FEATURE_SET_PERSONALITY_32 +static void __set_execution_domain(void) +{ + char err_buf[1024]; + int res; + + res = personality(PER_LINUX32); + if (res < 0) { + _E("personality() failed, error: %d (%s)", + errno, + strerror_r(errno, err_buf, sizeof(err_buf))); + } +} +#endif /* TIZEN_FEATURE_SET_PERSONALITY_32 */ + void _set_env(appinfo_t *menu_info, bundle *kb) { const char *str; @@ -716,13 +731,8 @@ void _set_env(appinfo_t *menu_info, bundle *kb) setenv("AUL_PID", buf, 1); #ifdef TIZEN_FEATURE_SET_PERSONALITY_32 - int res = personality(PER_LINUX32); - - if (res < 0) { - _E("personality() failed, error: %d (%s)", - errno, strerror(errno)); - } -#endif + __set_execution_domain(); +#endif /* TIZEN_FEATURE_SET_PERSONALITY_32 */ } char **_create_argc_argv(bundle *kb, int *margc) -- 2.7.4 From 76d8f394d980573ed21fe7c9192a11e776224032 Mon Sep 17 00:00:00 2001 From: Hwankyu Jhun Date: Wed, 22 Aug 2018 10:12:56 +0900 Subject: [PATCH 02/16] Check bundle key If the key of bundle has prefix(AUL or APP_SVC), Launchpad doesn't add the extra data. Change-Id: I6396d230b8c2d0309e2a0e35a7436043ce97e0e9 Signed-off-by: Hwankyu Jhun --- src/launchpad_common.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/launchpad_common.c b/src/launchpad_common.c index df893cd..c59cfa1 100644 --- a/src/launchpad_common.c +++ b/src/launchpad_common.c @@ -580,6 +580,20 @@ void _appinfo_free(appinfo_t *menu_info) free(menu_info); } +static bool __validate_bundle_key(const char *key) +{ + if (!key) + return false; + + if (!strncmp(key, "__AUL_", strlen("__AUL_"))) + return false; + + if (!strncmp(key, "__APP_SVC_", strlen("__APP_SVC_"))) + return false; + + return true; +} + void _modify_bundle(bundle *kb, int caller_pid, appinfo_t *menu_info, int cmd) { char *ptr; @@ -617,7 +631,8 @@ void _modify_bundle(bundle *kb, int caller_pid, appinfo_t *menu_info, int cmd) ptr += flag; /*bundle_del(kb, key);*/ - bundle_add(kb, key, value); + if (__validate_bundle_key(key)) + bundle_add(kb, key, value); } while (flag > 0); } else if (flag == 0) _D("parsing app_path: No arguments"); -- 2.7.4 From 19ff89a42ee74005058791e9d07627ab2a664e1e Mon Sep 17 00:00:00 2001 From: Hwankyu Jhun Date: Wed, 22 Aug 2018 11:43:52 +0900 Subject: [PATCH 03/16] Release version 0.5.13 Changes: - Use strerror_r function - Check bundle key Change-Id: I4de5af89eea14c7a05c9a467bdd5143bbd075235 Signed-off-by: Hwankyu Jhun --- packaging/launchpad.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/launchpad.spec b/packaging/launchpad.spec index f47f434..133c82a 100644 --- a/packaging/launchpad.spec +++ b/packaging/launchpad.spec @@ -1,6 +1,6 @@ Name: launchpad Summary: Launchpad for launching applications -Version: 0.5.12 +Version: 0.5.13 Release: 1 Group: Application Framework/Daemons License: Apache-2.0 -- 2.7.4 From 9a46aa8b03bd790e4bc94ef2191a3e26d5faeabf Mon Sep 17 00:00:00 2001 From: Junghoon Park Date: Thu, 30 Aug 2018 14:41:05 +0900 Subject: [PATCH 04/16] Adjust timeout value Change-Id: I91504fed2a70dac1d0797256dd52b815086da91a Signed-off-by: Junghoon Park --- src/launchpad_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/launchpad_common.c b/src/launchpad_common.c index c59cfa1..48f790f 100644 --- a/src/launchpad_common.c +++ b/src/launchpad_common.c @@ -1260,7 +1260,7 @@ int _enable_external_pkg(bundle *b, const char *pkgid, uid_t pkg_uid) do { ret = __dbus_send_message(__create_app2sd_message, - &pkg_info, G_MAXINT, &result); + &pkg_info, 500, &result); if (ret != 0) { _E("Failed to send message"); retry_cnt++; -- 2.7.4 From 4fed88c9a61431badeaec685fb8820a498583d24 Mon Sep 17 00:00:00 2001 From: Junghoon Park Date: Thu, 30 Aug 2018 15:21:38 +0900 Subject: [PATCH 05/16] Release version 0.5.14 Changes: - Adjust timeout value Change-Id: I28a45a7a874a354533f811f77f6540479ee41866 Signed-off-by: Junghoon Park --- packaging/launchpad.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/launchpad.spec b/packaging/launchpad.spec index 133c82a..8aed1e8 100644 --- a/packaging/launchpad.spec +++ b/packaging/launchpad.spec @@ -1,6 +1,6 @@ Name: launchpad Summary: Launchpad for launching applications -Version: 0.5.13 +Version: 0.5.14 Release: 1 Group: Application Framework/Daemons License: Apache-2.0 -- 2.7.4 From b778fb403eb4449f706607ab6fcc90da9305d9aa Mon Sep 17 00:00:00 2001 From: Junghoon Park Date: Thu, 30 Aug 2018 19:08:40 +0900 Subject: [PATCH 06/16] Add log messages Change-Id: I05bde3a891f7603d4aa4607abef920b1898f825a Signed-off-by: Junghoon Park --- src/launchpad.c | 2 ++ src/launchpad_lib.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/launchpad.c b/src/launchpad.c index 869e510..363ba3a 100755 --- a/src/launchpad.c +++ b/src/launchpad.c @@ -959,7 +959,9 @@ static int __prepare_exec(const char *appid, const char *app_path, } /* SET PRIVILEGES*/ + _W("security_manager_prepare_app ++"); ret = security_manager_prepare_app(appid); + _W("security_manager_prepare_app --"); if (ret != SECURITY_MANAGER_SUCCESS) return PAD_ERR_REJECTED; diff --git a/src/launchpad_lib.c b/src/launchpad_lib.c index 70161c0..7e3a124 100644 --- a/src/launchpad_lib.c +++ b/src/launchpad_lib.c @@ -84,7 +84,9 @@ static int __prepare_exec(const char *appid, const char *app_path, return -1; } + _W("security_manager_prepare_app ++"); ret = security_manager_prepare_app(appid); + _W("security_manager_prepare_app --"); if (ret != SECURITY_MANAGER_SUCCESS) { _E("Failed to set privileges %s:%d", appid, ret); return -1; -- 2.7.4 From 59438131810a366855b02dddbb7964592caecfb6 Mon Sep 17 00:00:00 2001 From: Hwankyu Jhun Date: Mon, 3 Sep 2018 13:46:55 +0900 Subject: [PATCH 07/16] Release version 0.5.15 Changes: - Add log messages Change-Id: Iec3c5efaa49ce1dd9065770221aa4f2f14dc2513 Signed-off-by: Hwankyu Jhun --- packaging/launchpad.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/launchpad.spec b/packaging/launchpad.spec index 8aed1e8..3e36dd5 100644 --- a/packaging/launchpad.spec +++ b/packaging/launchpad.spec @@ -1,6 +1,6 @@ Name: launchpad Summary: Launchpad for launching applications -Version: 0.5.14 +Version: 0.5.15 Release: 1 Group: Application Framework/Daemons License: Apache-2.0 -- 2.7.4 From 2cbb0aa0420dc0909665aec1ac9cd9827c0ecf5f Mon Sep 17 00:00:00 2001 From: Hwankyu Jhun Date: Wed, 12 Sep 2018 11:59:02 +0900 Subject: [PATCH 08/16] Prevent loader execution by any process The loader library checks capabilities to checks whether the process is executed by launchpad-process-pool or not. The access smack label is added on loader executable file. Change-Id: I1943ff4076a8296a78891fc4eb3434b4578c6057 Signed-off-by: Hwankyu Jhun --- CMakeLists.txt | 2 ++ inc/launchpad_common.h | 1 + launchpad.manifest | 2 +- src/launchpad_common.c | 43 +++++++++++++++++++++++++++++++++++++++++++ src/launchpad_lib.c | 7 ++++++- 5 files changed, 53 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 782f03d..4c77152 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,6 +36,7 @@ PKG_CHECK_MODULES(${this_target_loader} REQUIRED libsystemd gio-2.0 dbus-1 + libcap ) FOREACH(flag ${${this_target_loader}_CFLAGS}) @@ -50,6 +51,7 @@ PKG_CHECK_MODULES(${this_target_lib} REQUIRED libtzplatform-config tanchor dbus-1 + libcap ) FOREACH(flag ${${this_target_lib}_CFLAGS}) diff --git a/inc/launchpad_common.h b/inc/launchpad_common.h index f842b76..3b789f5 100644 --- a/inc/launchpad_common.h +++ b/inc/launchpad_common.h @@ -128,6 +128,7 @@ int _set_priority(int prio); int _wait_tep_mount(bundle *b); int _prepare_app_socket(void); int _enable_external_pkg(bundle *b, const char *pkgid, uid_t pkg_uid); +int _verify_proc_caps(void); #endif /* __LAUNCHPAD_COMMON_H__ */ diff --git a/launchpad.manifest b/launchpad.manifest index 9f9511c..ca22179 100644 --- a/launchpad.manifest +++ b/launchpad.manifest @@ -4,7 +4,7 @@ - + diff --git a/src/launchpad_common.c b/src/launchpad_common.c index 48f790f..2d7e3b6 100644 --- a/src/launchpad_common.c +++ b/src/launchpad_common.c @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -1275,3 +1276,45 @@ int _enable_external_pkg(bundle *b, const char *pkgid, uid_t pkg_uid) return result; } + +int _verify_proc_caps(void) +{ + cap_t cap_d; + cap_flag_value_t eff_state; + cap_flag_value_t inh_state; + cap_value_t values[] = {CAP_SETGID, CAP_SYS_ADMIN}; + int i; + int r; + + cap_d = cap_get_proc(); + if (!cap_d) { + _E("Failed to get cap from proc. pid(%d)", getpid()); + return -1; + } + + for (i = 0; i < ARRAY_SIZE(values); i++) { + r = cap_get_flag(cap_d, values[i], CAP_INHERITABLE, &inh_state); + if (r != 0) { + _E("Failed to get cap inh - errno(%d)", errno); + cap_free(cap_d); + return -1; + } + + r = cap_get_flag(cap_d, values[i], CAP_EFFECTIVE, &eff_state); + if (r != 0) { + _E("Failed to get cap eff - errno(%d)", errno); + cap_free(cap_d); + return -1; + } + + if ((inh_state != CAP_SET) || (eff_state != CAP_SET)) { + _E("The process(%d) doesn't have %d cap", + getpid(), values[i]); + cap_free(cap_d); + return -1; + } + } + cap_free(cap_d); + + return 0; +} diff --git a/src/launchpad_lib.c b/src/launchpad_lib.c index 7e3a124..dd7620a 100644 --- a/src/launchpad_lib.c +++ b/src/launchpad_lib.c @@ -315,6 +315,9 @@ static int __before_loop(int argc, char **argv) int ret = -1; bundle *extra = NULL; + if (_verify_proc_caps() < 0) + return -1; + __preexec_init(argc, argv); /* Set new session ID & new process group ID*/ @@ -412,8 +415,10 @@ API int launchpad_loader_main(int argc, char **argv, __argc = argc; __argv = argv; - if (__before_loop(argc, argv) != 0) + if (__before_loop(argc, argv) != 0) { + _E("Failed to prepare running loader. type(%d)", __loader_type); return -1; + } _D("[candidate] ecore main loop begin"); __loader_adapter->loop_begin(__loader_user_data); -- 2.7.4 From 6e91dec0845c5537b04e3089c4bed6a4381c615f Mon Sep 17 00:00:00 2001 From: Hwankyu Jhun Date: Thu, 13 Sep 2018 12:17:22 +0900 Subject: [PATCH 09/16] Release version 0.5.16 Changes: - Prevent loader execution by any process Change-Id: I59025b26274580e6e6eb0dd590d86468b6115343 Signed-off-by: Hwankyu Jhun --- packaging/launchpad.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/launchpad.spec b/packaging/launchpad.spec index 3e36dd5..a176a5d 100644 --- a/packaging/launchpad.spec +++ b/packaging/launchpad.spec @@ -1,6 +1,6 @@ Name: launchpad Summary: Launchpad for launching applications -Version: 0.5.15 +Version: 0.5.16 Release: 1 Group: Application Framework/Daemons License: Apache-2.0 -- 2.7.4 From 5e071629acaed31af8aadbdbb2b16a7ac3d84fc0 Mon Sep 17 00:00:00 2001 From: Hwankyu Jhun Date: Thu, 20 Sep 2018 14:44:01 +0900 Subject: [PATCH 10/16] Adjust checking cap list - Removes checking cap_sys_admin existence Change-Id: Iae1da549f9fb0d379e02ecf11abeb83815ebbc8b Signed-off-by: Hwankyu Jhun --- src/launchpad_common.c | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/src/launchpad_common.c b/src/launchpad_common.c index 2d7e3b6..e1d22c8 100644 --- a/src/launchpad_common.c +++ b/src/launchpad_common.c @@ -1282,8 +1282,7 @@ int _verify_proc_caps(void) cap_t cap_d; cap_flag_value_t eff_state; cap_flag_value_t inh_state; - cap_value_t values[] = {CAP_SETGID, CAP_SYS_ADMIN}; - int i; + cap_value_t value = CAP_SETGID; int r; cap_d = cap_get_proc(); @@ -1292,27 +1291,25 @@ int _verify_proc_caps(void) return -1; } - for (i = 0; i < ARRAY_SIZE(values); i++) { - r = cap_get_flag(cap_d, values[i], CAP_INHERITABLE, &inh_state); - if (r != 0) { - _E("Failed to get cap inh - errno(%d)", errno); - cap_free(cap_d); - return -1; - } + r = cap_get_flag(cap_d, value, CAP_INHERITABLE, &inh_state); + if (r != 0) { + _E("Failed to get cap inh - errno(%d)", errno); + cap_free(cap_d); + return -1; + } - r = cap_get_flag(cap_d, values[i], CAP_EFFECTIVE, &eff_state); - if (r != 0) { - _E("Failed to get cap eff - errno(%d)", errno); - cap_free(cap_d); - return -1; - } + r = cap_get_flag(cap_d, value, CAP_EFFECTIVE, &eff_state); + if (r != 0) { + _E("Failed to get cap eff - errno(%d)", errno); + cap_free(cap_d); + return -1; + } - if ((inh_state != CAP_SET) || (eff_state != CAP_SET)) { - _E("The process(%d) doesn't have %d cap", - getpid(), values[i]); - cap_free(cap_d); - return -1; - } + if ((inh_state != CAP_SET) || (eff_state != CAP_SET)) { + _E("The process(%d) doesn't have %d cap", + getpid(), value); + cap_free(cap_d); + return -1; } cap_free(cap_d); -- 2.7.4 From 79d909fbda2ff5bc71d4286e8497a43a8ec746c4 Mon Sep 17 00:00:00 2001 From: Hwankyu Jhun Date: Thu, 20 Sep 2018 14:53:01 +0900 Subject: [PATCH 11/16] Release version 0.5.17 Changes: - Adjust checking cap list Change-Id: Ibb4f850caf8b3d8e09e9a7f770a5f281598f5e91 Signed-off-by: Hwankyu Jhun --- packaging/launchpad.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/launchpad.spec b/packaging/launchpad.spec index a176a5d..b56b8e1 100644 --- a/packaging/launchpad.spec +++ b/packaging/launchpad.spec @@ -1,6 +1,6 @@ Name: launchpad Summary: Launchpad for launching applications -Version: 0.5.16 +Version: 0.5.17 Release: 1 Group: Application Framework/Daemons License: Apache-2.0 -- 2.7.4 From 251234eea07acb79857ca53e60bbb491e0b0c059 Mon Sep 17 00:00:00 2001 From: Hwankyu Jhun Date: Fri, 12 Oct 2018 10:32:42 +0900 Subject: [PATCH 12/16] Update preload list EFL version is updated to 1.21. Change-Id: Ic86ac1149d3525f142c82f9fef41625a0c4b3582 Signed-off-by: Hwankyu Jhun --- packaging/default.loader.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packaging/default.loader.in b/packaging/default.loader.in index c127b19..6156b99 100644 --- a/packaging/default.loader.in +++ b/packaging/default.loader.in @@ -10,12 +10,12 @@ EXTRA_ARRAY preload EXTRA_ARRAY_VAL @LIB_INSTALL_DIR@/libappcore-efl.so.1 EXTRA_ARRAY_VAL @LIB_INSTALL_DIR@/libappcore-common.so.1 EXTRA_ARRAY_VAL @LIB_INSTALL_DIR@/libcapi-appfw-application.so.0 -EXTRA_ARRAY_VAL @LIB_INSTALL_DIR@/ecore_imf/modules/wayland/v-1.20/libwltextinputmodule.so +EXTRA_ARRAY_VAL @LIB_INSTALL_DIR@/ecore_imf/modules/wayland/v-1.21/module.so EXTRA_ARRAY_VAL @LIB_INSTALL_DIR@/libdali-toolkit.so EXTRA_ARRAY_VAL @LIB_INSTALL_DIR@/libcairo.so.2 EXTRA_ARRAY_VAL @LIB_INSTALL_DIR@/libcapi-media-player.so.0 EXTRA_ARRAY_VAL @LIB_INSTALL_DIR@/libcapi-media-camera.so.0 -EXTRA_ARRAY_VAL @LIB_INSTALL_DIR@/ecore_evas/engines/extn/v-1.20/module.so +EXTRA_ARRAY_VAL @LIB_INSTALL_DIR@/ecore_evas/engines/extn/v-1.21/module.so ALTERNATIVE_LOADER common-loader1 [LOADER] @@ -29,8 +29,8 @@ EXTRA_ARRAY preload EXTRA_ARRAY_VAL @LIB_INSTALL_DIR@/libappcore-efl.so.1 EXTRA_ARRAY_VAL @LIB_INSTALL_DIR@/libappcore-common.so.1 EXTRA_ARRAY_VAL @LIB_INSTALL_DIR@/libcapi-appfw-application.so.0 -EXTRA_ARRAY_VAL @LIB_INSTALL_DIR@/ecore_imf/modules/wayland/v-1.20/libwltextinputmodule.so -EXTRA_ARRAY_VAL @LIB_INSTALL_DIR@/ecore_evas/engines/extn/v-1.20/module.so +EXTRA_ARRAY_VAL @LIB_INSTALL_DIR@/ecore_imf/modules/wayland/v-1.21/module.so +EXTRA_ARRAY_VAL @LIB_INSTALL_DIR@/ecore_evas/engines/extn/v-1.21/module.so -- 2.7.4 From 16294163f04f5469fac4031a373ecced817eb091 Mon Sep 17 00:00:00 2001 From: Hwankyu Jhun Date: Thu, 8 Nov 2018 10:53:55 +0900 Subject: [PATCH 13/16] Release version 0.5.18 Changes: - Update preload list Change-Id: Ibfea84f8e36c6cc958e2bf839fdf70e7c19735b4 Signed-off-by: Hwankyu Jhun --- packaging/launchpad.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/launchpad.spec b/packaging/launchpad.spec index b56b8e1..7c0fb14 100644 --- a/packaging/launchpad.spec +++ b/packaging/launchpad.spec @@ -1,6 +1,6 @@ Name: launchpad Summary: Launchpad for launching applications -Version: 0.5.17 +Version: 0.5.18 Release: 1 Group: Application Framework/Daemons License: Apache-2.0 -- 2.7.4 From fd1871a6d0ce3bb053d7427a0b9910692bd1669f Mon Sep 17 00:00:00 2001 From: Hwankyu Jhun Date: Tue, 13 Nov 2018 14:01:01 +0900 Subject: [PATCH 14/16] Separate launchpad libary from launchpad package Adds packages: - liblaunchpad - liblaunchpad-devel Change-Id: Id83f2dd87dffa16990d7654ad2ea2f12d27985a8 Signed-off-by: Hwankyu Jhun --- launchpad-loader.manifest | 8 ++++++++ launchpad.manifest | 2 -- liblaunchpad.manifest | 5 +++++ packaging/launchpad.spec | 31 ++++++++++++++++++++++++++++--- 4 files changed, 41 insertions(+), 5 deletions(-) create mode 100644 launchpad-loader.manifest create mode 100644 liblaunchpad.manifest diff --git a/launchpad-loader.manifest b/launchpad-loader.manifest new file mode 100644 index 0000000..e1e0a45 --- /dev/null +++ b/launchpad-loader.manifest @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/launchpad.manifest b/launchpad.manifest index ca22179..c3dd1a2 100644 --- a/launchpad.manifest +++ b/launchpad.manifest @@ -4,7 +4,5 @@ - - diff --git a/liblaunchpad.manifest b/liblaunchpad.manifest new file mode 100644 index 0000000..97e8c31 --- /dev/null +++ b/liblaunchpad.manifest @@ -0,0 +1,5 @@ + + + + + diff --git a/packaging/launchpad.spec b/packaging/launchpad.spec index 7c0fb14..1f25fa9 100644 --- a/packaging/launchpad.spec +++ b/packaging/launchpad.spec @@ -49,7 +49,7 @@ Launchpad for launching applications %package devel Summary: Launchpad for launching applications (devel) Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: liblaunchpad = %{version}-%{release} %description devel Launchpad for launching applications (devel) @@ -61,6 +61,21 @@ Group: Application Framework/Application Launcher %description -n launchpad-loader Launchpad-Loader for launching applications +%package -n liblaunchpad +Summary: Launchpad library +Group: Development/Libraries + +%description -n liblaunchpad +Launchpad library + +%package -n liblaunchpad-devel +Summary: Launchpad library (devel) +Group: Development/Libraries +Requires: liblaunchpad = %{version}-%{release} + +%description -n liblaunchpad-devel +Launchpad library (devel) + %prep %setup -q @@ -111,7 +126,6 @@ ln -sf ../launchpad-process-pool.service %{buildroot}%{_unitdir_user}/basic.targ %{_unitdir_user}/sockets.target.wants/launchpad-process-pool.socket %{_unitdir_user}/basic.target.wants/launchpad-process-pool.service %{_bindir}/launchpad-process-pool -%attr(0644,root,root) %{_libdir}/liblaunchpad.so.* %files devel %{_includedir}/launchpad/*.h @@ -119,7 +133,18 @@ ln -sf ../launchpad-process-pool.service %{buildroot}%{_unitdir_user}/basic.targ %{_libdir}/pkgconfig/*.pc %files -n launchpad-loader -%manifest %{name}.manifest +%manifest launchpad-loader.manifest %license LICENSE %{_prefix}/share/aul/default.loader %{_bindir}/launchpad-loader + +%files -n liblaunchpad +%manifest liblaunchpad.manifest +%license LICENSE +%attr(0644,root,root) %{_libdir}/liblaunchpad.so.* + +%files -n liblaunchpad-devel +%{_includedir}/launchpad/*.h +%{_libdir}/*.so +%{_libdir}/pkgconfig/*.pc + -- 2.7.4 From 8834043ed27818254b2852a42ed6de50d45cca4c Mon Sep 17 00:00:00 2001 From: Hwankyu Jhun Date: Wed, 14 Nov 2018 12:05:41 +0900 Subject: [PATCH 15/16] Release version 0.5.19 Changes: - Separate launchpad libary from launchpad package Change-Id: I33c21653b2b643c9d6361a75849931b83c271079 Signed-off-by: Hwankyu Jhun --- packaging/launchpad.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/launchpad.spec b/packaging/launchpad.spec index 1f25fa9..3d40662 100644 --- a/packaging/launchpad.spec +++ b/packaging/launchpad.spec @@ -1,6 +1,6 @@ Name: launchpad Summary: Launchpad for launching applications -Version: 0.5.18 +Version: 0.5.19 Release: 1 Group: Application Framework/Daemons License: Apache-2.0 -- 2.7.4 From c2dae7111740504864d6c6e10b89a33b3b094126 Mon Sep 17 00:00:00 2001 From: Hwankyu Jhun Date: Wed, 14 Nov 2018 16:53:38 +0900 Subject: [PATCH 16/16] Remove duplicated pkgconfig file installation Change-Id: I23644821bc2cf44a0db5ffbeb75112c663492dbe Signed-off-by: Hwankyu Jhun --- CMakeLists.txt | 2 ++ packaging/launchpad.spec | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c77152..573fc00 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -151,6 +151,8 @@ INSTALL(TARGETS ${LAUNCHPAD_LIB} DESTINATION ${LIB_INSTALL_DIR} COMPONENT Runtim INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/inc/launchpad.h DESTINATION include/launchpad) CONFIGURE_FILE(launchpad.pc.in launchpad.pc @ONLY) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/launchpad.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) +CONFIGURE_FILE(launchpad.pc.in liblaunchpad.pc @ONLY) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/liblaunchpad.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) diff --git a/packaging/launchpad.spec b/packaging/launchpad.spec index 3d40662..1c43188 100644 --- a/packaging/launchpad.spec +++ b/packaging/launchpad.spec @@ -130,7 +130,7 @@ ln -sf ../launchpad-process-pool.service %{buildroot}%{_unitdir_user}/basic.targ %files devel %{_includedir}/launchpad/*.h %{_libdir}/*.so -%{_libdir}/pkgconfig/*.pc +%{_libdir}/pkgconfig/launchpad.pc %files -n launchpad-loader %manifest launchpad-loader.manifest @@ -146,5 +146,5 @@ ln -sf ../launchpad-process-pool.service %{buildroot}%{_unitdir_user}/basic.targ %files -n liblaunchpad-devel %{_includedir}/launchpad/*.h %{_libdir}/*.so -%{_libdir}/pkgconfig/*.pc +%{_libdir}/pkgconfig/liblaunchpad.pc -- 2.7.4