diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-04-10 07:38:43 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-04-10 07:38:43 +0000 |
| commit | 3fb25f42f62be859ca890b553a4102c495cf3433 (patch) | |
| tree | ed2307df51b015d3d64326b9174f7f29ac6a9e65 | |
| parent | 93584b42f19b9e907c6a652542621ae7ea7b298f (diff) | |
| download | aports-3fb25f42f62be859ca890b553a4102c495cf3433.tar.bz2 aports-3fb25f42f62be859ca890b553a4102c495cf3433.tar.xz | |
main/apk-tools: fix cleaning of packages that got replaced with provides
| -rw-r--r-- | main/apk-tools/0001-solver-fix-cleaning-of-packages-that-got-replaced-by.patch | 32 | ||||
| -rw-r--r-- | main/apk-tools/APKBUILD | 12 |
2 files changed, 40 insertions, 4 deletions
diff --git a/main/apk-tools/0001-solver-fix-cleaning-of-packages-that-got-replaced-by.patch b/main/apk-tools/0001-solver-fix-cleaning-of-packages-that-got-replaced-by.patch new file mode 100644 index 0000000000..6f3ca66260 --- /dev/null +++ b/main/apk-tools/0001-solver-fix-cleaning-of-packages-that-got-replaced-by.patch @@ -0,0 +1,32 @@ +From 9fa64ca1db84c7a57434498651218d02da57ca04 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> +Date: Thu, 10 Apr 2014 09:52:40 +0300 +Subject: [PATCH] solver: fix cleaning of packages that got replaced by + provides + +--- + src/solver.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/src/solver.c b/src/solver.c +index 31b3db7..9c513c7 100644 +--- a/src/solver.c ++++ b/src/solver.c +@@ -786,10 +786,13 @@ static void cset_gen_name_remove(struct apk_solver_state *ss, struct apk_package + { + struct apk_name *name = pkg->name, **pname; + +- if (name->ss.chosen.pkg != NULL || name->ss.in_changeset) ++ if (pkg->ss.in_changeset || ++ (name->ss.chosen.pkg != NULL && ++ name->ss.chosen.pkg->name == name)) + return; + + name->ss.in_changeset = 1; ++ pkg->ss.in_changeset = 1; + foreach_array_item(pname, pkg->name->rinstall_if) + cset_check_removal_by_iif(ss, *pname); + record_change(ss, pkg, NULL); +-- +1.9.1 + diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD index f9c7947379..e4a8df98f9 100644 --- a/main/apk-tools/APKBUILD +++ b/main/apk-tools/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=apk-tools pkgver=2.4.2 -pkgrel=0 +pkgrel=1 pkgdesc="Alpine Package Keeper - package manager for alpine" subpackages="$pkgname-static" depends= @@ -13,6 +13,7 @@ if [ "$CBUILD" == "$CHOST" ]; then makedepends="$makedepends lua5.2-dev" fi source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz + 0001-solver-fix-cleaning-of-packages-that-got-replaced-by.patch " url="http://git.alpinelinux.org/cgit/apk-tools/" @@ -82,6 +83,9 @@ luaapk() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr/lib/ } -md5sums="d046604f183a9e5c8d3ce760cee0d9c9 apk-tools-2.4.2.tar.xz" -sha256sums="b35231dce35432d76d75eb0dc306e7d7ee52fedf012303af59f00342e39aedda apk-tools-2.4.2.tar.xz" -sha512sums="0f0a48289eb407b5e0e44f6bd854170f491972ad48b48232885c352e79664c420c15bf25c32676f6ef453b2df0333979c94634a43c6ef858ff72bfd802d25f69 apk-tools-2.4.2.tar.xz" +md5sums="d046604f183a9e5c8d3ce760cee0d9c9 apk-tools-2.4.2.tar.xz +06ac5dce22c526dcc977c4a81659985b 0001-solver-fix-cleaning-of-packages-that-got-replaced-by.patch" +sha256sums="b35231dce35432d76d75eb0dc306e7d7ee52fedf012303af59f00342e39aedda apk-tools-2.4.2.tar.xz +804878bdd008bb68fd457a53d977da3321bd82776a894b7d016980c29de5c8ed 0001-solver-fix-cleaning-of-packages-that-got-replaced-by.patch" +sha512sums="0f0a48289eb407b5e0e44f6bd854170f491972ad48b48232885c352e79664c420c15bf25c32676f6ef453b2df0333979c94634a43c6ef858ff72bfd802d25f69 apk-tools-2.4.2.tar.xz +cbef12bacdf76e2908306b68aed135c37b329ca0b4f2cba2f8aa1da9ec83086d1114a0b05777267cd113f78480cac787a806a76496c8ad8954d2f795d9670c97 0001-solver-fix-cleaning-of-packages-that-got-replaced-by.patch" |