diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2017-10-06 19:12:35 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2017-10-06 19:13:15 +0300 |
| commit | 50c45e8b4c00d87ba2619e40d25f4eeaae60ea04 (patch) | |
| tree | c9a0b1f87584a19a1ce39453a8d3acf25017c2d6 /main/apk-tools/0001-db-fix-regression-preventing-remounting-apk-cache-r-.patch | |
| parent | eed7d6f7845bd798668cbd420344a35252b81350 (diff) | |
| download | aports-50c45e8b4c00d87ba2619e40d25f4eeaae60ea04.tar.bz2 aports-50c45e8b4c00d87ba2619e40d25f4eeaae60ea04.tar.xz | |
main/apk-tools: upgrade to 2.8.0
Diffstat (limited to 'main/apk-tools/0001-db-fix-regression-preventing-remounting-apk-cache-r-.patch')
| -rw-r--r-- | main/apk-tools/0001-db-fix-regression-preventing-remounting-apk-cache-r-.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/main/apk-tools/0001-db-fix-regression-preventing-remounting-apk-cache-r-.patch b/main/apk-tools/0001-db-fix-regression-preventing-remounting-apk-cache-r-.patch deleted file mode 100644 index 7d5e478b55..0000000000 --- a/main/apk-tools/0001-db-fix-regression-preventing-remounting-apk-cache-r-.patch +++ /dev/null @@ -1,35 +0,0 @@ -From ede5165833b94051ecbc35e9ac4a359f54cc0116 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> -Date: Thu, 25 May 2017 18:04:41 +0300 -Subject: [PATCH] db: fix regression preventing remounting apk cache r/w - -Introduced in commit c0f2d88f342f4d185f3991f98b79ab61a03896e4. -fstatfs is needed to inspect the mount flags. ---- - src/database.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/database.c b/src/database.c -index 8230764..67cc4f5 100644 ---- a/src/database.c -+++ b/src/database.c -@@ -1603,7 +1603,7 @@ int apk_db_open(struct apk_database *db, struct apk_db_options *dbopts) - - /* figure out where to have the cache */ - fd = openat(db->root_fd, dbopts->cache_dir, O_RDONLY | O_CLOEXEC); -- if (fd >= 0) { -+ if (fd >= 0 && fstatfs(fd, &stfs) == 0) { - db->cache_dir = dbopts->cache_dir; - db->cache_fd = fd; - db->cache_remount_flags = map_statfs_flags(stfs.f_flags); -@@ -1622,6 +1622,7 @@ int apk_db_open(struct apk_database *db, struct apk_db_options *dbopts) - } - } - } else { -+ if (fd >= 0) close(fd); - db->cache_dir = apk_static_cache_dir; - db->cache_fd = openat(db->root_fd, db->cache_dir, O_RDONLY | O_CLOEXEC); - } --- -2.13.0 - |