diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2017-10-27 16:14:51 +0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2017-10-27 16:15:32 +0300 |
| commit | e561a0805016b48dbbf772bb2e82f308d07ad2ba (patch) | |
| tree | 447ce58dfd020e53d0fe264416c27a2ba2cd3dff /main/apk-tools | |
| parent | 527423b0e8157bb5124c6fbb9ed8257a072a6ebf (diff) | |
| download | aports-e561a0805016b48dbbf772bb2e82f308d07ad2ba.tar.bz2 aports-e561a0805016b48dbbf772bb2e82f308d07ad2ba.tar.xz | |
main/apk-tools: upgrade to 2.8.1
Diffstat (limited to 'main/apk-tools')
| -rw-r--r-- | main/apk-tools/0001-db-handle-default-root-correctly-for-proc.patch | 28 | ||||
| -rw-r--r-- | main/apk-tools/APKBUILD | 8 |
2 files changed, 3 insertions, 33 deletions
diff --git a/main/apk-tools/0001-db-handle-default-root-correctly-for-proc.patch b/main/apk-tools/0001-db-handle-default-root-correctly-for-proc.patch deleted file mode 100644 index 44ebd8df8f..0000000000 --- a/main/apk-tools/0001-db-handle-default-root-correctly-for-proc.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 97e4d0531f2633b54996fc08447bb46449f4a45a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> -Date: Tue, 10 Oct 2017 11:38:07 +0300 -Subject: [PATCH] db: handle default root correctly for /proc - -dbopts->root may be null; use db->root instead - -fixes #7162 ---- - src/database.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/database.c b/src/database.c -index 12f1d16..a35bab2 100644 ---- a/src/database.c -+++ b/src/database.c -@@ -1581,7 +1581,7 @@ int apk_db_open(struct apk_database *db, struct apk_db_options *dbopts) - apk_blob_to_file(db->root_fd, apk_arch_file, *db->arch, APK_BTF_ADD_EOL); - - /* mount /proc */ -- if (asprintf(&db->root_proc_dir, "%s/proc", dbopts->root) == -1) -+ if (asprintf(&db->root_proc_dir, "%s/proc", db->root) == -1) - goto ret_errno; - if (statfs(db->root_proc_dir, &stfs) != 0) { - if (errno == ENOENT) mkdir(db->root_proc_dir, 0555); --- -2.14.2 - diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD index 862aab4119..45ce2fa2b2 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.8.0 -pkgrel=1 +pkgver=2.8.1 +pkgrel=0 pkgdesc="Alpine Package Keeper - package manager for alpine" subpackages="$pkgname-static" depends= @@ -13,7 +13,6 @@ if [ "$CBUILD" = "$CHOST" ]; then makedepends="$makedepends lua5.2-dev" fi source="http://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz - 0001-db-handle-default-root-correctly-for-proc.patch " url="http://git.alpinelinux.org/cgit/apk-tools/" @@ -83,5 +82,4 @@ luaapk() { mv "$pkgdir"/usr/lib "$subpkgdir"/usr/lib/ } -sha512sums="dc23d83bf8faeacb17426792b1c25c9540dd8379015f2be729dc03c4b65e6ed4463eb879e0f0e72fc36a1185d56fdd3c4fbb13476fe8d7cb415f1730362ac718 apk-tools-2.8.0.tar.xz -48e4b95fc11df29e721f4cc51f14802bf5acfd54cd5b6754b544a0e6846e6d7272719ef028c9e4ba54eeb70f9b7e846cd4db936595392d35e9c5fde2d837ad36 0001-db-handle-default-root-correctly-for-proc.patch" +sha512sums="be36afe5af7beca5f5895c835690ffe7683b70cce6bfef9bc880103f5872a157e7192c172eb23dcd64905ee4e029ee75ee19310d24b267aa94656696b1944466 apk-tools-2.8.1.tar.xz" |