From ee242c531818b26e71cc29febab082c45a263e11 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Wed, 12 Apr 2023 03:04:25 +0800 Subject: [PATCH] apk: Update to 2.12.11 Refreshed patches. Signed-off-by: Tianling Shen --- utils/apk/Makefile | 6 +++--- utils/apk/patches/010-openssl-deprecated.patch | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/utils/apk/Makefile b/utils/apk/Makefile index 16be50d5c2..0a4e5a525a 100644 --- a/utils/apk/Makefile +++ b/utils/apk/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=apk -PKG_VERSION:=2.12.4 -PKG_RELEASE:=$(AUTORELEASE) +PKG_VERSION:=2.12.11 +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:=41110665f7d14ef9678c389687aab0fa6c0a6be19e1a3dabbab6b20b17f3bacc +PKG_HASH:=2cc2cd8dd515a729609066f08edc7317b5bca33a335ca4f6a56367aa018856c5 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 2f6a45d5c4..d6ee852d02 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 -@@ -499,15 +499,11 @@ static int fetch_ssl_setup_client_certif +@@ -531,15 +531,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" -@@ -385,25 +380,6 @@ static int parse_options(int argc, char +@@ -378,25 +373,6 @@ static int parse_options(int argc, char return 0; } @@ -76,7 +76,7 @@ Signed-off-by: Rosen Penev static void on_sigwinch(int s) { apk_reset_screen_width(); -@@ -484,7 +460,7 @@ int main(int argc, char **argv) +@@ -475,7 +451,7 @@ int main(int argc, char **argv) apk_force |= applet->forced_force; }