apk: Update to 2.12.11
authorTianling Shen <cnsztl@immortalwrt.org>
Tue, 11 Apr 2023 19:04:25 +0000 (03:04 +0800)
committerPaul Spooren <mail@aparcar.org>
Sat, 15 Apr 2023 20:47:41 +0000 (22:47 +0200)
Refreshed patches.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
utils/apk/Makefile
utils/apk/patches/010-openssl-deprecated.patch

index 16be50d5c2556b522c04231afd341396cfb583dc..0a4e5a525a0e27346354260ec71d361abcbc4e6f 100644 (file)
@@ -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 <mail@aparcar.org>
index 2f6a45d5c41f8f7a5a96cd9799ba20af75718f58..d6ee852d0283a56a0d88946493c7e7394b957763 100644 (file)
@@ -16,7 +16,7 @@ Signed-off-by: Rosen Penev <rosenp@gmail.com>
 
 --- 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 <rosenp@gmail.com>
  #include <fetch.h>
  
  #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 <rosenp@gmail.com>
  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;
        }