sys-apps/apk-tools: version bump

1 files changed, 28 insertions, 0 deletions

diff --git a/sys-apps/apk-tools/files/apk-tools-2.6.6-revisions-are-equal.patch b/sys-apps/apk-tools/files/apk-tools-2.6.6-revisions-are-equal.patch
new file mode 100644
index 000000000..d227d560c
--- /dev/null
+++ b/sys-apps/apk-tools/files/apk-tools-2.6.6-revisions-are-equal.patch
@@ -0,0 +1,28 @@
+From 072a8a45280f38317f2d9676e0a4c5f973635e20 Mon Sep 17 00:00:00 2001
+From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
+Date: Fri, 22 Jul 2016 04:32:12 -0500
+Subject: [PATCH] version: consider pkg-rX and pkg to be the same version
+
+---
+ src/version.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/version.c b/src/version.c
+index 212a5d1..5a790b5 100644
+--- a/src/version.c
++++ b/src/version.c
+@@ -218,6 +218,11 @@ 
+ 	if (at == bt)
+ 		return APK_VERSION_EQUAL;
+ 
++	/* if only difference is pkgrev, they are equal. */
++	if ((at == TOKEN_REVISION_NO && bt == TOKEN_END) ||
++	    (at == TOKEN_END && bt == TOKEN_REVISION_NO))
++		return APK_VERSION_EQUAL;
++
+ 	/* leading version components and their values are equal,
+ 	 * now the non-terminating version is greater unless it's a suffix
+ 	 * indicating pre-release */
+-- 
+2.9.2
+