From 23b945bb43eaca81c9606e73aa0581e9c8698f1a Mon Sep 17 00:00:00 2001 From: Sangyoon Jang Date: Thu, 17 Jan 2019 19:30:48 +0900 Subject: [PATCH 01/16] Fix to avoiding sql injection Change-Id: I8810ab87632294431fa7c162b380700682ec8838 Signed-off-by: Sangyoon Jang --- CMakeLists.txt | 2 +- packaging/pkgmgr-tool.spec | 2 +- src/pkg_upgrade.c | 20 +++++++++++--------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dc9b6fc..ac4eb77 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,7 +22,7 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/client/include) INCLUDE(FindPkgConfig) pkg_check_modules(pkgs_test REQUIRED dlog glib-2.0 bundle pkgmgr pkgmgr-parser pkgmgr-info pkgmgr-installer iniparser -libtzplatform-config aul storage) +libtzplatform-config aul storage sqlite3) FOREACH(flag ${pkgs_test_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") ENDFOREACH(flag) diff --git a/packaging/pkgmgr-tool.spec b/packaging/pkgmgr-tool.spec index 03ddf53..3949836 100644 --- a/packaging/pkgmgr-tool.spec +++ b/packaging/pkgmgr-tool.spec @@ -24,10 +24,10 @@ BuildRequires: pkgconfig(pkgmgr) BuildRequires: pkgconfig(pkgmgr-installer) BuildRequires: pkgconfig(aul) BuildRequires: pkgconfig(storage) +BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgmgr-info-parser-devel BuildRequires: pkgmgr-info-parser BuildRequires: fdupes -Requires: sqlite3 Requires(posttrans): /usr/bin/pkg_initdb %description diff --git a/src/pkg_upgrade.c b/src/pkg_upgrade.c index 1a8be29..566231b 100644 --- a/src/pkg_upgrade.c +++ b/src/pkg_upgrade.c @@ -32,6 +32,7 @@ #include #include #include +#include #include #include @@ -427,7 +428,7 @@ static void __send_args_to_backend(const char *pkgid, const char *pkgtype, struct timeval tv; gettimeofday(&tv, NULL); starttime = tv.tv_sec * 1000l + tv.tv_usec / 1000l; - char buf[BUF_SIZE]; + char *query; char backend_cmd[BUF_SIZE]; const char *new_pkgtype; const char tpk_pkgtype[] = "tpk"; @@ -467,31 +468,31 @@ static void __send_args_to_backend(const char *pkgid, const char *pkgtype, ret = __xsystem(uninstall_ro); break; case PKG_NEED_UPDATE_TO_RW: - snprintf(buf, sizeof(buf), + query = sqlite3_mprintf( "UPDATE package_info SET " \ "package_preload='false', " \ "package_system='false' "\ - "WHERE package='%s'", pkgid); + "WHERE package=%Q", pkgid); db_cmd[1] = strdup(DBPATH); - db_cmd[2] = strdup(buf); + db_cmd[2] = query; ret = __xsystem(db_cmd); FREE_AND_NULL(db_cmd[1]); - FREE_AND_NULL(db_cmd[2]); + sqlite3_free(query); break; case PKG_NEED_RWUNINSTALL: case PKG_NEED_UPDATE_TO_RO: ret = __xsystem(uninstall_ro_update); break; case PKG_NEED_RO_DBREMOVE: - snprintf(buf, sizeof(buf), + query = sqlite3_mprintf( "PRAGMA foreign_keys=on; " \ "DELETE FROM package_info " \ - "WHERE package='%s'", pkgid); + "WHERE package=%Q", pkgid); db_cmd[1] = strdup(DBPATH); - db_cmd[2] = strdup(buf); + db_cmd[2] = query; ret = __xsystem(db_cmd); FREE_AND_NULL(db_cmd[1]); - FREE_AND_NULL(db_cmd[2]); + sqlite3_free(query); break; case PKG_NEED_PRELOADRW_INSTALL: ret = __xsystem(preload_rw); @@ -1098,6 +1099,7 @@ static int __process_rw_fota() pkgtype = __getvalue(buf, TOKEN_TYPE_STR, 1); __install_preload_rw(pkgid, pkgtype); + free(pkgtype); if (handle) pkgmgrinfo_pkginfo_destroy_pkginfo(handle); -- 2.7.4 From 1da84c4c6fae848e7bba2208efba0b015e7c31a2 Mon Sep 17 00:00:00 2001 From: Sangyoon Jang Date: Fri, 1 Feb 2019 16:24:37 +0900 Subject: [PATCH 02/16] Fix upgrade_to_30002.sh script Add setting db version as 30002. Change-Id: Ibb7b8f05a65d18bc8613d6d7e4c29412432603fb Signed-off-by: Sangyoon Jang --- data/updates/upgrade_to_30002.sh.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/data/updates/upgrade_to_30002.sh.in b/data/updates/upgrade_to_30002.sh.in index 9576898..6e19fb6 100644 --- a/data/updates/upgrade_to_30002.sh.in +++ b/data/updates/upgrade_to_30002.sh.in @@ -10,6 +10,8 @@ function migrate_parser_db() { local dbpath=$1 echo -e "ALTER TABLE package_app_app_control ADD visibility TEXT NOT NULL DEFAULT 'local-only'" | sqlite3 $dbpath + + echo "PRAGMA user_version=30002;" | sqlite3 $dbpath } function migrate_user_db() { -- 2.7.4 From ac82262e66696de904c208cbca0622d7cce0eecf Mon Sep 17 00:00:00 2001 From: ilho Date: Fri, 15 Feb 2019 17:38:48 +0900 Subject: [PATCH 03/16] Release version 0.4.17 Changes: - Fix upgrade_to_30002.sh script - Fix to avoiding sql injection - Fix upgrade script - Refactor __process_request function of pkg_cmd.c - Refactor pkg_upgrade - Fix upgrade script Change-Id: I22012512765f255510a6adf19ed2a9bb762fef3f Signed-off-by: ilho --- packaging/pkgmgr-tool.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/pkgmgr-tool.spec b/packaging/pkgmgr-tool.spec index 3949836..619ce8d 100644 --- a/packaging/pkgmgr-tool.spec +++ b/packaging/pkgmgr-tool.spec @@ -1,6 +1,6 @@ Name: pkgmgr-tool Summary: Packager Manager Tool package -Version: 0.4.16 +Version: 0.4.17 Release: 1 Group: Application Framework/Package Management License: Apache-2.0 -- 2.7.4 From 066773d6ae4f3b1e77fb09dcb58a9f9a11980a59 Mon Sep 17 00:00:00 2001 From: Sangyoon Jang Date: Tue, 12 Feb 2019 16:49:41 +0900 Subject: [PATCH 04/16] Add missing upgrade script for version 30003 Add app_control_id column for package_app_app_control table. Change-Id: I3eefa5b4520d31976a94ecedec8d99744c3fdb09 Signed-off-by: Sangyoon Jang --- CMakeLists.txt | 2 ++ data/updates/upgrade_to_30003.sh.in | 27 +++++++++++++++++++++++++++ packaging/pkgmgr-tool.spec | 1 + 3 files changed, 30 insertions(+) create mode 100644 data/updates/upgrade_to_30003.sh.in diff --git a/CMakeLists.txt b/CMakeLists.txt index ac4eb77..d54965e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,3 +88,5 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/data/updates/upgrade_to_30001.sh.in u INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/upgrade_to_30001.sh DESTINATION /etc/package-manager/updates/) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/data/updates/upgrade_to_30002.sh.in upgrade_to_30002.sh $ONLY) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/upgrade_to_30002.sh DESTINATION /etc/package-manager/updates/) +CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/data/updates/upgrade_to_30003.sh.in upgrade_to_30003.sh $ONLY) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/upgrade_to_30003.sh DESTINATION /etc/package-manager/updates/) diff --git a/data/updates/upgrade_to_30003.sh.in b/data/updates/upgrade_to_30003.sh.in new file mode 100644 index 0000000..773ab43 --- /dev/null +++ b/data/updates/upgrade_to_30003.sh.in @@ -0,0 +1,27 @@ +#!/bin/sh +PATH=/bin:/usr/bin:/sbin:/usr/sbin + +source /etc/tizen-platform.conf + +PARSER_DB_NAME=.pkgmgr_parser.db +PARSER_DB_PATH=$TZ_SYS_DB/$PARSER_DB_NAME + +function migrate_parser_db() { + local dbpath=$1 + + echo -e "ALTER TABLE package_app_app_control ADD app_control_id TEXT NOT NULL DEFAULT 'no-name-app-control'" | sqlite3 $dbpath + + echo "PRAGMA user_version=30003;" | sqlite3 $dbpath +} + +function migrate_user_db() { + #get each user db path and call migrate_parser_db for each of it + + find $TZ_SYS_DB/user -name $PARSER_DB_NAME | while read DBPATH + do + migrate_parser_db $DBPATH + done +} + +migrate_parser_db $PARSER_DB_PATH +migrate_user_db diff --git a/packaging/pkgmgr-tool.spec b/packaging/pkgmgr-tool.spec index 619ce8d..ca78341 100644 --- a/packaging/pkgmgr-tool.spec +++ b/packaging/pkgmgr-tool.spec @@ -74,6 +74,7 @@ update-mime-database %{_datadir}/mime %attr(0700,root,root) /etc/package-manager/updates/upgrade_to_30000.sh %attr(0700,root,root) /etc/package-manager/updates/upgrade_to_30001.sh %attr(0700,root,root) /etc/package-manager/updates/upgrade_to_30002.sh +%attr(0700,root,root) /etc/package-manager/updates/upgrade_to_30003.sh %attr(0700,root,root) /usr/share/upgrade/scripts/701.app2sd.patch.sh %attr(0700,root,root) %{_sysconfdir}/opt/upgrade/pkgmgr.patch.sh %attr(0700,root,root) /usr/share/fixed_multiuser/scripts/pkgmgr-clear-skel.sh -- 2.7.4 From fddf5c776f25eeacf0cd0a34ebcba3d37f76f77d Mon Sep 17 00:00:00 2001 From: Sangyoon Jang Date: Wed, 16 Jan 2019 18:39:40 +0900 Subject: [PATCH 05/16] Add package dependency attribute to upgrade script Change-Id: Ic85f83896f6de645b572f884407f77e3099ecc04 Signed-off-by: Sangyoon Jang --- CMakeLists.txt | 2 ++ data/updates/upgrade_to_30004.sh.in | 34 ++++++++++++++++++++++++++++++++++ packaging/pkgmgr-tool.spec | 1 + 3 files changed, 37 insertions(+) create mode 100644 data/updates/upgrade_to_30004.sh.in diff --git a/CMakeLists.txt b/CMakeLists.txt index d54965e..f688adc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -90,3 +90,5 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/data/updates/upgrade_to_30002.sh.in u INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/upgrade_to_30002.sh DESTINATION /etc/package-manager/updates/) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/data/updates/upgrade_to_30003.sh.in upgrade_to_30003.sh $ONLY) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/upgrade_to_30003.sh DESTINATION /etc/package-manager/updates/) +CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/data/updates/upgrade_to_30004.sh.in upgrade_to_30004.sh $ONLY) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/upgrade_to_30004.sh DESTINATION /etc/package-manager/updates/) diff --git a/data/updates/upgrade_to_30004.sh.in b/data/updates/upgrade_to_30004.sh.in new file mode 100644 index 0000000..23509a3 --- /dev/null +++ b/data/updates/upgrade_to_30004.sh.in @@ -0,0 +1,34 @@ +#!/bin/sh +PATH=/bin:/usr/bin:/sbin:/usr/sbin + +source /etc/tizen-platform.conf + +PARSER_DB_NAME=.pkgmgr_parser.db +PARSER_DB_PATH=$TZ_SYS_DB/$PARSER_DB_NAME + +function migrate_parser_db() { + local dbpath=$1 + + echo -e "CREATE TABLE IF NOT EXISTS package_dependency_info (\n" \ + " package TEXT NOT NULL,\n" \ + " depends_on TEXT NOT NULL,\n" \ + " type TEXT NOT NULL,\n" \ + " required_version TEXT,\n" \ + " PRIMARY KEY(package, depends_on, type, required_version)\n" \ + " FOREIGN KEY(package)\n" \ + " REFERENCES package_info(package) ON DELETE CASCADE);" | sqlite3 $dbpath + + echo "PRAGMA user_version=30004;" | sqlite3 $dbpath +} + +function migrate_user_db() { + #get each user db path and call migrate_parser_db for each of it + + find $TZ_SYS_DB/user -name $PARSER_DB_NAME | while read DBPATH + do + migrate_parser_db $DBPATH + done +} + +migrate_parser_db $PARSER_DB_PATH +migrate_user_db diff --git a/packaging/pkgmgr-tool.spec b/packaging/pkgmgr-tool.spec index ca78341..c2cc48d 100644 --- a/packaging/pkgmgr-tool.spec +++ b/packaging/pkgmgr-tool.spec @@ -75,6 +75,7 @@ update-mime-database %{_datadir}/mime %attr(0700,root,root) /etc/package-manager/updates/upgrade_to_30001.sh %attr(0700,root,root) /etc/package-manager/updates/upgrade_to_30002.sh %attr(0700,root,root) /etc/package-manager/updates/upgrade_to_30003.sh +%attr(0700,root,root) /etc/package-manager/updates/upgrade_to_30004.sh %attr(0700,root,root) /usr/share/upgrade/scripts/701.app2sd.patch.sh %attr(0700,root,root) %{_sysconfdir}/opt/upgrade/pkgmgr.patch.sh %attr(0700,root,root) /usr/share/fixed_multiuser/scripts/pkgmgr-clear-skel.sh -- 2.7.4 From d548af7bc59450f6348fff8697e3ee4321292044 Mon Sep 17 00:00:00 2001 From: Junghyun Yeon Date: Wed, 20 Feb 2019 17:24:42 +0900 Subject: [PATCH 06/16] Add codes to handle ReadonlyUpdateInstalled pkg - When readonlyupdateinstalled pkg version is higher than FOTA-updated pkg, pkg version should be preserved. Change-Id: I48e5718dca83db7e2777f51c6750f4d44478a37a Signed-off-by: Junghyun Yeon --- src/pkg_upgrade.c | 6 ++++++ src/pkg_upgrade.h | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/pkg_upgrade.c b/src/pkg_upgrade.c index 566231b..e5d0782 100644 --- a/src/pkg_upgrade.c +++ b/src/pkg_upgrade.c @@ -377,6 +377,12 @@ static int __compare_pkgid(char *file_path, char *fota_pkgid, FREE_AND_NULL(version); FREE_AND_NULL(update); break; + } else if (compare == PMINFO_VERSION_OLD) { + ret = PKG_IS_OLD; + FREE_AND_NULL(pkgid); + FREE_AND_NULL(version); + FREE_AND_NULL(update); + break; } FREE_AND_NULL(pkgid); diff --git a/src/pkg_upgrade.h b/src/pkg_upgrade.h index 4f5a93f..de1e8de 100644 --- a/src/pkg_upgrade.h +++ b/src/pkg_upgrade.h @@ -92,7 +92,8 @@ typedef enum { PKG_IS_NOT_EXIST = 0, PKG_IS_SAME, PKG_IS_UPDATED, - PKG_IS_INSERTED + PKG_IS_INSERTED, + PKG_IS_OLD } COMPARE_RESULT; typedef enum { -- 2.7.4 From 9aaf14ed79f210b915af3cabd1f76165031dea79 Mon Sep 17 00:00:00 2001 From: Junghyun Yeon Date: Mon, 18 Feb 2019 14:48:12 +0900 Subject: [PATCH 07/16] Add db schema to version 30004 Change-Id: I9ffe4bf630341f21c1fb319450096a4515789ea1 Signed-off-by: Junghyun Yeon --- data/updates/upgrade_to_30004.sh.in | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/data/updates/upgrade_to_30004.sh.in b/data/updates/upgrade_to_30004.sh.in index 23509a3..ec3ea57 100644 --- a/data/updates/upgrade_to_30004.sh.in +++ b/data/updates/upgrade_to_30004.sh.in @@ -18,6 +18,12 @@ function migrate_parser_db() { " FOREIGN KEY(package)\n" \ " REFERENCES package_info(package) ON DELETE CASCADE);" | sqlite3 $dbpath + echo -e "CREATE TABLE IF NOT EXISTS package_plugin_info (\n" \ + " pkgid TEXT NOT NULL,\n" \ + " appid TEXT,\n" \ + " plugin_type TEXT NOT NULL,\n", + " plugin_name TEXT NOT NULL)" | sqlite3 $dbpath + echo "PRAGMA user_version=30004;" | sqlite3 $dbpath } -- 2.7.4 From a00170218e764f6cd512c9dfa7740e42e044b4e5 Mon Sep 17 00:00:00 2001 From: Junghyun Yeon Date: Tue, 12 Mar 2019 15:58:25 +0900 Subject: [PATCH 08/16] Fix db migration script Change-Id: I44b9153494d58bd7f2fe59c7b9fdafc51463373b Signed-off-by: Junghyun Yeon --- data/updates/upgrade_to_30004.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/updates/upgrade_to_30004.sh.in b/data/updates/upgrade_to_30004.sh.in index ec3ea57..d1214e2 100644 --- a/data/updates/upgrade_to_30004.sh.in +++ b/data/updates/upgrade_to_30004.sh.in @@ -21,8 +21,8 @@ function migrate_parser_db() { echo -e "CREATE TABLE IF NOT EXISTS package_plugin_info (\n" \ " pkgid TEXT NOT NULL,\n" \ " appid TEXT,\n" \ - " plugin_type TEXT NOT NULL,\n", - " plugin_name TEXT NOT NULL)" | sqlite3 $dbpath + " plugin_type TEXT NOT NULL,\n" \ + " plugin_name TEXT NOT NULL);" | sqlite3 $dbpath echo "PRAGMA user_version=30004;" | sqlite3 $dbpath } -- 2.7.4 From ea47286cd235c93eb326c709efb4ff6247de9968 Mon Sep 17 00:00:00 2001 From: Hwankyu Jhun Date: Tue, 12 Mar 2019 14:21:39 +0900 Subject: [PATCH 09/16] Add db schema to version 30004 Added: - package_app_component_info table Change-Id: I863b8a0ace0ba93969b8475049c4561e1f1c1c2c Signed-off-by: Hwankyu Jhun --- data/updates/upgrade_to_30004.sh.in | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/data/updates/upgrade_to_30004.sh.in b/data/updates/upgrade_to_30004.sh.in index d1214e2..a66c406 100644 --- a/data/updates/upgrade_to_30004.sh.in +++ b/data/updates/upgrade_to_30004.sh.in @@ -24,6 +24,15 @@ function migrate_parser_db() { " plugin_type TEXT NOT NULL,\n" \ " plugin_name TEXT NOT NULL);" | sqlite3 $dbpath + echo -e "CREATE TABLE IF NOT EXISTS package_app_component_info (\n" \ + " app_id TEXT NOT NULL,\n" \ + " component_id TEXT NOT NULL,\n" \ + " type TEXT NOT NULL,\n" \ + " launch_mode TEXT NOT NULL,\n" \ + " PRIMARY KEY(app_id, component_id)\n" \ + " FOREIGN KEY(app_id)\n" \ + " REFERENCES package_app_info(app_id) ON DELETE CASCADE);" | sqlite3 $dbpath + echo "PRAGMA user_version=30004;" | sqlite3 $dbpath } -- 2.7.4 From 954c585fcee4c199772ddfded5e4f9a4b576f632 Mon Sep 17 00:00:00 2001 From: Hwankyu Jhun Date: Fri, 15 Mar 2019 12:05:43 +0900 Subject: [PATCH 10/16] Release version 0.5.0 Changes: - Add missing upgrade script for version 30003 - Add package dependency attribute to upgrade script - Add codes to handle ReadonlyUpdateInstalled pkg - Add db schema to version 30004 - Fix db migration script - Add db schema to version 30004 Change-Id: I60b2ea1a7aaa3fcca6f11193d040bc42ce846f62 Signed-off-by: Hwankyu Jhun --- packaging/pkgmgr-tool.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/pkgmgr-tool.spec b/packaging/pkgmgr-tool.spec index c2cc48d..f675f7b 100644 --- a/packaging/pkgmgr-tool.spec +++ b/packaging/pkgmgr-tool.spec @@ -1,6 +1,6 @@ Name: pkgmgr-tool Summary: Packager Manager Tool package -Version: 0.4.17 +Version: 0.5.0 Release: 1 Group: Application Framework/Package Management License: Apache-2.0 -- 2.7.4 From 4ea6decbbb758db9b079305495624d52ec96cf05 Mon Sep 17 00:00:00 2001 From: Junghyun Yeon Date: Tue, 26 Mar 2019 20:19:18 +0900 Subject: [PATCH 11/16] Change log for install_preload_pkg Current logs don't specify which directory is not exists. Change-Id: I256c9deb696d7685efcffd45330659132eb0d0d0 Signed-off-by: Junghyun Yeon --- src/install_preload_pkg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/install_preload_pkg.c b/src/install_preload_pkg.c index 60662e5..51752ff 100644 --- a/src/install_preload_pkg.c +++ b/src/install_preload_pkg.c @@ -66,7 +66,7 @@ static int _install_preload_pkg(const char *backend, const char *directory, dir = opendir(directory); if (!dir) { if (errno == ENOENT) { - _D("The directory for preloaded pkgs doesn't exist"); + _D("Directory[%s] doesn't exist", directory); return 0; } else { _E("Failed to access [%s]: [%s]", directory, -- 2.7.4 From 04320cea431a195814c6bfe88ac76011283c78c1 Mon Sep 17 00:00:00 2001 From: Junghyun Yeon Date: Thu, 28 Mar 2019 19:40:19 +0900 Subject: [PATCH 12/16] Replace exec into /bin/sh in upgrade script - exec replaces shell itself so sciprts will terminate when command terminates executed by exec. Change-Id: Ic6e650237bad77a835afa0bb240b9229ae7d842c Signed-off-by: Junghyun Yeon --- data/updates/update.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/updates/update.sh.in b/data/updates/update.sh.in index 81cd697..7b91abf 100644 --- a/data/updates/update.sh.in +++ b/data/updates/update.sh.in @@ -22,7 +22,7 @@ echo "Pkgmgr database current version: $DB_VERSION_OLD, target version: $DB_VERS #if old version is less than 1, upgrade to 30000, default version of tizen_3.0 if [ $DB_VERSION_OLD -le $DB_VERSION_TIZEN24 ]; then echo "Updating $PARSER_DB_PATH to $DB_VERSION_TIZEN30_DEFAULT" - exec "$UPDATE_SCRIPT_LOCATION/$UPDATE_SCRIPT_PREFIX$DB_VERSION_TIZEN30_DEFAULT.sh" + /bin/sh "$UPDATE_SCRIPT_LOCATION/$UPDATE_SCRIPT_PREFIX$DB_VERSION_TIZEN30_DEFAULT.sh" DB_VERSION_OLD=30000 fi @@ -31,5 +31,5 @@ do echo "Updating $PARSER_DB_PATH to $i (target version is $DB_VERSION_NEW)" UPDATE_SCRIPT="$UPDATE_SCRIPT_LOCATION/$UPDATE_SCRIPT_PREFIX$i.sh" [ ! -e "$UPDATE_SCRIPT" ] && echo "Can't find script $UPDATE_SCRIPT" && exit 1 - exec $UPDATE_SCRIPT + /bin/sh $UPDATE_SCRIPT done -- 2.7.4 From f808d16b78b3cdfc581c1914b4de730b700c60d7 Mon Sep 17 00:00:00 2001 From: Hwankyu Jhun Date: Wed, 10 Apr 2019 15:29:09 +0900 Subject: [PATCH 13/16] Adjust 30004 upgrade script The component info table is removed. Change-Id: I82a411df1cdd09864034a9676f1f4bc30feae870 Signed-off-by: Hwankyu Jhun --- data/updates/upgrade_to_30004.sh.in | 9 --------- 1 file changed, 9 deletions(-) diff --git a/data/updates/upgrade_to_30004.sh.in b/data/updates/upgrade_to_30004.sh.in index a66c406..d1214e2 100644 --- a/data/updates/upgrade_to_30004.sh.in +++ b/data/updates/upgrade_to_30004.sh.in @@ -24,15 +24,6 @@ function migrate_parser_db() { " plugin_type TEXT NOT NULL,\n" \ " plugin_name TEXT NOT NULL);" | sqlite3 $dbpath - echo -e "CREATE TABLE IF NOT EXISTS package_app_component_info (\n" \ - " app_id TEXT NOT NULL,\n" \ - " component_id TEXT NOT NULL,\n" \ - " type TEXT NOT NULL,\n" \ - " launch_mode TEXT NOT NULL,\n" \ - " PRIMARY KEY(app_id, component_id)\n" \ - " FOREIGN KEY(app_id)\n" \ - " REFERENCES package_app_info(app_id) ON DELETE CASCADE);" | sqlite3 $dbpath - echo "PRAGMA user_version=30004;" | sqlite3 $dbpath } -- 2.7.4 From 4bd02343954f497298b3b4dbce9d9a87650dd97e Mon Sep 17 00:00:00 2001 From: Junghyun Yeon Date: Tue, 16 Apr 2019 17:56:55 +0900 Subject: [PATCH 14/16] Release version 0.5.1 Changes: - Change log for install_preload_pkg - Replace exec into /bin/sh in upgrade script - Adjust 30004 upgrade script Change-Id: I3205a272f7f81de7a5298ff6be1e7dbe0e9c544e Signed-off-by: Junghyun Yeon --- packaging/pkgmgr-tool.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/pkgmgr-tool.spec b/packaging/pkgmgr-tool.spec index f675f7b..124b171 100644 --- a/packaging/pkgmgr-tool.spec +++ b/packaging/pkgmgr-tool.spec @@ -1,6 +1,6 @@ Name: pkgmgr-tool Summary: Packager Manager Tool package -Version: 0.5.0 +Version: 0.5.1 Release: 1 Group: Application Framework/Package Management License: Apache-2.0 -- 2.7.4 From ef9a2de519583b2056fe875fca7997f822a211af Mon Sep 17 00:00:00 2001 From: Ilho Kim Date: Thu, 18 Apr 2019 17:19:24 +0900 Subject: [PATCH 15/16] Add redefining PATH env Add in this files - pkgmgr.patch.sh.in - update.sh.in Change-Id: Ibce3a0e9f34d8c9558ee2a24ee7ac01220be8a41 Signed-off-by: Ilho Kim --- data/700.pkgmgr.patch.sh.in | 1 + data/updates/update.sh.in | 1 + 2 files changed, 2 insertions(+) diff --git a/data/700.pkgmgr.patch.sh.in b/data/700.pkgmgr.patch.sh.in index 0db3edb..ee0ee9f 100644 --- a/data/700.pkgmgr.patch.sh.in +++ b/data/700.pkgmgr.patch.sh.in @@ -1,4 +1,5 @@ #!/bin/sh +PATH="/usr/bin:/bin:/usr/sbin:/sbin" source /etc/tizen-platform.conf diff --git a/data/updates/update.sh.in b/data/updates/update.sh.in index 7b91abf..91849b7 100644 --- a/data/updates/update.sh.in +++ b/data/updates/update.sh.in @@ -1,4 +1,5 @@ #!/bin/sh +PATH="/usr/bin:/bin:/usr/sbin:/sbin" source /etc/tizen-platform.conf -- 2.7.4 From 8f228081936c599efd0234211c6e461e12584fcb Mon Sep 17 00:00:00 2001 From: Junghoon Park Date: Fri, 19 Apr 2019 11:29:00 +0900 Subject: [PATCH 16/16] Release version 0.5.2 Changes: - Add redefining PATH env Change-Id: I96fc67634510fb2602a9ccc077cacf2825ee3511 Signed-off-by: Junghoon Park --- packaging/pkgmgr-tool.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/pkgmgr-tool.spec b/packaging/pkgmgr-tool.spec index 124b171..f51bfc1 100644 --- a/packaging/pkgmgr-tool.spec +++ b/packaging/pkgmgr-tool.spec @@ -1,6 +1,6 @@ Name: pkgmgr-tool Summary: Packager Manager Tool package -Version: 0.5.1 +Version: 0.5.2 Release: 1 Group: Application Framework/Package Management License: Apache-2.0 -- 2.7.4