diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-01-21 09:10:02 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-01-21 12:50:24 +0000 |
| commit | 3317df2fee671d71e4507ea0a0b656000f833835 (patch) | |
| tree | 6cb99afdf4880f6ba844905e6bfb5ca1f0827e88 | |
| parent | dc38a10104306adcf6b82aa222700e1619a66251 (diff) | |
| download | aports-3317df2fee671d71e4507ea0a0b656000f833835.tar.bz2 aports-3317df2fee671d71e4507ea0a0b656000f833835.tar.xz | |
main/apk-tools: upgrade to 2.3.4
(cherry picked from commit 8b78a885fdc62fd626d0ca04e9c77b4b262ef363)
| -rw-r--r-- | main/apk-tools/0001-solver-fix-package-prefence-calculation-a-bit.patch | 32 | ||||
| -rw-r--r-- | main/apk-tools/APKBUILD | 8 |
2 files changed, 3 insertions, 37 deletions
diff --git a/main/apk-tools/0001-solver-fix-package-prefence-calculation-a-bit.patch b/main/apk-tools/0001-solver-fix-package-prefence-calculation-a-bit.patch deleted file mode 100644 index c2b6557059..0000000000 --- a/main/apk-tools/0001-solver-fix-package-prefence-calculation-a-bit.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 832dfed637eb55ef84182d3ce0a112bd8b828130 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> -Date: Sun, 4 Nov 2012 12:13:19 +0200 -Subject: [PATCH] solver: fix package prefence calculation a bit - ---- - src/solver.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/solver.c b/src/solver.c -index 5d85792..b12fc70 100644 ---- a/src/solver.c -+++ b/src/solver.c -@@ -413,12 +413,14 @@ static void calculate_pkg_preference(struct apk_package *pkg) - continue; - for (j = 0; j < d0->name->providers->num; j++) { - struct apk_provider *p0 = &d0->name->providers->item[j]; -- if (pkg == p0->pkg) -+ if (name == p0->pkg->name) - continue; - if (compare_absolute_package_preference(&p, p0) < 0) - ps->preference++; - } - } -+ -+ dbg_printf(PKG_VER_FMT ": preference=%d\n", PKG_VER_PRINTF(pkg), ps->preference); - } - - static void count_name(struct apk_solver_state *ss, struct apk_name *name) --- -1.8.0 - diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD index b652800f82..f6f8ec0b7c 100644 --- a/main/apk-tools/APKBUILD +++ b/main/apk-tools/APKBUILD @@ -1,13 +1,12 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=apk-tools -pkgver=2.3.3 -pkgrel=1 +pkgver=2.3.4 +pkgrel=0 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-solver-fix-package-prefence-calculation-a-bit.patch " url="http://git.alpinelinux.org/cgit/apk-tools/" @@ -59,5 +58,4 @@ luaapk() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr/lib/ } -md5sums="659c04201019781c3ea092f946369fed apk-tools-2.3.3.tar.bz2 -c24bc4404b4b25d175d1e657b2d9513f 0001-solver-fix-package-prefence-calculation-a-bit.patch" +md5sums="b5e4273c76590214e28afefab386d84a apk-tools-2.3.4.tar.bz2" |