diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-10-02 13:09:11 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-10-02 13:10:33 +0000 |
| commit | 75ea8ec353150e962c6a97ffa4355199030c7824 (patch) | |
| tree | a0ffd2a23066a1f74c24e4d908eaa283b88f6dfe | |
| parent | 4ce47df5b9f92bfbae4f012df670391e316f51f5 (diff) | |
| download | aports-75ea8ec353150e962c6a97ffa4355199030c7824.tar.bz2 aports-75ea8ec353150e962c6a97ffa4355199030c7824.tar.xz | |
main/apk-tools: allow using cached packages with --no-network
fixes regression
| -rw-r--r-- | main/apk-tools/0001-db-allow-using-cached-packages-with-no-network.patch | 25 | ||||
| -rw-r--r-- | main/apk-tools/APKBUILD | 12 |
2 files changed, 33 insertions, 4 deletions
diff --git a/main/apk-tools/0001-db-allow-using-cached-packages-with-no-network.patch b/main/apk-tools/0001-db-allow-using-cached-packages-with-no-network.patch new file mode 100644 index 0000000000..b638949b86 --- /dev/null +++ b/main/apk-tools/0001-db-allow-using-cached-packages-with-no-network.patch @@ -0,0 +1,25 @@ +From a6c4103df550ec7c1d99af6a5573c2e3f946b408 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> +Date: Wed, 2 Oct 2013 16:06:10 +0300 +Subject: [PATCH] db: allow using cached packages with --no-network + +--- + src/database.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/database.c b/src/database.c +index afe0a8c..9eadb44 100644 +--- a/src/database.c ++++ b/src/database.c +@@ -2151,7 +2151,7 @@ int apk_db_add_repository(apk_database_t _db, apk_blob_t _repository) + db->available_repos &= ~BIT(repo_num); + r = 0; + } else { +- db->repo_tags[tag_id].allowed_repos |= BIT(repo_num) & db->available_repos; ++ db->repo_tags[tag_id].allowed_repos |= BIT(repo_num); + } + + return 0; +-- +1.8.4 + diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD index 5b9bd531a5..a38f01de9e 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.0 -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-db-allow-using-cached-packages-with-no-network.patch " url="http://git.alpinelinux.org/cgit/apk-tools/" @@ -82,6 +83,9 @@ luaapk() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr/lib/ } -md5sums="8446c69882d26c8bba38500b6e5577eb apk-tools-2.4.0.tar.xz" -sha256sums="ac717df2c512c43e6ea3dd103fcea725ee9135936fe6a177de5021c36735a578 apk-tools-2.4.0.tar.xz" -sha512sums="97dae73ed34e56349be5027d73720bdb8cf136b6bf0ede6f9fd5199386977d6c718f3593ea0f566aef0c5cdaf59e078f22a4bb1a22132b00dae82dc5927a8279 apk-tools-2.4.0.tar.xz" +md5sums="8446c69882d26c8bba38500b6e5577eb apk-tools-2.4.0.tar.xz +55768a1d97b570eec8940e89f0c0aca3 0001-db-allow-using-cached-packages-with-no-network.patch" +sha256sums="ac717df2c512c43e6ea3dd103fcea725ee9135936fe6a177de5021c36735a578 apk-tools-2.4.0.tar.xz +562f7d5c13ac18500e8e46b3fcae51ca801c34e7565aef712974258b12f2f693 0001-db-allow-using-cached-packages-with-no-network.patch" +sha512sums="97dae73ed34e56349be5027d73720bdb8cf136b6bf0ede6f9fd5199386977d6c718f3593ea0f566aef0c5cdaf59e078f22a4bb1a22132b00dae82dc5927a8279 apk-tools-2.4.0.tar.xz +9569bdb62447807377a78408aaf47a351e37fbde2f19cf96cc8fe2c1e11520d4e0713309512825f8c08e4f28e68854880e7fa88ba2cb2c39a2fd16044136a876 0001-db-allow-using-cached-packages-with-no-network.patch" |