Skip to content

Commit

Permalink
webos: opkg: update patches to apply on v0.6.3 version
Browse files Browse the repository at this point in the history
:Release Notes:
Upgraded in:
https://git.openembedded.org/openembedded-core/commit/?h=scarthgap&id=cec2d4b32f7f1b24ecc358e2fc6e5fe6003274e5

:Detailed Notes:
Fixes:
http://gecko.lge.com:8000/Errors/Details/779292

NOTE: Applying patch '0003-Add-symlink-path-validity.patch' (meta-lg-webos/meta-webos/recipes-devtools/opkg/opkg/0003-Add-symlink-path-validity.patch)
NOTE: --- Patch fuzz start ---
Applying patch 0003-Add-symlink-path-validity.patch
patching file libopkg/opkg_archive.c
Hunk #1 succeeded at 922 with fuzz 2 (offset 10 lines).
patching file libopkg/opkg_conf.c
patching file libopkg/opkg_conf.h
Hunk #1 succeeded at 108 (offset 1 line).
patching file src/opkg.c
Hunk #1 succeeded at 61 (offset 1 line).
Hunk #2 succeeded at 109 (offset 1 line).
Hunk webosose#3 succeeded at 259 (offset 1 line).

Now at patch 0003-Add-symlink-path-validity.patch

:Testing Performed:
Only build tested.

:QA Notes:
No change to image.

:Issues Addressed:
[WRP-29491] Create GPVB with Yocto 5.0 Scarthgap

Change-Id: I1d70f1d7ff0a8c568c01941d5bcaf55f9bb55cb1
  • Loading branch information
shr-project committed Feb 24, 2024
1 parent 09c4e55 commit ed40635
Showing 1 changed file with 8 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ Upstream-Status: Pending
4 files changed, 10 insertions(+)

diff --git a/libopkg/opkg_archive.c b/libopkg/opkg_archive.c
index 03a4afb..7f71168 100644
index 8dd902d..d50f3f0 100644
--- a/libopkg/opkg_archive.c
+++ b/libopkg/opkg_archive.c
@@ -912,6 +912,9 @@ struct opkg_ar *ar_open_pkg_data_archive(const char *filename)
ar->extract_flags = ARCHIVE_EXTRACT_OWNER | ARCHIVE_EXTRACT_PERM |
ARCHIVE_EXTRACT_TIME | ARCHIVE_EXTRACT_UNLINK | ARCHIVE_EXTRACT_NO_OVERWRITE;
@@ -920,6 +920,9 @@ struct opkg_ar *ar_open_pkg_data_archive(const char *filename)
ar->extract_flags |= ARCHIVE_EXTRACT_FFLAGS | ARCHIVE_EXTRACT_XATTR;
#endif

+ if (opkg_config->no_install_insecure_symlink)
+ ar->extract_flags |= ARCHIVE_EXTRACT_SECURE_SYMLINKS;
Expand Down Expand Up @@ -51,26 +51,26 @@ index d13d50b..e5c8ae0 100644
char *offline_root;
char *overlay_root;
diff --git a/src/opkg.c b/src/opkg.c
index 544c58a..4e0dddc 100644
index 0c729ff..1f99e0c 100644
--- a/src/opkg.c
+++ b/src/opkg.c
@@ -60,6 +60,7 @@ enum {
@@ -61,6 +61,7 @@ enum {
ARGS_OPT_AUTOREMOVE,
ARGS_OPT_VOLATILE_CACHE,
ARGS_OPT_COMBINE,
+ ARGS_OPT_NO_INSTALL_INSECURE_SYMLINK,
ARGS_OPT_NO_INSTALL_RECOMMENDS,
ARGS_OPT_CACHE_DIR,
ARGS_OPT_HOST_CACHE_DIR,
@@ -107,6 +108,7 @@ static struct option long_options[] = {
@@ -108,6 +109,7 @@ static struct option long_options[] = {
{"noaction", 0, 0, ARGS_OPT_NOACTION},
{"download-only", 0, 0, ARGS_OPT_DOWNLOAD_ONLY},
{"nodeps", 0, 0, ARGS_OPT_NODEPS},
+ {"no-install-insecure-symlink", 0, 0, ARGS_OPT_NO_INSTALL_INSECURE_SYMLINK},
{"no-install-recommends", 0, 0, ARGS_OPT_NO_INSTALL_RECOMMENDS},
{"offline-root", 1, 0, 'o'},
{"add-arch", 1, 0, ARGS_OPT_ADD_ARCH},
@@ -256,6 +258,9 @@ static int args_parse(int argc, char *argv[])
@@ -257,6 +259,9 @@ static int args_parse(int argc, char *argv[])
case ARGS_OPT_VOLATILE_CACHE:
opkg_config->volatile_cache = 1;
break;
Expand Down

0 comments on commit ed40635

Please sign in to comment.