aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2019-05-03 09:34:39 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2019-05-03 09:36:00 +0000
commitcc23438a3da35112cd89014144760de73ce10ff3 (patch)
treed3e87e5211a768344db0dde88486761822924a11
parent50c742e66bdcf3ce6b2ea64b7442401bf0e701d5 (diff)
downloadaports-cc23438a3da35112cd89014144760de73ce10ff3.tar.gz
aports-cc23438a3da35112cd89014144760de73ce10ff3.tar.bz2
aports-cc23438a3da35112cd89014144760de73ce10ff3.tar.xz
main/lua-aports: backport bugfix
we need reset depends_{doc,dev,libs,openrc} when parsing APKBUILDs
-rw-r--r--main/lua-aports/0001-db-clear-depends_-when-parse-APKBUILDs.patch29
-rw-r--r--main/lua-aports/APKBUILD6
2 files changed, 33 insertions, 2 deletions
diff --git a/main/lua-aports/0001-db-clear-depends_-when-parse-APKBUILDs.patch b/main/lua-aports/0001-db-clear-depends_-when-parse-APKBUILDs.patch
new file mode 100644
index 0000000000..864eb00f6f
--- /dev/null
+++ b/main/lua-aports/0001-db-clear-depends_-when-parse-APKBUILDs.patch
@@ -0,0 +1,29 @@
+From e3405d25e66ec6970c38ca8e57dd873a25e2ff3b Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Fri, 3 May 2019 09:15:49 +0000
+Subject: [PATCH] db: clear depends_* when parse APKBUILDs
+
+Some APKBUILDs uses makedepends="$depends_dev ..." without first setting
+depends_dev. This may result in depends_dev leak when parsing APKBUILDs
+---
+ aports/db.lua | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/aports/db.lua b/aports/db.lua
+index bb7e136..2ed14bd 100644
+--- a/aports/db.lua
++++ b/aports/db.lua
+@@ -98,6 +98,10 @@ local function apkbuilds_open(aportsdir, repos)
+ license=
+ options=
+ depends=
++ depends_doc=
++ depends_dev=
++ depends_libs=
++ depends_openrc=
+ makedepends=
+ makedepends_build=
+ makedepends_host=
+--
+2.21.0
+
diff --git a/main/lua-aports/APKBUILD b/main/lua-aports/APKBUILD
index 0944de32da..c98303cb0e 100644
--- a/main/lua-aports/APKBUILD
+++ b/main/lua-aports/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=lua-aports
pkgver=1.0.0
-pkgrel=0
+pkgrel=1
pkgdesc="Lua modules for parsing aports tree"
url="https://dev.alpinelinux.org/archive/lua-aports/"
arch="noarch"
@@ -9,6 +9,7 @@ license="MIT"
depends="lua5.2-cjson lua5.2-filesystem lua5.2-optarg lua5.2"
replaces="abuild"
source="https://dev.alpinelinux.org/archive/lua-aports/lua-aports-$pkgver.tar.xz
+ 0001-db-clear-depends_-when-parse-APKBUILDs.patch
"
builddir="$srcdir/$pkgname-$pkgver"
@@ -17,4 +18,5 @@ package() {
make DESTDIR="$pkgdir" install
}
-sha512sums="67ea0bd93c7cf8fcfe175a6e90da6e1976e0ca6257b036ef43959a5a839cecc94ceb90a509ec270cb6cdaf4ef234c41adc7269d733ae6ad1c377ef9c4b261f0b lua-aports-1.0.0.tar.xz"
+sha512sums="67ea0bd93c7cf8fcfe175a6e90da6e1976e0ca6257b036ef43959a5a839cecc94ceb90a509ec270cb6cdaf4ef234c41adc7269d733ae6ad1c377ef9c4b261f0b lua-aports-1.0.0.tar.xz
+d95a989bed076a047c8d2dcd0c40cd44acd5eb9fbda94922d42e8e6f2c0db0094c931684fa2ae1f9f56416de9e77853589fae7815477b99c01a54bfa4bda9c45 0001-db-clear-depends_-when-parse-APKBUILDs.patch"