aboutsummaryrefslogtreecommitdiffstats
path: root/main/apk-tools
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2019-06-14 13:43:29 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2019-06-14 17:31:21 +0000
commit1c5895084260c28d5cce06e0458d7aaf47e90bd9 (patch)
treea05506a6f7748a7aaa5467a40e432b9bbf02351d /main/apk-tools
parent7cb69f3cc4f761c45c9c31e87736ec406a0bf91b (diff)
main/apk-tools: work around bug in lua-apk
Diffstat (limited to 'main/apk-tools')
-rw-r--r--main/apk-tools/APKBUILD8
-rw-r--r--main/apk-tools/lua-apk_time.patch20
2 files changed, 25 insertions, 3 deletions
diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD
index 26af6c63716..3c70acedb20 100644
--- a/main/apk-tools/APKBUILD
+++ b/main/apk-tools/APKBUILD
@@ -1,18 +1,19 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=apk-tools
pkgver=2.10.4
-pkgrel=0
+pkgrel=1
pkgdesc="Alpine Package Keeper - package manager for alpine"
subpackages="$pkgname-static"
depends=
makedepends_build="openssl"
-makedepends_host="zlib-dev openssl-dev linux-headers"
+makedepends_host="zlib-dev openssl-dev openssl-static linux-headers"
makedepends="$makedepends_build $makedepends_host"
if [ "$CBUILD" = "$CHOST" ]; then
subpackages="$subpackages lua5.2-apk:luaapk"
makedepends="$makedepends lua5.2-dev"
fi
source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz
+ lua-apk_time.patch
"
url="https://git.alpinelinux.org/cgit/apk-tools/"
@@ -82,4 +83,5 @@ luaapk() {
mv "$pkgdir"/usr/lib "$subpkgdir"/usr/lib/
}
-sha512sums="d2d9fde0aae9059236f68a3fc2f2186104bb9a099b15d296a6202a20ab2912638f10bb3b9edb70f359d060c5839573c3d50ef37d13095fa01c66dc3219ab6e39 apk-tools-2.10.4.tar.xz"
+sha512sums="d2d9fde0aae9059236f68a3fc2f2186104bb9a099b15d296a6202a20ab2912638f10bb3b9edb70f359d060c5839573c3d50ef37d13095fa01c66dc3219ab6e39 apk-tools-2.10.4.tar.xz
+7751f4ddbf3f1b14f5d70ea0f8c2f78168d6138272f883fe1c0137ed135c3f3639f4bf2860dbf6b6de0d4321c93ec9c150edaf5f496c4dc0fedd0a201f399599 lua-apk_time.patch"
diff --git a/main/apk-tools/lua-apk_time.patch b/main/apk-tools/lua-apk_time.patch
new file mode 100644
index 00000000000..01b68f369e3
--- /dev/null
+++ b/main/apk-tools/lua-apk_time.patch
@@ -0,0 +1,20 @@
+diff --git a/src/lua-apk.c b/src/lua-apk.c
+index 532577a..26129fb 100644
+--- a/src/lua-apk.c
++++ b/src/lua-apk.c
+@@ -37,6 +37,15 @@ struct flagmap opendb_flagmap[] = {
+ {NULL, 0}
+ };
+
++time_t apk_time(void)
++{
++#ifdef TEST_MODE
++ return 1559567666;
++#else
++ return time(NULL);
++#endif
++}
++
+ /* implemented as luaL_typerror until lua 5.1, dropped in 5.2
+ * (C) 1994-2012 Lua.org, PUC-Rio. MIT license
+ */