diff options
| -rw-r--r-- | main/apk-tools/0001-prevent-automatic-repository-index-update-with-no-ne.patch | 29 | ||||
| -rw-r--r-- | main/apk-tools/APKBUILD | 9 |
2 files changed, 35 insertions, 3 deletions
diff --git a/main/apk-tools/0001-prevent-automatic-repository-index-update-with-no-ne.patch b/main/apk-tools/0001-prevent-automatic-repository-index-update-with-no-ne.patch new file mode 100644 index 0000000000..67fd7eab73 --- /dev/null +++ b/main/apk-tools/0001-prevent-automatic-repository-index-update-with-no-ne.patch @@ -0,0 +1,29 @@ +From 13c534db7755865380bfd930aa384aebc16347e6 Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Tue, 21 Aug 2018 12:24:26 +0000 +Subject: [PATCH] prevent automatic repository index update with --no-network + +We should not update repository index when --no-network is specified. + +ref #9126 +--- + src/database.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/database.c b/src/database.c +index 70a1053..eea7177 100644 +--- a/src/database.c ++++ b/src/database.c +@@ -1520,7 +1520,8 @@ int apk_db_open(struct apk_database *db, struct apk_db_options *dbopts) + goto ret_r; + } + if ((dbopts->open_flags & APK_OPENF_WRITE) && +- !(dbopts->open_flags & APK_OPENF_NO_AUTOUPDATE)) ++ !(dbopts->open_flags & APK_OPENF_NO_AUTOUPDATE) && ++ !(apk_flags & APK_NO_NETWORK)) + db->autoupdate = 1; + if (!dbopts->cache_dir) dbopts->cache_dir = "etc/apk/cache"; + +-- +2.18.0 + diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD index e82a2baa63..430bab1cb8 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.9.1 -pkgrel=3 +pkgrel=4 pkgdesc="Alpine Package Keeper - package manager for alpine" subpackages="$pkgname-static" depends= @@ -15,7 +15,9 @@ fi source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz 0001-solver-allow-names-with-only-one-provider-to-be-auto.patch 0002-db-fix-refreshing-index-if-time-is-zero.patch - 0001-prevent-automatic-repository-index-update-for-apk-de.patch" + 0001-prevent-automatic-repository-index-update-for-apk-de.patch + 0001-prevent-automatic-repository-index-update-with-no-ne.patch + " url="https://git.alpinelinux.org/cgit/apk-tools/" arch="all" @@ -87,4 +89,5 @@ luaapk() { sha512sums="4ffb8d1716bbb94421b1cc4277beb47d369c429f4c3bf597d08949abb7586d30c4504edf2f775bea3b93614a280c12391b956ca8f914fb0ec27799a4a005a145 apk-tools-2.9.1.tar.xz 5ca2d2f2646032ed8f9f86357e986b054045a80ddb944be6a540566ff7092f38591ec8dfc7ac06b9daededa95e86c0e892ead55f9e8907eb318aed76644f7f97 0001-solver-allow-names-with-only-one-provider-to-be-auto.patch 6852e1dfce1af502ecd5beadcad920fbde0ec3e34b1dcd010ed80d8f9a44816a51430d6e85b4fe713128ca2d3dc859f53570df39dd5b67fee4a5206b0f85aee8 0002-db-fix-refreshing-index-if-time-is-zero.patch -7e5e68f44d749b391f318afb4ee56964754a8560e1f073c0f07e47e58ccf035addff5843a195968d16c2e71c8dc9876ce97aad45dab090f0d488f79f22e85907 0001-prevent-automatic-repository-index-update-for-apk-de.patch" +7e5e68f44d749b391f318afb4ee56964754a8560e1f073c0f07e47e58ccf035addff5843a195968d16c2e71c8dc9876ce97aad45dab090f0d488f79f22e85907 0001-prevent-automatic-repository-index-update-for-apk-de.patch +17071687e532b00c9f276bb7e42369ec04231b15d223fd3eb803a51eb5cd4f2611d9c7525d905482a42e9b9fc293274887a411a2bf7520eee0607de2bf7a1268 0001-prevent-automatic-repository-index-update-with-no-ne.patch" |