diff --git a/utils/apk/Makefile b/utils/apk/Makefile index 0a4e5a525a..56e473c5b5 100644 --- a/utils/apk/Makefile +++ b/utils/apk/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=apk -PKG_VERSION:=2.12.11 +PKG_VERSION:=2.14.0 PKG_RELEASE:=1 PKG_SOURCE:=apk-tools-v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://gitlab.alpinelinux.org/alpine/apk-tools/-/archive/v$(PKG_VERSION) -PKG_HASH:=2cc2cd8dd515a729609066f08edc7317b5bca33a335ca4f6a56367aa018856c5 +PKG_HASH:=4c6db13039280814a10a3b3d89b29837b59769c69214a1861997e088eac107a5 PKG_BUILD_DIR:=$(BUILD_DIR)/apk-tools-v$(PKG_VERSION) PKG_MAINTAINER:=Paul Spooren diff --git a/utils/apk/patches/010-openssl-deprecated.patch b/utils/apk/patches/010-openssl-deprecated.patch index d6ee852d02..bdfafb6712 100644 --- a/utils/apk/patches/010-openssl-deprecated.patch +++ b/utils/apk/patches/010-openssl-deprecated.patch @@ -16,7 +16,7 @@ Signed-off-by: Rosen Penev --- a/libfetch/common.c +++ b/libfetch/common.c -@@ -531,15 +531,11 @@ static int fetch_ssl_setup_client_certif +@@ -583,15 +583,11 @@ static int fetch_ssl_setup_client_certif int fetch_ssl(conn_t *conn, const struct url *URL, int verbose) { @@ -50,7 +50,7 @@ Signed-off-by: Rosen Penev #include #include "apk_defines.h" -@@ -378,25 +373,6 @@ static int parse_options(int argc, char +@@ -423,25 +418,6 @@ static int parse_options(int argc, char return 0; } @@ -76,15 +76,15 @@ Signed-off-by: Rosen Penev static void on_sigwinch(int s) { apk_reset_screen_width(); -@@ -475,7 +451,7 @@ int main(int argc, char **argv) +@@ -534,7 +510,7 @@ int main(int argc, char **argv) apk_force |= applet->forced_force; } - init_openssl(); + apk_openssl_init(); setup_automatic_flags(); - fetchConnectionCacheInit(32, 4); - + fetchTimeout = 60; + fetchRedirectMethod = fetch_redirect; --- a/src/apk_openssl.h +++ b/src/apk_openssl.h @@ -11,7 +11,11 @@