main/apk-tools: upgrade to 2.3.1

4 files changed, 3 insertions, 105 deletions

diff --git a/main/apk-tools/0001-info-fix-exit-code-for-e.patch b/main/apk-tools/0001-info-fix-exit-code-for-e.patch
deleted file mode 100644
index 2395cb38eb..0000000000
--- a/main/apk-tools/0001-info-fix-exit-code-for-e.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From ebaf8305b5c9cc5bdc5d640f4cb25e058f7a2c26 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Fri, 30 Mar 2012 09:20:21 +0300
-Subject: [PATCH 1/2] info: fix exit code for -e
-
-fixes #1069
----
- src/info.c |    9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/src/info.c b/src/info.c
-index ef7bf9b..e9f1b59 100644
---- a/src/info.c
-+++ b/src/info.c
-@@ -71,7 +71,7 @@ static int info_exists(struct info_ctx *ctx, struct apk_database *db,
- {
- 	struct apk_name *name;
- 	struct apk_dependency dep;
--	int i, j, ok = 0;
-+	int i, j, ok, rc = 0;
- 
- 	for (i = 0; i < argc; i++) {
- 		apk_blob_t b = APK_BLOB_STR(argv[i]);
-@@ -84,6 +84,7 @@ static int info_exists(struct info_ctx *ctx, struct apk_database *db,
- 		if (name == NULL)
- 			continue;
- 
-+		ok = 0;
- 		for (j = 0; j < name->providers->num; j++) {
- 			struct apk_provider *p = &name->providers->item[j];
- 			if (p->pkg->ipkg == NULL)
-@@ -91,11 +92,13 @@ static int info_exists(struct info_ctx *ctx, struct apk_database *db,
- 			if (!apk_dep_is_provided(&dep, p))
- 				continue;
- 			verbose_print_pkg(p->pkg, 0);
-+			ok = 1;
- 		}
--		ok++;
-+		if (!ok)
-+			rc++;
- 	}
- 
--	return argc - ok;
-+	return rc;
- }
- 
- static int info_who_owns(struct info_ctx *ctx, struct apk_database *db,
--- 
-1.7.9.4
-
diff --git a/main/apk-tools/0002-solver-fix-installation-of-non-repository-packages.patch b/main/apk-tools/0002-solver-fix-installation-of-non-repository-packages.patch
deleted file mode 100644
index f280344194..0000000000
--- a/main/apk-tools/0002-solver-fix-installation-of-non-repository-packages.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a57db1bba098808ed3545579833ce4372ee4ba20 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Sat, 31 Mar 2012 23:27:15 +0300
-Subject: [PATCH 2/2] solver: fix installation of non-repository packages
-
----
- src/solver.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/solver.c b/src/solver.c
-index 820f840..c26fd7b 100644
---- a/src/solver.c
-+++ b/src/solver.c
-@@ -1116,7 +1116,8 @@ static int reconsider_name(struct apk_solver_state *ss, struct apk_name *name)
- 
- 		if (ps0 == NULL || ps0->locked || ps0->conflicts ||
- 		    ss->topology_position < pkg0->topology_hard ||
--		    (pkg0->ipkg == NULL && (!ps0->allowed || !pkg_available(ss->db, pkg0))))
-+		    (pkg0->ipkg == NULL && pkg0->filename == NULL &&
-+		     (!ps0->allowed || !pkg_available(ss->db, pkg0))))
- 			continue;
- 
- 		for (j = 0; j < pkg0->provides->num; j++) {
--- 
-1.7.9.4
-
diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD
index a65aeeb5cb..4eabd16fce 100644
--- a/main/apk-tools/APKBUILD
+++ b/main/apk-tools/APKBUILD
@@ -1,15 +1,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=apk-tools
-pkgver=2.3.0
-pkgrel=4
+pkgver=2.3.1
+pkgrel=0
 pkgdesc="Alpine Package Keeper - package manager for alpine"
 subpackages="$pkgname-static lua-apk:luaapk"
 depends=
 makedepends="zlib-dev openssl-dev lua-dev"
 source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2
-	0001-info-fix-exit-code-for-e.patch
-	0002-solver-fix-installation-of-non-repository-packages.patch
-	audit-recurse.patch
 	"
 
 url="http://git.alpinelinux.org/cgit/apk-tools/"
@@ -61,7 +58,4 @@ luaapk() {
 	mv "$pkgdir"/usr/lib "$subpkgdir"/usr/lib/
 }
 
-md5sums="f87882b3ddad44282459ee40b143ad1a  apk-tools-2.3.0.tar.bz2
-eab1caf0fa9a889605efcb5b147e594d  0001-info-fix-exit-code-for-e.patch
-a8d15a4a1ce915695735d897a2227c2b  0002-solver-fix-installation-of-non-repository-packages.patch
-99503e540fa223ee2b6c54b9b84d2571  audit-recurse.patch"
+md5sums="e343935cc2680a42f3da0f442045f046  apk-tools-2.3.1.tar.bz2"
diff --git a/main/apk-tools/audit-recurse.patch b/main/apk-tools/audit-recurse.patch
deleted file mode 100644
index a7675531c0..0000000000
--- a/main/apk-tools/audit-recurse.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/src/database.c b/src/database.c
-index ae6810b..26774be 100644
---- a/src/database.c
-+++ b/src/database.c
-@@ -353,7 +353,6 @@ struct apk_db_dir *apk_db_dir_get(struct apk_database *db, apk_blob_t name)
- 				.protected = ppath->protected,
- 				.symlinks_only = ppath->symlinks_only,
- 			};
--			dir->has_protected_children |= ppath->protected;
- 		} else {
- 			if (fnmatch(ppath->relative_pattern, relative_name, FNM_PATHNAME) != 0)
- 				continue;
-@@ -361,6 +360,7 @@ struct apk_db_dir *apk_db_dir_get(struct apk_database *db, apk_blob_t name)
- 			dir->protected = ppath->protected;
- 			dir->symlinks_only = ppath->symlinks_only;
- 		}
-+		dir->has_protected_children |= ppath->protected;
- 	}
- 
- 	return dir;