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:21:42 +0000 |
commit | 0dd5628d31b3fa085e1fdc5fa73a69ecf6585df0 (patch) | |
tree | 7f080073aed78ca8d08e9b337625d977cdd854f4 | |
parent | e7252ceecb1ebb6318e1c0b4c1275c29c655dd6a (diff) | |
download | alpine_aports-0dd5628d31b3fa085e1fdc5fa73a69ecf6585df0.tar.bz2 alpine_aports-0dd5628d31b3fa085e1fdc5fa73a69ecf6585df0.tar.xz alpine_aports-0dd5628d31b3fa085e1fdc5fa73a69ecf6585df0.zip |
main/apk-tools: allow using cached packages with --no-network
fixes regression
(cherry picked from commit 75ea8ec353150e962c6a97ffa4355199030c7824)
Conflicts:
main/apk-tools/APKBUILD
-rw-r--r-- | main/apk-tools/0001-db-allow-using-cached-packages-with-no-network.patch | 25 | ||||
-rw-r--r-- | main/apk-tools/APKBUILD | 15 |
2 files changed, 35 insertions, 5 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 @@ | |||
1 | From a6c4103df550ec7c1d99af6a5573c2e3f946b408 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> | ||
3 | Date: Wed, 2 Oct 2013 16:06:10 +0300 | ||
4 | Subject: [PATCH] db: allow using cached packages with --no-network | ||
5 | |||
6 | --- | ||
7 | src/database.c | 2 +- | ||
8 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
9 | |||
10 | diff --git a/src/database.c b/src/database.c | ||
11 | index afe0a8c..9eadb44 100644 | ||
12 | --- a/src/database.c | ||
13 | +++ b/src/database.c | ||
14 | @@ -2151,7 +2151,7 @@ int apk_db_add_repository(apk_database_t _db, apk_blob_t _repository) | ||
15 | db->available_repos &= ~BIT(repo_num); | ||
16 | r = 0; | ||
17 | } else { | ||
18 | - db->repo_tags[tag_id].allowed_repos |= BIT(repo_num) & db->available_repos; | ||
19 | + db->repo_tags[tag_id].allowed_repos |= BIT(repo_num); | ||
20 | } | ||
21 | |||
22 | return 0; | ||
23 | -- | ||
24 | 1.8.4 | ||
25 | |||
diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD index 0ad19e10bc..e5b43429a8 100644 --- a/main/apk-tools/APKBUILD +++ b/main/apk-tools/APKBUILD | |||
@@ -1,12 +1,14 @@ | |||
1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> | 1 | # Maintainer: Natanael Copa <ncopa@alpinelinux.org> |
2 | pkgname=apk-tools | 2 | pkgname=apk-tools |
3 | pkgver=2.4.0 | 3 | pkgver=2.4.0 |
4 | pkgrel=0 | 4 | pkgrel=1 |
5 | pkgdesc="Alpine Package Keeper - package manager for alpine" | 5 | pkgdesc="Alpine Package Keeper - package manager for alpine" |
6 | subpackages="$pkgname-static lua-apk:luaapk" | 6 | subpackages="$pkgname-static lua-apk:luaapk" |
7 | depends= | 7 | depends= |
8 | makedepends="zlib-dev openssl-dev lua-dev" | 8 | makedepends="zlib-dev openssl-dev lua-dev" |
9 | source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz" | 9 | source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz |
10 | 0001-db-allow-using-cached-packages-with-no-network.patch | ||
11 | " | ||
10 | 12 | ||
11 | url="http://git.alpinelinux.org/cgit/apk-tools/" | 13 | url="http://git.alpinelinux.org/cgit/apk-tools/" |
12 | arch="all" | 14 | arch="all" |
@@ -71,6 +73,9 @@ luaapk() { | |||
71 | mv "$pkgdir"/usr/lib "$subpkgdir"/usr/lib/ | 73 | mv "$pkgdir"/usr/lib "$subpkgdir"/usr/lib/ |
72 | } | 74 | } |
73 | 75 | ||
74 | md5sums="8446c69882d26c8bba38500b6e5577eb apk-tools-2.4.0.tar.xz" | 76 | md5sums="8446c69882d26c8bba38500b6e5577eb apk-tools-2.4.0.tar.xz |
75 | sha256sums="ac717df2c512c43e6ea3dd103fcea725ee9135936fe6a177de5021c36735a578 apk-tools-2.4.0.tar.xz" | 77 | 55768a1d97b570eec8940e89f0c0aca3 0001-db-allow-using-cached-packages-with-no-network.patch" |
76 | sha512sums="97dae73ed34e56349be5027d73720bdb8cf136b6bf0ede6f9fd5199386977d6c718f3593ea0f566aef0c5cdaf59e078f22a4bb1a22132b00dae82dc5927a8279 apk-tools-2.4.0.tar.xz" | 78 | sha256sums="ac717df2c512c43e6ea3dd103fcea725ee9135936fe6a177de5021c36735a578 apk-tools-2.4.0.tar.xz |
79 | 562f7d5c13ac18500e8e46b3fcae51ca801c34e7565aef712974258b12f2f693 0001-db-allow-using-cached-packages-with-no-network.patch" | ||
80 | sha512sums="97dae73ed34e56349be5027d73720bdb8cf136b6bf0ede6f9fd5199386977d6c718f3593ea0f566aef0c5cdaf59e078f22a4bb1a22132b00dae82dc5927a8279 apk-tools-2.4.0.tar.xz | ||
81 | 9569bdb62447807377a78408aaf47a351e37fbde2f19cf96cc8fe2c1e11520d4e0713309512825f8c08e4f28e68854880e7fa88ba2cb2c39a2fd16044136a876 0001-db-allow-using-cached-packages-with-no-network.patch" | ||