Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

apk: Update to 2.14.0

Browse source 
* Fixed build issue with musl 1.2.4.
* Refreshed patches.

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2023-05-17 13:39:21 +08:00 committed by Paul Spooren
parent 6c6d8fe542
commit 3aaccd254c
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
utils/apk/Makefile
View file

@ -1,12 +1,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=apk PKG_NAME:=apk
PKG_VERSION:=2.12.11 PKG_VERSION:=2.14.0
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=apk-tools-v$(PKG_VERSION).tar.gz PKG_SOURCE:=apk-tools-v$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://gitlab.alpinelinux.org/alpine/apk-tools/-/archive/v$(PKG_VERSION) 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_BUILD_DIR:=$(BUILD_DIR)/apk-tools-v$(PKG_VERSION)
PKG_MAINTAINER:=Paul Spooren <mail@aparcar.org> PKG_MAINTAINER:=Paul Spooren <mail@aparcar.org>

10
utils/apk/patches/010-openssl-deprecated.patch
View file

@ -16,7 +16,7 @@ Signed-off-by: Rosen Penev <rosenp@gmail.com>
--- a/libfetch/common.c --- a/libfetch/common.c
+++ b/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 int
fetch_ssl(conn_t *conn, const struct url *URL, int verbose) 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 <fetch.h>
#include "apk_defines.h" #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; return 0;
} }
@ -76,15 +76,15 @@ Signed-off-by: Rosen Penev <rosenp@gmail.com>
static void on_sigwinch(int s) static void on_sigwinch(int s)
{ {
apk_reset_screen_width(); 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; apk_force |= applet->forced_force;
} }
- init_openssl(); - init_openssl();
+ apk_openssl_init(); + apk_openssl_init();
setup_automatic_flags(); setup_automatic_flags();
fetchConnectionCacheInit(32, 4); fetchTimeout = 60;
fetchRedirectMethod = fetch_redirect;
--- a/src/apk_openssl.h --- a/src/apk_openssl.h
+++ b/src/apk_openssl.h +++ b/src/apk_openssl.h
@@ -11,7 +11,11 @@ @@ -11,7 +11,11 @@