From 580cc8c0749e610d18140fb76cb365436c8ee3bd Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Fri, 10 Jun 2022 01:31:32 -0500
Subject: user/exiv2: Update to 0.27.5

Do not use Git version.  This is an API-incompatible, presently
unstable and undefined 1.0 API/ABI that cannot be used with software
targeting the 0.27 API/ABI.

Fixes: #497, #498, #499, #506, #710, #745 (though it is invalid),
       #746, #747
---
 user/exiv2/APKBUILD            | 21 ++++++++++++---------
 user/exiv2/musl-strerror.patch | 20 ++++++++++++++++++++
 2 files changed, 32 insertions(+), 9 deletions(-)
 create mode 100644 user/exiv2/musl-strerror.patch

diff --git a/user/exiv2/APKBUILD b/user/exiv2/APKBUILD
index 7692ff535..7f8f5ea1e 100644
--- a/user/exiv2/APKBUILD
+++ b/user/exiv2/APKBUILD
@@ -1,8 +1,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=exiv2
-pkgver=0.27.5_git20220205
+pkgver=0.27.5
 pkgrel=0
-_commit=46c329081f147d68ba38e7256481d8e432cac64c
 pkgdesc="Exif, IPTC and XMP metadata library and tools"
 url="https://www.exiv2.org/"
 arch="all"
@@ -12,12 +11,11 @@ depends_dev="expat-dev zlib-dev"
 checkdepends="python3 libxml2 cmd:which"
 makedepends="$depends_dev bash cmake gtest gtest-dev"
 subpackages="$pkgname-dev $pkgname-doc"
-#source="https://github.com/Exiv2/exiv2/releases/download/v$pkgver/exiv2-$pkgver-Source.tar.gz
-source="exiv2-${pkgver}_${_commit}.tar.gz::https://github.com/Exiv2/exiv2/archive/$_commit.tar.gz
+source="https://github.com/Exiv2/exiv2/releases/download/v$pkgver/exiv2-$pkgver-Source.tar.gz
 	disable-icc-test.patch
+	musl-strerror.patch
 	"
-#builddir="$srcdir/$pkgname-$pkgver-Source"
-builddir="$srcdir/$pkgname-$_commit"
+builddir="$srcdir/$pkgname-$pkgver-Source"
 
 # secfixes:
 #   0.26-r2:
@@ -101,12 +99,17 @@ build() {
 }
 
 check() {
-	cmake --build build --target test
+	# addition overflow doesn't occur on 64-bit platforms
+	rm -f tests/bugfixes/github/test_CVE_2018_12265.py
+	# endian-dependent JP2 stuff
+	rm -f tests/bugfixes/github/test_issue_1522.py
+	make -C build tests
 }
 
 package() {
 	make DESTDIR="$pkgdir" -C build install
 }
 
-sha512sums="6674699ba229adb393beb76c1dd42ca2631c62085104fce3ef2d3db0e973837376212f33992774e486f7f0ee7b49cb206bd08092cf93c3e99b9571365bf8bc1f  exiv2-0.27.5_git20220205_46c329081f147d68ba38e7256481d8e432cac64c.tar.gz
-2fffbcd214db0e917479b970937769b66eb52cd41c34b3c676a17fa7ca7e327b61014c160d56257981459040ce7ab4cf2516db09b4095473e002a75101de6631  disable-icc-test.patch"
+sha512sums="0f2d2dfbc976052a428dfeb597225d3ea3c725f584d05b99316bd4aa9cbf0ba5e1e37bcde71f9041975cf003b4fdb578c559adb144268d784bfd64494f451491  exiv2-0.27.5-Source.tar.gz
+2fffbcd214db0e917479b970937769b66eb52cd41c34b3c676a17fa7ca7e327b61014c160d56257981459040ce7ab4cf2516db09b4095473e002a75101de6631  disable-icc-test.patch
+d148225d634dbdaeceb8fe57f4752a270c428bf0d05900322f7783f0c874a375198f96697c0aa3c4f972346aca44db3c08f15bba2eb40a2247f174dee8a1d150  musl-strerror.patch"
diff --git a/user/exiv2/musl-strerror.patch b/user/exiv2/musl-strerror.patch
new file mode 100644
index 000000000..c425eaf8d
--- /dev/null
+++ b/user/exiv2/musl-strerror.patch
@@ -0,0 +1,20 @@
+--- exiv2-0.27.5-Source/unitTests/test_futils.cpp.old	2021-10-21 12:01:10.000000000 -0500
++++ exiv2-0.27.5-Source/unitTests/test_futils.cpp	2022-06-10 01:07:12.090519526 -0500
+@@ -53,7 +53,7 @@
+ #elif defined(__NetBSD__)
+     const char * expectedString = "Undefined error: 0 (errno = 0)";
+ #else
+-    const char * expectedString = "Success (errno = 0)";
++    const char * expectedString = "No error information (errno = 0)";
+ #endif
+     std::remove(tmpFile.c_str());
+     ASSERT_STREQ(expectedString, strError().c_str());
+@@ -81,7 +81,7 @@
+ #elif defined(__NetBSD__)
+     const char * expectedString = "Unknown error: 9999 (errno = 9999)";
+ #else
+-    const char * expectedString = "Unknown error 9999 (errno = 9999)";
++    const char * expectedString = "No error information (errno = 9999)";
+ #endif
+     ASSERT_STREQ(expectedString, strError().c_str());
+ }
-- 
cgit v1.2.3-70-g09d2