aboutsummaryrefslogtreecommitdiffstats
path: root/main/apk-tools
diff options
context:
space:
mode:
Diffstat (limited to 'main/apk-tools')
-rw-r--r--main/apk-tools/0001-Makefile-do-not-require-lua-pkgconfig-unless-you-int.patch42
-rw-r--r--main/apk-tools/0001-info-fix-querying-of-removed-but-referenced-packages.patch27
-rw-r--r--main/apk-tools/0002-upgrade-reset-versioned-deps-in-world-when-doing-upg.patch42
-rw-r--r--main/apk-tools/0003-search-add-search-for-reverse-dependencies-in-index.patch221
-rw-r--r--main/apk-tools/0004-package-don-t-leak-signing-key-file-fd.patch27
-rw-r--r--main/apk-tools/0005-cache-display-more-than-one-error.patch55
-rw-r--r--main/apk-tools/APKBUILD41
-rw-r--r--main/apk-tools/apk-tools-static.patch65
8 files changed, 128 insertions, 392 deletions
diff --git a/main/apk-tools/0001-Makefile-do-not-require-lua-pkgconfig-unless-you-int.patch b/main/apk-tools/0001-Makefile-do-not-require-lua-pkgconfig-unless-you-int.patch
new file mode 100644
index 0000000000..52ef141863
--- /dev/null
+++ b/main/apk-tools/0001-Makefile-do-not-require-lua-pkgconfig-unless-you-int.patch
@@ -0,0 +1,42 @@
+From fc4c60f233ebe9fe85b7b03d0cf5deec4ab1b32d Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Wed, 16 Jun 2010 07:37:17 +0000
+Subject: [PATCH] Makefile: do not require lua pkgconfig unless you intend build lua module
+
+---
+ src/Makefile | 11 ++++++-----
+ 1 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/src/Makefile b/src/Makefile
+index 50f9664..bea288e 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -1,12 +1,9 @@
+-PKGDEPS := openssl zlib lua
+-
+-ifeq ($(shell pkg-config --print-errors --exists $(PKGDEPS) || echo fail),fail)
+-$(error Build dependencies are not met)
+-endif
++PKGDEPS := openssl zlib
+
+ # lua module
+ ifneq ($(LUAAPK),)
+ LIBAPK := YesPlease
++PKGDEPS += lua
+ shlibs-y += apk.so
+ apk.so-objs := lua-apk.o
+ CFLAGS_lua-apk.o := -DAPK_VERSION=\"$(FULL_VERSION)\"
+@@ -16,6 +13,10 @@ install-LUA_LIB-y := $(INSTALLDIR) $(DESTDIR)$(LUA_LIBDIR) \
+ $(INSTALL) $(LUA_LIB-y) $(DESTDIR)$(LUA_LIBDIR)
+ endif
+
++ifeq ($(shell pkg-config --print-errors --exists $(PKGDEPS) || echo fail),fail)
++$(error Build dependencies are not met)
++endif
++
+ progs-y += apk
+ apk-objs := apk.o add.o del.o fix.o update.o info.o \
+ search.o upgrade.o cache.o ver.o index.o fetch.o \
+--
+1.7.1
+
diff --git a/main/apk-tools/0001-info-fix-querying-of-removed-but-referenced-packages.patch b/main/apk-tools/0001-info-fix-querying-of-removed-but-referenced-packages.patch
deleted file mode 100644
index 4df956bf36..0000000000
--- a/main/apk-tools/0001-info-fix-querying-of-removed-but-referenced-packages.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 87420aaf295f58847332ba3aa89691a0259baace Mon Sep 17 00:00:00 2001
-From: Timo Teras <timo.teras@iki.fi>
-Date: Wed, 5 May 2010 08:56:06 +0300
-Subject: [PATCH 1/5] info: fix querying of removed, but referenced packages
-
-Check that package name has packages associated with it before
-dereferencing the pointer. Fixes #345.
----
- src/info.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/info.c b/src/info.c
-index 7ca486c..d944fca 100644
---- a/src/info.c
-+++ b/src/info.c
-@@ -283,7 +283,7 @@ static int info_package(struct info_ctx *ctx, struct apk_database *db,
-
- for (i = 0; i < argc; i++) {
- name = apk_db_query_name(db, APK_BLOB_STR(argv[i]));
-- if (name == NULL) {
-+ if (name == NULL || name->pkgs == NULL) {
- apk_error("Not found: %s", argv[i]);
- return 1;
- }
---
-1.7.1
-
diff --git a/main/apk-tools/0002-upgrade-reset-versioned-deps-in-world-when-doing-upg.patch b/main/apk-tools/0002-upgrade-reset-versioned-deps-in-world-when-doing-upg.patch
deleted file mode 100644
index 2e20152ddf..0000000000
--- a/main/apk-tools/0002-upgrade-reset-versioned-deps-in-world-when-doing-upg.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 47bac8c29c9a3c3fbebfd20e907170f24f9d677c Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 11 May 2010 09:31:20 +0000
-Subject: [PATCH 2/5] upgrade: reset versioned deps in world when doing upgrade -a
-
-Doing "apk add file.apk" adds a versioned dependency to allow
-downgrading, and sticky version. Most often this is to install
-single packages from newer repository. So it would make sense
-to reset them to non-versioned if doing:
-
- apk upgrade -a
-
-fixes #346
----
- src/upgrade.c | 9 +++++++--
- 1 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/upgrade.c b/src/upgrade.c
-index f91e8cc..879e14c 100644
---- a/src/upgrade.c
-+++ b/src/upgrade.c
-@@ -41,10 +41,15 @@ static int upgrade_main(void *ctx, struct apk_database *db, int argc, char **arg
- goto err;
-
- for (i = 0; i < db->world->num; i++) {
-- r = apk_state_lock_dependency(state, &db->world->item[i]);
-+ struct apk_dependency *dep = &db->world->item[i];
-+ if (dep->version && (apk_flags & APK_PREFER_AVAILABLE)) {
-+ dep->result_mask = APK_VERSION_EQUAL | APK_VERSION_LESS | APK_VERSION_GREATER;
-+ dep->version = NULL;
-+ }
-+ r = apk_state_lock_dependency(state, dep);
- if (r != 0) {
- apk_error("Unable to upgrade '%s'",
-- db->world->item[i].name->name);
-+ dep->name->name);
- goto err;
- }
- }
---
-1.7.1
-
diff --git a/main/apk-tools/0003-search-add-search-for-reverse-dependencies-in-index.patch b/main/apk-tools/0003-search-add-search-for-reverse-dependencies-in-index.patch
deleted file mode 100644
index f2947c635a..0000000000
--- a/main/apk-tools/0003-search-add-search-for-reverse-dependencies-in-index.patch
+++ /dev/null
@@ -1,221 +0,0 @@
-From d9bf4aabff801164b4c54e51b38c5f6eab2da114 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Wed, 19 May 2010 16:48:40 +0300
-Subject: [PATCH 3/5] search: add search for reverse dependencies in index
-
-So it'll be easier to rebuild affected packages. Fixes #349.
----
- src/search.c | 148 +++++++++++++++++++++++++++++++++++----------------------
- 1 files changed, 91 insertions(+), 57 deletions(-)
-
-diff --git a/src/search.c b/src/search.c
-index 91c2913..e5e5d55 100644
---- a/src/search.c
-+++ b/src/search.c
-@@ -18,18 +18,14 @@
- #include "apk_state.h"
-
- struct search_ctx {
-- int (*action)(struct apk_database *db, int argc, char **argv);
-+ int (*match)(struct apk_package *pkg, const char *str);
-+ int (*print)(struct apk_package *pkg);
-+ int argc;
-+ char **argv;
- };
-
--struct search_query_ctx {
-- struct apk_database *db;
-- const char *query;
--};
--
--static int search_list_print(apk_hash_item item, void *ctx)
-+static int print_match(struct apk_package *pkg)
- {
-- struct apk_package *pkg = (struct apk_package *) item;
--
- printf("%s", pkg->name->name);
- if (apk_verbosity > 0)
- printf("-%s", pkg->version);
-@@ -41,61 +37,50 @@ static int search_list_print(apk_hash_item item, void *ctx)
- return 0;
- }
-
--static int search_query_print(apk_hash_item item, void *ctx)
-+static int print_rdepends(struct apk_package *pkg)
- {
-- struct search_query_ctx *ictx = (struct search_query_ctx *) ctx;
-- struct apk_package *pkg = (struct apk_package *) item;
-+ struct apk_name *name, *name0;
-+ struct apk_package *pkg0;
-+ struct apk_dependency *dep;
-+ int i, j, k;
-
-- if (fnmatch(ictx->query, pkg->name->name, 0) != 0)
-+ name = pkg->name;
-+ if (name->rdepends == NULL)
- return 0;
-- search_list_print(item, ictx->db);
--
-- return 0;
--}
--
--static int search_list(struct apk_database *db, int argc, char **argv)
--{
-- int i;
-- struct search_query_ctx ctx;
--
-- ctx.db = db;
-
-- if (argc == 0)
-- apk_hash_foreach(&db->available.packages, search_list_print, db);
-- else
-- for (i=0; i<argc; i++) {
-- ctx.query = argv[i];
-- apk_hash_foreach(&db->available.packages, search_query_print, &ctx);
-+ printf("%s-%s:", pkg->name->name, pkg->version);
-+ for (i = 0; i < name->rdepends->num; i++) {
-+ name0 = name->rdepends->item[i];
-+ if (name0->pkgs == NULL)
-+ continue;
-+ for (j = 0; j < name0->pkgs->num; j++) {
-+ pkg0 = name0->pkgs->item[j];
-+ if (pkg0->depends == NULL)
-+ continue;
-+ for (k = 0; k < pkg0->depends->num; k++) {
-+ dep = &pkg0->depends->item[k];
-+ if (name == dep->name &&
-+ (apk_version_compare(pkg->version, dep->version)
-+ & dep->result_mask)) {
-+ printf(" %s-%s", pkg0->name->name, pkg0->version);
-+ }
-+ }
- }
-+ }
-+ printf("\n");
-
- return 0;
- }
-
--static int search_query_desc_print(apk_hash_item item, void *ctx)
-+static int search_pkgname(struct apk_package *pkg, const char *str)
- {
-- struct search_query_ctx *ictx = (struct search_query_ctx *) ctx;
-- struct apk_package *pkg = (struct apk_package *) item;
--
-- if( strstr(pkg->description, ictx->query) == NULL )
-- return 0;
-- search_list_print(item, ictx->db);
--
-- return 0;
-+ return fnmatch(str, pkg->name->name, 0) == 0;
- }
-
--static int search_desc(struct apk_database *db, int argc, char **argv)
-+static int search_desc(struct apk_package *pkg, const char *str)
- {
-- int i;
-- struct search_query_ctx ctx;
--
-- ctx.db = db;
--
-- for (i=0; i<argc; i++) {
-- ctx.query = argv[i];
-- apk_hash_foreach(&db->available.packages, search_query_desc_print, &ctx);
-- }
--
-- return 0;
-+ return strstr(pkg->name->name, str) != NULL ||
-+ strstr(pkg->description, str) != NULL;
- }
-
- static int search_parse(void *ctx, struct apk_db_options *dbopts,
-@@ -105,7 +90,10 @@ static int search_parse(void *ctx, struct apk_db_options *dbopts,
-
- switch (optch) {
- case 'd':
-- ictx->action = search_desc;
-+ ictx->match = search_desc;
-+ break;
-+ case 'r':
-+ ictx->print = print_rdepends;
- break;
- default:
- return -1;
-@@ -113,23 +101,69 @@ static int search_parse(void *ctx, struct apk_db_options *dbopts,
- return 0;
- }
-
-+static int match_packages(apk_hash_item item, void *ctx)
-+{
-+ struct search_ctx *ictx = (struct search_ctx *) ctx;
-+ struct apk_package *pkg = (struct apk_package *) item;
-+ int i;
-+
-+ for (i = 0; i < ictx->argc; i++)
-+ if (ictx->match(pkg, ictx->argv[i]))
-+ break;
-+ if (ictx->argc == 0 || i < ictx->argc)
-+ ictx->print(pkg);
-+
-+ return 0;
-+}
-+
- static int search_main(void *ctx, struct apk_database *db, int argc, char **argv)
- {
- struct search_ctx *ictx = (struct search_ctx *) ctx;
-+ struct apk_name *name;
-+ int rc = 0, i, j, slow_search;
-+
-+ slow_search = ictx->match != NULL || argc == 0;
-+ if (!slow_search) {
-+ for (i = 0; i < argc; i++)
-+ if (strcspn(argv[i], "*?[") != strlen(argv[i])) {
-+ slow_search = 1;
-+ break;
-+ }
-+ }
-+
-+ if (ictx->match == NULL)
-+ ictx->match = search_pkgname;
-+ if (ictx->print == NULL)
-+ ictx->print = print_match;
-+ else if (argc == 0)
-+ return -1;
-
-- if (ictx->action != NULL)
-- return ictx->action(db, argc, argv);
-+ if (slow_search) {
-+ ictx->argc = argc;
-+ ictx->argv = argv;
-+ rc = apk_hash_foreach(&db->available.packages,
-+ match_packages, ictx);
-+ } else {
-+ for (i = 0; i < argc; i++) {
-+ name = apk_db_query_name(db, APK_BLOB_STR(argv[i]));
-+ if (name == NULL || name->pkgs == NULL)
-+ continue;
-+ for (j = 0; j < name->pkgs->num; j++)
-+ ictx->print(name->pkgs->item[j]);
-+ }
-+ }
-
-- return search_list(db, argc, argv);
-+ return rc;
- }
-
- static struct apk_option search_options[] = {
-- { 'd', "description", "Search also package descriptions" },
-+ { 'd', "description", "Search also package descriptions" },
-+ { 'r', "rdepends", "Print reverse dependencies of package" },
- };
-
- static struct apk_applet apk_search = {
- .name = "search",
-- .help = "Search package names (and descriptions) by wildcard PATTERN.",
-+ .help = "Search package by PATTERNs or by indexed dependencies.",
- .arguments = "PATTERN",
- .open_flags = APK_OPENF_READ | APK_OPENF_NO_STATE,
- .context_size = sizeof(struct search_ctx),
---
-1.7.1
-
diff --git a/main/apk-tools/0004-package-don-t-leak-signing-key-file-fd.patch b/main/apk-tools/0004-package-don-t-leak-signing-key-file-fd.patch
deleted file mode 100644
index 818eeb1e79..0000000000
--- a/main/apk-tools/0004-package-don-t-leak-signing-key-file-fd.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From fe55da70741621f7bac2cd943b64cc13e25f9427 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Wed, 26 May 2010 14:30:08 +0300
-Subject: [PATCH 4/5] package: don't leak signing key file fd
-
-openssl BIO does not close the fd unless we explicitly tell it to
-do so.
----
- src/package.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/package.c b/src/package.c
-index b265468..b97c412 100644
---- a/src/package.c
-+++ b/src/package.c
-@@ -441,7 +441,7 @@ int apk_sign_ctx_process_file(struct apk_sign_ctx *ctx,
- if (fd < 0)
- return 0;
-
-- bio = BIO_new_fp(fdopen(fd, "r"), 0);
-+ bio = BIO_new_fp(fdopen(fd, "r"), BIO_CLOSE);
- ctx->signature.pkey = PEM_read_bio_PUBKEY(bio, NULL, NULL, NULL);
- if (ctx->signature.pkey != NULL) {
- if (fi->name[6] == 'R')
---
-1.7.1
-
diff --git a/main/apk-tools/0005-cache-display-more-than-one-error.patch b/main/apk-tools/0005-cache-display-more-than-one-error.patch
deleted file mode 100644
index 6e85218b18..0000000000
--- a/main/apk-tools/0005-cache-display-more-than-one-error.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From d21303960544b5f11b7d69d0335f0903fb93d180 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Thu, 13 May 2010 09:26:19 +0000
-Subject: [PATCH 5/5] cache: display more than one error
-
-Display all packages that are bad in world rather than only first
-before exiting.
----
- src/cache.c | 15 ++++++++-------
- 1 files changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/src/cache.c b/src/cache.c
-index 85d9777..49a71fa 100644
---- a/src/cache.c
-+++ b/src/cache.c
-@@ -30,7 +30,7 @@ static int cache_download(struct apk_database *db)
- struct apk_package *pkg;
- struct apk_repository *repo;
- char item[PATH_MAX], cacheitem[PATH_MAX];
-- int i, r = 0;
-+ int i, r = 0, errors = 0;
-
- if (db->world == NULL)
- return 0;
-@@ -41,12 +41,13 @@ static int cache_download(struct apk_database *db)
-
- for (i = 0; i < db->world->num; i++) {
- r = apk_state_lock_dependency(state, &db->world->item[i]);
-- if (r != 0) {
-- apk_error("Unable to select version for '%s': %d",
-- db->world->item[i].name->name, r);
-- goto err;
-- }
-+ errors += r;
-+ if (r != 0)
-+ apk_error("Unable to select version for '%s'",
-+ db->world->item[i].name->name);
- }
-+ if (errors)
-+ goto err;
-
- list_for_each_entry(change, &state->change_list_head, change_list) {
- pkg = change->newpkg;
-@@ -67,7 +68,7 @@ static int cache_download(struct apk_database *db)
- err:
- if (state != NULL)
- apk_state_unref(state);
-- return r;
-+ return errors;
- }
-
- static int cache_clean(struct apk_database *db)
---
-1.7.1
-
diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD
index 07b602dfaf..90cff68dc2 100644
--- a/main/apk-tools/APKBUILD
+++ b/main/apk-tools/APKBUILD
@@ -1,37 +1,41 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=apk-tools
-pkgver=2.0.2
-pkgrel=6
+pkgver=2.0.5
+pkgrel=1
pkgdesc="Alpine Package Keeper - package manager for alpine"
subpackages="$pkgname-static"
depends=
makedepends="zlib-dev openssl-dev pkgconfig"
source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
- 0001-info-fix-querying-of-removed-but-referenced-packages.patch
- 0002-upgrade-reset-versioned-deps-in-world-when-doing-upg.patch
- 0003-search-add-search-for-reverse-dependencies-in-index.patch
- 0004-package-don-t-leak-signing-key-file-fd.patch
- 0005-cache-display-more-than-one-error.patch
+ 0001-Makefile-do-not-require-lua-pkgconfig-unless-you-int.patch
+ apk-tools-static.patch
"
-
url="http://git.alpinelinux.org/cgit/apk-tools/"
license=GPL-2
prepare() {
cd "$srcdir/$pkgname-$pkgver"
sed -i -e 's:-Werror::' Make.rules
- for i in ../*.patch; do
- [ -f $i ] || continue
- patch -p1 -i $i || return 1
+ for i in $source; do
+ case $i in
+ *.patch) patch -p1 -i "$srcdir"/$i || return 1
+ esac
done
+ # the patch includes a symlink
+ rm -f src/apk-static.c
+ ln -s apk.c src/apk-static.c
}
build() {
cd "$srcdir/$pkgname-$pkgver"
- make || return 1
- make static || return 1
- make DESTDIR="$pkgdir" install
+ make FULL_VERSION="$pkgver-r$pkgrel" || return 1
+ make FULL_VERSION="$pkgver-r$pkgrel" static || return 1
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make FULL_VERSION="$pkgver-r$pkgrel" DESTDIR="$pkgdir" install
cd "$pkgdir/sbin"
ln -s apk apk_add
ln -s apk apk_audit
@@ -48,9 +52,6 @@ static() {
"$subpkgdir"/sbin/apk.static
}
-md5sums="c87cb88f90eb8d7021d37e3b5386863d apk-tools-2.0.2.tar.bz2
-c590e894c2580cbb092b150fca9af3cf 0001-info-fix-querying-of-removed-but-referenced-packages.patch
-5c53eaa29dd9722c25b6878cde392d05 0002-upgrade-reset-versioned-deps-in-world-when-doing-upg.patch
-6baca299fbf00b97f78fa8fbd0e82f5b 0003-search-add-search-for-reverse-dependencies-in-index.patch
-175470e6d5b2d20fe02d6fb61f8ec6d1 0004-package-don-t-leak-signing-key-file-fd.patch
-0ab64b75b09f37b4d265df3f7b5b7e83 0005-cache-display-more-than-one-error.patch"
+md5sums="7f9234ab210557b064d7bd9b42833f0a apk-tools-2.0.5.tar.bz2
+f63d483b724e8e9344ce8cb965d5ed22 0001-Makefile-do-not-require-lua-pkgconfig-unless-you-int.patch
+3c1f21719a6c4aba51333cf0d88c5600 apk-tools-static.patch"
diff --git a/main/apk-tools/apk-tools-static.patch b/main/apk-tools/apk-tools-static.patch
new file mode 100644
index 0000000000..c122964b45
--- /dev/null
+++ b/main/apk-tools/apk-tools-static.patch
@@ -0,0 +1,65 @@
+commit dd6008995a8e8509d71ffa906c837e7a320e8a15
+Author: Timo Teräs <timo.teras@iki.fi>
+Date: Wed Jun 30 16:53:56 2010 +0300
+
+ static build: do not use openssl engines
+
+ We want minimal static build. And this now also breaks with our openssl
+ since it tries to automatically dlopen some of the engine modules.
+
+diff --git a/.gitignore b/.gitignore
+index f6f9cf6..2b22f52 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -1,4 +1,5 @@
+ apk
++apk.static
+ *.o
+ *.d
+ *.cmd
+diff --git a/src/Makefile b/src/Makefile
+index bea288e..c9cda6a 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -41,9 +41,10 @@ endif
+
+ CFLAGS_ALL += -D_ATFILE_SOURCE
+ CFLAGS_apk.o := -DAPK_VERSION=\"$(FULL_VERSION)\"
++CFLAGS_apk-static.o := -DAPK_VERSION=\"$(FULL_VERSION)\" -DOPENSSL_NO_ENGINE
+
+ progs-$(STATIC) += apk.static
+-apk.static-objs := $(apk-objs)
++apk.static-objs := $(filter-out apk.o,$(apk-objs)) apk-static.o
+ LDFLAGS_apk.static := -static
+ LDFLAGS_apk += -nopie -L$(obj)
+
+diff --git a/src/apk-static.c b/src/apk-static.c
+new file mode 120000
+index 0000000..bf745af
+--- /dev/null
++++ b/src/apk-static.c
+@@ -0,0 +1 @@
++apk.c
+\ No newline at end of file
+diff --git a/src/apk.c b/src/apk.c
+index 81bb950..4196f74 100644
+--- a/src/apk.c
++++ b/src/apk.c
+@@ -12,13 +12,17 @@
+ #include <stdio.h>
+ #include <fcntl.h>
+ #include <ctype.h>
++#include <errno.h>
+ #include <stdarg.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <getopt.h>
+ #include <sys/stat.h>
+
++#include <openssl/crypto.h>
++#ifndef OPENSSL_NO_ENGINE
+ #include <openssl/engine.h>
++#endif
+
+ #include "apk_defines.h"
+ #include "apk_database.h"