diff --git a/package/system/apk/Makefile b/package/system/apk/Makefile index 6ed07384c2f..c57edb9a87e 100644 --- a/package/system/apk/Makefile +++ b/package/system/apk/Makefile @@ -1,13 +1,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=apk -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_SOURCE_URL=https://gitlab.alpinelinux.org/alpine/apk-tools.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2024-11-30 -PKG_SOURCE_VERSION:=8d93a79fb8958607f097be2c4ac97f4596faf91d -PKG_MIRROR_HASH:=565c87fac26e696c362c2fe85159cc3ed2fd27153f244c2e9dc0fd7fa67a4173 +PKG_SOURCE_DATE:=2025-02-08 +PKG_SOURCE_VERSION:=34771ccb7964b0e7cb5d1fc64bd1b83fe73296ba +PKG_MIRROR_HASH:=fddd0334fa2ce7cc7fedb2cc95ee800caf9cbe43d617c2e612e2f58fc30b14c2 PKG_VERSION=3.0.0_pre$(subst -,,$(PKG_SOURCE_DATE)) diff --git a/package/system/apk/patches/0001-openwrt-move-layer-db-to-temp-folder.patch b/package/system/apk/patches/0001-openwrt-move-layer-db-to-temp-folder.patch index aaf36310a03..eaeb36d10a2 100644 --- a/package/system/apk/patches/0001-openwrt-move-layer-db-to-temp-folder.patch +++ b/package/system/apk/patches/0001-openwrt-move-layer-db-to-temp-folder.patch @@ -10,7 +10,7 @@ Signed-off-by: Paul Spooren --- a/src/database.c +++ b/src/database.c -@@ -1624,7 +1624,7 @@ const char *apk_db_layer_name(int layer) +@@ -1832,7 +1832,7 @@ const char *apk_db_layer_name(int layer) { switch (layer) { case APK_DB_LAYER_ROOT: return "lib/apk/db"; diff --git a/package/system/apk/patches/0002-meson-add-tests-option.patch b/package/system/apk/patches/0002-meson-add-tests-option.patch deleted file mode 100644 index 075d3a9897f..00000000000 --- a/package/system/apk/patches/0002-meson-add-tests-option.patch +++ /dev/null @@ -1,52 +0,0 @@ -From a6180e4cfa1a98d361ffdce9e48857504997fbe9 Mon Sep 17 00:00:00 2001 -From: Rosen Penev -Date: Tue, 3 Dec 2024 18:12:58 -0800 -Subject: [PATCH] meson: add tests option - -Allows disabling tests when not desired. - -Signed-off-by: Rosen Penev ---- - meson_options.txt | 1 + - test/meson.build | 10 +++++++--- - test/unit/meson.build | 2 +- - 3 files changed, 9 insertions(+), 4 deletions(-) - ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -6,6 +6,7 @@ option('docs', description: 'Build manpa - option('help', description: 'Build help into apk binaries, needs lua', type: 'feature', value: 'auto') - option('lua', description: 'Build luaapk (lua bindings)', type: 'feature', value: 'auto') - option('lua_version', description: 'Lua version to build against', type: 'string', value: '5.3') -+option('tests', description: 'Build tests', type: 'feature', value: 'auto') - option('url_backend', description: 'URL backend', type: 'combo', choices: ['libfetch', 'wget'], value: 'libfetch') - option('uvol_db_target', description: 'Default target for uvol database layer', type: 'string') - option('zstd', description: 'Build with zstd support', type: 'boolean', value: true) ---- a/test/meson.build -+++ b/test/meson.build -@@ -1,10 +1,14 @@ -+enum_sh = find_program('enum.sh', required: get_option('tests')) -+solver_sh = find_program('solver.sh', required: get_option('tests')) -+ -+if not enum_sh.found() or not solver_sh.found() -+ subdir_done() -+endif -+ - cur_dir = meson.current_source_dir() - env = environment() - env.set('APK', apk_exe.full_path()) - --enum_sh = files('enum.sh') --solver_sh = files('solver.sh') -- - subdir('unit') - - foreach t : run_command(enum_sh, 'shell', check: true).stdout().strip().split(' ') ---- a/test/unit/meson.build -+++ b/test/unit/meson.build -@@ -1,4 +1,4 @@ --cmocka_dep = dependency('cmocka', required: false) -+cmocka_dep = dependency('cmocka', required: get_option('tests')) - - if cmocka_dep.found() - diff --git a/package/system/apk/patches/0010-app_list-add-full-print.patch b/package/system/apk/patches/0010-app_list-add-full-print.patch index d0b2b7243d6..dd334303109 100644 --- a/package/system/apk/patches/0010-app_list-add-full-print.patch +++ b/package/system/apk/patches/0010-app_list-add-full-print.patch @@ -20,7 +20,7 @@ Signed-off-by: Christian Marangi struct apk_string_array *filters; }; -@@ -118,6 +119,40 @@ static void print_manifest(const struct +@@ -105,6 +106,40 @@ static void print_manifest(const struct printf("%s " BLOB_FMT "\n", pkg->name->name, BLOB_PRINTF(*pkg->version)); } @@ -60,11 +60,11 @@ Signed-off-by: Christian Marangi + static void filter_package(const struct apk_database *db, const struct apk_package *pkg, const struct list_ctx *ctx, const struct apk_name *name) { - if (ctx->match_origin && !origin_matches(ctx, pkg)) -@@ -138,7 +173,9 @@ static void filter_package(const struct - if (ctx->match_providers) - printf("<%s> ", name->name); + if (ctx->match_origin && !origin_matches(ctx, pkg)) return; +@@ -114,7 +149,9 @@ static void filter_package(const struct + if (ctx->upgradable && !is_upgradable(db, pkg)) return; + if (ctx->match_providers) printf("<%s> ", name->name); - if (ctx->manifest) + if (ctx->full) + print_full(pkg, ctx); @@ -72,7 +72,7 @@ Signed-off-by: Christian Marangi print_manifest(pkg, ctx); else print_package(db, pkg, ctx); -@@ -178,6 +215,7 @@ static int print_result(struct apk_datab +@@ -154,6 +191,7 @@ static int print_result(struct apk_datab OPT(OPT_LIST_depends, APK_OPT_SH("d") "depends") \ OPT(OPT_LIST_installed, APK_OPT_SH("I") "installed") \ OPT(OPT_LIST_manifest, "manifest") \ @@ -80,12 +80,13 @@ Signed-off-by: Christian Marangi OPT(OPT_LIST_origin, APK_OPT_SH("o") "origin") \ OPT(OPT_LIST_orphaned, APK_OPT_SH("O") "orphaned") \ OPT(OPT_LIST_providers, APK_OPT_SH("P") "providers") \ -@@ -191,6 +229,8 @@ static int option_parse_applet(void *pct +@@ -167,6 +205,9 @@ static int list_parse_option(void *pctx, struct list_ctx *ctx = pctx; switch (opt) { + case OPT_LIST_full: + ctx->full = 1; ++ break; case OPT_LIST_available: ctx->available = 1; ctx->orphaned = 0;