From 41ba180fc2dfcdb5516769593fdc06dacfc22e2d Mon Sep 17 00:00:00 2001
From: Max Rees <maxcrees@me.com>
Date: Thu, 20 Jun 2019 19:01:52 -0400
Subject: user/exiv2: [CVE] bump to 0.27.1, add tests

---
 user/exiv2/APKBUILD | 98 +++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 76 insertions(+), 22 deletions(-)

(limited to 'user/exiv2/APKBUILD')

diff --git a/user/exiv2/APKBUILD b/user/exiv2/APKBUILD
index 7cf8693fe..963fe871c 100644
--- a/user/exiv2/APKBUILD
+++ b/user/exiv2/APKBUILD
@@ -1,47 +1,101 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=exiv2
-pkgver=0.26
-pkgrel=2
+pkgver=0.27.1
+pkgrel=0
 pkgdesc="Exif, IPTC and XMP metadata library and tools"
 url="https://www.exiv2.org/"
 arch="all"
-options="!check"  # No test suite.
 license="GPL-2.0+"
 depends=""
 depends_dev="expat-dev zlib-dev"
-makedepends="$depends_dev bash"
+makedepends="$depends_dev bash cmake"
+checkdepends="python3 libxml2 cmd:which"
 subpackages="$pkgname-dev $pkgname-doc"
-source="http://www.exiv2.org/builds/exiv2-$pkgver-trunk.tar.gz
-	0000-pthread-init-fix.patch
-	0001-Amend-fix-for-9-to-apply-to-other-Unix-systems.patch
-	CVE-2018-19535.patch
-	"
-builddir="$srcdir"/exiv2-trunk
+source="http://www.exiv2.org/builds/exiv2-$pkgver-Source.tar.gz"
+builddir="$srcdir/$pkgname-$pkgver-Source"
 
 # secfixes:
 #   0.26-r2:
 #     - CVE-2018-19535
+#   0.27.1-r0:
+#     - CVE-2017-9239
+#     - CVE-2017-9953
+#     - CVE-2017-11336
+#     - CVE-2017-11337
+#     - CVE-2017-11338
+#     - CVE-2017-11339
+#     - CVE-2017-11340
+#     - CVE-2017-11553
+#     - CVE-2017-11591
+#     - CVE-2017-11592
+#     - CVE-2017-11683
+#     - CVE-2017-12955
+#     - CVE-2017-12956
+#     - CVE-2017-12957
+#     - CVE-2017-14857
+#     - CVE-2017-14858
+#     - CVE-2017-14859
+#     - CVE-2017-14860
+#     - CVE-2017-14861
+#     - CVE-2017-14862
+#     - CVE-2017-14863
+#     - CVE-2017-14864
+#     - CVE-2017-14865
+#     - CVE-2017-14866
+#     - CVE-2017-17669
+#     - CVE-2017-17722
+#     - CVE-2017-17723
+#     - CVE-2017-17724
+#     - CVE-2017-17725
+#     - CVE-2017-18005
+#     - CVE-2017-1000126
+#     - CVE-2017-1000127
+#     - CVE-2017-1000128
+#     - CVE-2018-4868
+#     - CVE-2018-5772
+#     - CVE-2018-8976
+#     - CVE-2018-8977
+#     - CVE-2018-9145
+#     - CVE-2018-10772
+#     - CVE-2018-10780
+#     - CVE-2018-10958
+#     - CVE-2018-10998
+#     - CVE-2018-10999
+#     - CVE-2018-11037
+#     - CVE-2018-11531
+#     - CVE-2018-12264
+#     - CVE-2018-12265
+#     - CVE-2018-14046
+#     - CVE-2018-14338
+#     - CVE-2018-16336
+#     - CVE-2018-17229
+#     - CVE-2018-17230
+#     - CVE-2018-17282
+#     - CVE-2018-17581
+#     - CVE-2018-19107
+#     - CVE-2018-19108
 
 prepare() {
-	cd "$builddir"
 	default_prepare
-	update_config_sub
+	mkdir build
 }
+
 build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr
+	cd "$builddir/build"
+	cmake -DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=/usr/lib \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo ..
 	make
 }
 
+check() {
+	cd "$builddir/build"
+	make tests
+}
+
 package() {
-	cd "$builddir"
+	cd "$builddir/build"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="d1e9cab886e279b045768dd9ec781f07d2d36d573119403d0b76dc571442173aae6972f86ec55c3ea53fb3ee9ca3571eb8fd63a2a6643a970852813e88634a86  exiv2-0.26-trunk.tar.gz
-9721d359708c385be7c86a8f8a63de43b05b2578a29b4339861e82873aa81a98a7ee7252847b6c55529341187d40f552c488589b416fd9d1e27418925929c018  0000-pthread-init-fix.patch
-485bd340169f69a3ce356e59e9138250cc14592f4477bb73827c799fe465535954469634fc58a1856f690f0e0b4171cba6fdd3391d43c0efc5e89652b93eb3ce  0001-Amend-fix-for-9-to-apply-to-other-Unix-systems.patch
-ac145a9b4df21e7f5fdd3099e6ae4c1e12ae2cdccc455d0262c5d38b8e07ce6437036a19264bd04b1cb1fffd01d89672044ca82fddd5e71dcd0d84d48356ab12  CVE-2018-19535.patch"
+sha512sums="038b51241f5bfb323eb298695b5397a7d88d5c7d7303828e5e20b3f82c3df2615cee3e7e3426ea17438ca05d5abea10984cfd41f0649ddab72df1d1415bf3529  exiv2-0.27.1-Source.tar.gz"
-- 
cgit v1.2.3-60-g2f50