diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2012-03-31 23:28:55 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2012-03-31 23:28:55 +0300 |
| commit | 0c416991ff2ef2e1034c5d581d20b2dd47c7ab52 (patch) | |
| tree | 9bc9f007a9c100fb424d91300bd1d1280e84b66d | |
| parent | a7c564605d513f2a4ac45a0e769ec77ea6061e0e (diff) | |
| download | aports-0c416991ff2ef2e1034c5d581d20b2dd47c7ab52.tar.bz2 aports-0c416991ff2ef2e1034c5d581d20b2dd47c7ab52.tar.xz | |
main/apk-tools: cherry pick fix for installation of non-repository packages
| -rw-r--r-- | main/apk-tools/0001-info-fix-exit-code-for-e.patch | 2 | ||||
| -rw-r--r-- | main/apk-tools/0002-solver-fix-installation-of-non-repository-packages.patch | 26 | ||||
| -rw-r--r-- | main/apk-tools/APKBUILD | 8 |
3 files changed, 32 insertions, 4 deletions
diff --git a/main/apk-tools/0001-info-fix-exit-code-for-e.patch b/main/apk-tools/0001-info-fix-exit-code-for-e.patch index 5fa01ff394..2395cb38eb 100644 --- a/main/apk-tools/0001-info-fix-exit-code-for-e.patch +++ b/main/apk-tools/0001-info-fix-exit-code-for-e.patch @@ -1,7 +1,7 @@ From ebaf8305b5c9cc5bdc5d640f4cb25e058f7a2c26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> Date: Fri, 30 Mar 2012 09:20:21 +0300 -Subject: [PATCH] info: fix exit code for -e +Subject: [PATCH 1/2] info: fix exit code for -e fixes #1069 --- diff --git a/main/apk-tools/0002-solver-fix-installation-of-non-repository-packages.patch b/main/apk-tools/0002-solver-fix-installation-of-non-repository-packages.patch new file mode 100644 index 0000000000..17f466a1dc --- /dev/null +++ b/main/apk-tools/0002-solver-fix-installation-of-non-repository-packages.patch @@ -0,0 +1,26 @@ +From a57db1bba098808ed3545579833ce4372ee4ba20 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> +Date: Sat, 31 Mar 2012 23:27:15 +0300 +Subject: [PATCH 2/2] solver: fix installation of non-repository packages + +--- + src/solver.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/solver.c b/src/solver.c +index 820f840..c26fd7b 100644 +--- a/src/solver.c ++++ b/src/solver.c +@@ -1116,7 +1116,8 @@ static int reconsider_name(struct apk_solver_state *ss, struct apk_name *name) + + if (ps0 == NULL || ps0->locked || ps0->conflicts || + ss->topology_position < pkg0->topology_hard || +- (pkg0->ipkg == NULL && (!ps0->allowed || !pkg_available(ss->db, pkg0)))) ++ (pkg0->ipkg == NULL && pkg->filename == NULL && ++ (!ps0->allowed || !pkg_available(ss->db, pkg0)))) + continue; + + for (j = 0; j < pkg0->provides->num; j++) { +-- +1.7.9.4 + diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD index 53652a069e..df2bc5ac84 100644 --- a/main/apk-tools/APKBUILD +++ b/main/apk-tools/APKBUILD @@ -1,13 +1,14 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=apk-tools pkgver=2.3.0 -pkgrel=1 +pkgrel=2 pkgdesc="Alpine Package Keeper - package manager for alpine" subpackages="$pkgname-static lua-apk:luaapk" depends= makedepends="zlib-dev openssl-dev lua-dev" source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 - 0001-info-fix-exit-code-for-e.patch" + 0001-info-fix-exit-code-for-e.patch + 0002-solver-fix-installation-of-non-repository-packages.patch" url="http://git.alpinelinux.org/cgit/apk-tools/" arch="all" @@ -55,4 +56,5 @@ luaapk() { } md5sums="f87882b3ddad44282459ee40b143ad1a apk-tools-2.3.0.tar.bz2 -03e0555514f8eb59148361cf53607f0a 0001-info-fix-exit-code-for-e.patch" +eab1caf0fa9a889605efcb5b147e594d 0001-info-fix-exit-code-for-e.patch +5def794b529dad2cc3ad26092b466aea 0002-solver-fix-installation-of-non-repository-packages.patch" |