aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2012-01-17 15:58:16 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2012-01-18 15:56:26 +0000
commit3f62affd481be59787ecbe88b4b1b4d1ff4d22ab (patch)
tree3fd2f91f87d5dbd49e3d4f8f534088e91dcb847f
parentfbae5800c59a95522d4460080d9ab73c1493d868 (diff)
downloadalpine_aports-3f62affd481be59787ecbe88b4b1b4d1ff4d22ab.tar.bz2
alpine_aports-3f62affd481be59787ecbe88b4b1b4d1ff4d22ab.tar.xz
alpine_aports-3f62affd481be59787ecbe88b4b1b4d1ff4d22ab.zip
main/apk-tools: upgrade to 2.2.3
(cherry picked from commit 4546ec4b1aa5562ea7e21511bb31c610cf2d9f76)
-rw-r--r--main/apk-tools/APKBUILD6
-rw-r--r--main/apk-tools/fix-lua-apk.patch13
2 files changed, 17 insertions, 2 deletions
diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD
index 7f8b79912f..86845e8e42 100644
--- a/main/apk-tools/APKBUILD
+++ b/main/apk-tools/APKBUILD
@@ -1,12 +1,13 @@
1# Maintainer: Natanael Copa <ncopa@alpinelinux.org> 1# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
2pkgname=apk-tools 2pkgname=apk-tools
3pkgver=2.2.2 3pkgver=2.2.3
4pkgrel=0 4pkgrel=0
5pkgdesc="Alpine Package Keeper - package manager for alpine" 5pkgdesc="Alpine Package Keeper - package manager for alpine"
6subpackages="$pkgname-static lua-apk:luaapk" 6subpackages="$pkgname-static lua-apk:luaapk"
7depends= 7depends=
8makedepends="zlib-dev openssl-dev lua-dev" 8makedepends="zlib-dev openssl-dev lua-dev"
9source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 9source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
10 fix-lua-apk.patch
10 " 11 "
11 12
12url="http://git.alpinelinux.org/cgit/apk-tools/" 13url="http://git.alpinelinux.org/cgit/apk-tools/"
@@ -54,4 +55,5 @@ luaapk() {
54 mv "$pkgdir"/usr/lib "$subpkgdir"/usr/lib/ 55 mv "$pkgdir"/usr/lib "$subpkgdir"/usr/lib/
55} 56}
56 57
57md5sums="1660ba53d447d2151371715d1225fdbf apk-tools-2.2.2.tar.bz2" 58md5sums="31dcb57491d08ea69f0d041aad94e865 apk-tools-2.2.3.tar.bz2
5966e110316e76408f19f8c44e698c26cb fix-lua-apk.patch"
diff --git a/main/apk-tools/fix-lua-apk.patch b/main/apk-tools/fix-lua-apk.patch
new file mode 100644
index 0000000000..0c13e815b8
--- /dev/null
+++ b/main/apk-tools/fix-lua-apk.patch
@@ -0,0 +1,13 @@
1diff --git a/src/lua-apk.c b/src/lua-apk.c
2index 6fbd1cf..45488c2 100644
3--- a/src/lua-apk.c
4+++ b/src/lua-apk.c
5@@ -208,7 +208,7 @@ static int Papk_exists(lua_State *L)
6 apk_blob_t blob = APK_BLOB_STR(depstr);
7 apk_blob_pull_dep(&blob, db, &dep);
8
9- if (APK_BLOB_IS_NULL(blob) || b.len > 0)
10+ if (APK_BLOB_IS_NULL(blob) || blob.len > 0)
11 goto ret_nil;
12
13 name = dep.name;