apk: move package to core

This will become part of openwrt.git and used within the build system.

Signed-off-by: Paul Spooren <mail@aparcar.org>

8 files changed, 0 insertions, 264 deletions

diff --git a/utils/apk/Makefile b/utils/apk/Makefile
deleted file mode 100644
index 56e473c5b..000000000
--- a/utils/apk/Makefile
+++ /dev/null
@@ -1,75 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=apk
-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:=4c6db13039280814a10a3b3d89b29837b59769c69214a1861997e088eac107a5
-PKG_BUILD_DIR:=$(BUILD_DIR)/apk-tools-v$(PKG_VERSION)
-
-PKG_MAINTAINER:=Paul Spooren <mail@aparcar.org>
-PKG_LICENSE:=GPL-2.0-only
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/apk
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=apk package manager
-  DEPENDS:=+zlib +libopenssl @!arc
-  URL:=$(PKG_SOURCE_URL)
-endef
-
-define Package/alpine-keys
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Alpine apk public signing keys
-  DEPENDS:=apk
-endef
-
-define Package/alpine-repositories
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Official Alpine repositories
-  DEPENDS:=apk
-endef
-
-MAKE_FLAGS += LUA=no
-
-define Package/apk/install
-	$(INSTALL_DIR) $(1)/lib/apk/db
-
-	$(INSTALL_DIR) $(1)/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/apk $(1)/bin/apk
-
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/lib/* $(1)/usr/lib/
-
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/apk.pc \
-		$(1)/usr/lib/pkgconfig/
-
-	$(INSTALL_DIR) $(1)/etc/apk/
-	echo $(ARCH) > $(1)/etc/apk/arch
-	touch $(1)/etc/apk/world
-endef
-
-define Package/alpine-keys/install
-	$(INSTALL_DIR) $(1)/etc/apk/keys
-	$(INSTALL_DATA) ./files/alpine-keys/* $(1)/etc/apk/keys
-endef
-
-define Package/alpine-repositories/install
-	$(INSTALL_DIR) $(1)/etc/apk/keys
-	$(INSTALL_DATA) ./files/alpine-repositories $(1)/etc/apk/repositories
-endef
-
-$(eval $(call BuildPackage,apk))
-$(eval $(call BuildPackage,alpine-keys))
-$(eval $(call BuildPackage,alpine-repositories))
diff --git a/utils/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-4a6a0840.rsa.pub b/utils/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-4a6a0840.rsa.pub
deleted file mode 100644
index bb4bdc80f..000000000
--- a/utils/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-4a6a0840.rsa.pub
+++ /dev/null
@@ -1,9 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1yHJxQgsHQREclQu4Ohe
-qxTxd1tHcNnvnQTu/UrTky8wWvgXT+jpveroeWWnzmsYlDI93eLI2ORakxb3gA2O
-Q0Ry4ws8vhaxLQGC74uQR5+/yYrLuTKydFzuPaS1dK19qJPXB8GMdmFOijnXX4SA
-jixuHLe1WW7kZVtjL7nufvpXkWBGjsfrvskdNA/5MfxAeBbqPgaq0QMEfxMAn6/R
-L5kNepi/Vr4S39Xvf2DzWkTLEK8pcnjNkt9/aafhWqFVW7m3HCAII6h/qlQNQKSo
-GuH34Q8GsFG30izUENV9avY7hSLq7nggsvknlNBZtFUcmGoQrtx3FmyYsIC8/R+B
-ywIDAQAB
------END PUBLIC KEY-----
diff --git a/utils/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-5243ef4b.rsa.pub b/utils/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-5243ef4b.rsa.pub
deleted file mode 100644
index 6cbfad744..000000000
--- a/utils/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-5243ef4b.rsa.pub
+++ /dev/null
@@ -1,9 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvNijDxJ8kloskKQpJdx+
-mTMVFFUGDoDCbulnhZMJoKNkSuZOzBoFC94omYPtxnIcBdWBGnrm6ncbKRlR+6oy
-DO0W7c44uHKCFGFqBhDasdI4RCYP+fcIX/lyMh6MLbOxqS22TwSLhCVjTyJeeH7K
-aA7vqk+QSsF4TGbYzQDDpg7+6aAcNzg6InNePaywA6hbT0JXbxnDWsB+2/LLSF2G
-mnhJlJrWB1WGjkz23ONIWk85W4S0XB/ewDefd4Ly/zyIciastA7Zqnh7p3Ody6Q0
-sS2MJzo7p3os1smGjUF158s6m/JbVh4DN6YIsxwl2OjDOz9R0OycfJSDaBVIGZzg
-cQIDAQAB
------END PUBLIC KEY-----
diff --git a/utils/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-5261cecb.rsa.pub b/utils/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-5261cecb.rsa.pub
deleted file mode 100644
index 83f0658e9..000000000
--- a/utils/apk/files/alpine-keys/alpine-devel@lists.alpinelinux.org-5261cecb.rsa.pub
+++ /dev/null
@@ -1,9 +0,0 @@
------BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwlzMkl7b5PBdfMzGdCT0
-cGloRr5xGgVmsdq5EtJvFkFAiN8Ac9MCFy/vAFmS8/7ZaGOXoCDWbYVLTLOO2qtX
-yHRl+7fJVh2N6qrDDFPmdgCi8NaE+3rITWXGrrQ1spJ0B6HIzTDNEjRKnD4xyg4j
-g01FMcJTU6E+V2JBY45CKN9dWr1JDM/nei/Pf0byBJlMp/mSSfjodykmz4Oe13xB
-Ca1WTwgFykKYthoLGYrmo+LKIGpMoeEbY1kuUe04UiDe47l6Oggwnl+8XD1MeRWY
-sWgj8sF4dTcSfCMavK4zHRFFQbGp/YFJ/Ww6U9lA3Vq0wyEI6MCMQnoSMFwrbgZw
-wwIDAQAB
------END PUBLIC KEY-----
diff --git a/utils/apk/files/alpine-repositories b/utils/apk/files/alpine-repositories
deleted file mode 100644
index 5babbb23b..000000000
--- a/utils/apk/files/alpine-repositories
+++ /dev/null
@@ -1,3 +0,0 @@
-https://dl-cdn.alpinelinux.org/alpine/edge/main
-https://dl-cdn.alpinelinux.org/alpine/edge/community
-
diff --git a/utils/apk/patches/0001-remove-doc-generation.patch b/utils/apk/patches/0001-remove-doc-generation.patch
deleted file mode 100644
index dee05c56f..000000000
--- a/utils/apk/patches/0001-remove-doc-generation.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From b05a93c48fdbb50f0c464310dc2ce45777d32ea2 Mon Sep 17 00:00:00 2001
-From: Paul Spooren <mail@aparcar.org>
-Date: Fri, 2 Oct 2020 14:08:52 -1000
-Subject: [PATCH] remove doc generation
-
-Signed-off-by: Paul Spooren <mail@aparcar.org>
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/Makefile
-+++ b/Makefile
-@@ -25,7 +25,7 @@ export DESTDIR SBINDIR LIBDIR CONFDIR MA
- ##
- # Top-level subdirs
- 
--subdirs		:= libfetch/ src/ doc/
-+subdirs		:= libfetch/ src/
- 
- ##
- # Include all rules and stuff
diff --git a/utils/apk/patches/010-openssl-deprecated.patch b/utils/apk/patches/010-openssl-deprecated.patch
deleted file mode 100644
index bdfafb671..000000000
--- a/utils/apk/patches/010-openssl-deprecated.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From c4c8aa5ba0ec6bf4c6d74c4807b66edfbd91be7c Mon Sep 17 00:00:00 2001
-From: Rosen Penev <rosenp@gmail.com>
-Date: Mon, 11 Jan 2021 01:51:58 -0800
-Subject: [PATCH] fix compilation without deprecated OpenSSL APIs
-
-(De)initialization is deprecated under OpenSSL 1.0 and above.
-
-[TT: Some simplifications, and additional edits.]
-
-Signed-off-by: Rosen Penev <rosenp@gmail.com>
----
- libfetch/common.c | 12 ++++--------
- src/apk.c         | 26 +-------------------------
- src/apk_openssl.h | 27 +++++++++++++++++++++++++++
- 3 files changed, 32 insertions(+), 33 deletions(-)
-
---- a/libfetch/common.c
-+++ b/libfetch/common.c
-@@ -583,15 +583,11 @@ static int fetch_ssl_setup_client_certif
- int
- fetch_ssl(conn_t *conn, const struct url *URL, int verbose)
- {
--	/* Init the SSL library and context */
--	if (!SSL_library_init()){
--		fprintf(stderr, "SSL library init failed\n");
--		return (-1);
--	}
--
--	SSL_load_error_strings();
--
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- 	conn->ssl_meth = SSLv23_client_method();
-+#else
-+	conn->ssl_meth = TLS_client_method();
-+#endif
- 	conn->ssl_ctx = SSL_CTX_new(conn->ssl_meth);
- 	SSL_CTX_set_mode(conn->ssl_ctx, SSL_MODE_AUTO_RETRY);
- 
---- a/src/apk.c
-+++ b/src/apk.c
-@@ -20,11 +20,6 @@
- #include <unistd.h>
- #include <sys/stat.h>
- 
--#include <openssl/crypto.h>
--#ifndef OPENSSL_NO_ENGINE
--#include <openssl/engine.h>
--#endif
--
- #include <fetch.h>
- 
- #include "apk_defines.h"
-@@ -423,25 +418,6 @@ static int parse_options(int argc, char
- 	return 0;
- }
- 
--static void fini_openssl(void)
--{
--	EVP_cleanup();
--#ifndef OPENSSL_NO_ENGINE
--	ENGINE_cleanup();
--#endif
--	CRYPTO_cleanup_all_ex_data();
--}
--
--static void init_openssl(void)
--{
--	atexit(fini_openssl);
--	OpenSSL_add_all_algorithms();
--#ifndef OPENSSL_NO_ENGINE
--	ENGINE_load_builtin_engines();
--	ENGINE_register_all_complete();
--#endif
--}
--
- static void on_sigwinch(int s)
- {
- 	apk_reset_screen_width();
-@@ -534,7 +510,7 @@ int main(int argc, char **argv)
- 		apk_force |= applet->forced_force;
- 	}
- 
--	init_openssl();
-+	apk_openssl_init();
- 	setup_automatic_flags();
- 	fetchTimeout = 60;
- 	fetchRedirectMethod = fetch_redirect;
---- a/src/apk_openssl.h
-+++ b/src/apk_openssl.h
-@@ -11,7 +11,11 @@
- #define APK_SSL_COMPAT_H
- 
- #include <openssl/opensslv.h>
-+#include <openssl/crypto.h>
- #include <openssl/evp.h>
-+#ifndef OPENSSL_NO_ENGINE
-+#include <openssl/engine.h>
-+#endif
- 
- #if OPENSSL_VERSION_NUMBER < 0x1010000fL || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
- 
-@@ -25,6 +29,29 @@ static inline void EVP_MD_CTX_free(EVP_M
- 	return EVP_MD_CTX_destroy(mdctx);
- }
- 
-+static inline void apk_openssl_cleanup(void)
-+{
-+	EVP_cleanup();
-+#ifndef OPENSSL_NO_ENGINE
-+	ENGINE_cleanup();
-+#endif
-+	CRYPTO_cleanup_all_ex_data();
-+}
-+
-+static inline void apk_openssl_init(void)
-+{
-+	atexit(apk_openssl_cleanup);
-+	OpenSSL_add_all_algorithms();
-+#ifndef OPENSSL_NO_ENGINE
-+	ENGINE_load_builtin_engines();
-+	ENGINE_register_all_complete();
-+#endif
-+}
-+
-+#else
-+
-+static inline void apk_openssl_init(void) {}
-+
- #endif
- 
- #endif
diff --git a/utils/apk/test.sh b/utils/apk/test.sh
deleted file mode 100644
index 234cf5a79..000000000
--- a/utils/apk/test.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-    "apk")
-        apk --version | grep "${2#*v}"
-        ;;
-esac