summaryrefslogtreecommitdiff
path: root/user/exiv2/APKBUILD
diff options
context:
space:
mode:
authorZach van Rijn <me@zv.io>2022-02-05 19:00:47 +0000
committerZach van Rijn <me@zv.io>2022-10-21 18:33:57 -0500
commita786aceb56e767c3c552b3d66b68017ce0676b06 (patch)
treeb46f24c84274e2a9144e509339290699bab01066 /user/exiv2/APKBUILD
parentcdcbc714c69b57d1b25e82965eb1c4056f63a350 (diff)
downloadpackages-a786aceb56e767c3c552b3d66b68017ce0676b06.tar.gz
packages-a786aceb56e767c3c552b3d66b68017ce0676b06.tar.bz2
packages-a786aceb56e767c3c552b3d66b68017ce0676b06.tar.xz
packages-a786aceb56e767c3c552b3d66b68017ce0676b06.zip
user/exiv2: bump { 0.27.2 --> 0.27.5+git (20220205) }. fixes #497, #498, #499.
Diffstat (limited to 'user/exiv2/APKBUILD')
-rw-r--r--user/exiv2/APKBUILD42
1 files changed, 14 insertions, 28 deletions
diff --git a/user/exiv2/APKBUILD b/user/exiv2/APKBUILD
index fb710b602..7692ff535 100644
--- a/user/exiv2/APKBUILD
+++ b/user/exiv2/APKBUILD
@@ -1,7 +1,8 @@
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=exiv2
-pkgver=0.27.2
-pkgrel=2
+pkgver=0.27.5_git20220205
+pkgrel=0
+_commit=46c329081f147d68ba38e7256481d8e432cac64c
pkgdesc="Exif, IPTC and XMP metadata library and tools"
url="https://www.exiv2.org/"
arch="all"
@@ -9,15 +10,14 @@ license="GPL-2.0+"
depends=""
depends_dev="expat-dev zlib-dev"
checkdepends="python3 libxml2 cmd:which"
-makedepends="$depends_dev bash cmake"
+makedepends="$depends_dev bash cmake gtest gtest-dev"
subpackages="$pkgname-dev $pkgname-doc"
-source="http://www.exiv2.org/builds/exiv2-$pkgver-Source.tar.gz
- https://dev.sick.bike/dist/exiv2-$pkgver-POC-file_issue_1019
- https://dev.sick.bike/dist/exiv2-$pkgver-Jp2Image_readMetadata_loop.poc
- CVE-2019-17402.patch
- CVE-2019-20421.patch
+#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
+ disable-icc-test.patch
"
-builddir="$srcdir/$pkgname-$pkgver-Source"
+#builddir="$srcdir/$pkgname-$pkgver-Source"
+builddir="$srcdir/$pkgname-$_commit"
# secfixes:
# 0.26-r2:
@@ -92,35 +92,21 @@ builddir="$srcdir/$pkgname-$pkgver-Source"
# 0.27.2-r2:
# - CVE-2019-20421
-prepare() {
- default_prepare
-
- # Remove #1019 POC after >= 0.27.2
- mv "$srcdir/$pkgname-$pkgver-POC-file_issue_1019" \
- test/data/POC-file_issue_1019
-
- # Ditto
- mv "$srcdir/$pkgname-$pkgver-Jp2Image_readMetadata_loop.poc" \
- test/data/Jp2Image_readMetadata_loop.poc
-}
-
build() {
cmake -DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=/usr/lib \
- -DCMAKE_BUILD_TYPE=RelWithDebInfo -Bbuild
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo -Bbuild \
+ -DEXIV2_BUILD_UNIT_TESTS=On
make -C build
}
check() {
- make -C build tests
+ cmake --build build --target test
}
package() {
make DESTDIR="$pkgdir" -C build install
}
-sha512sums="39eb7d920dce18b275ac66f4766c7c73f7c72ee10e3e1e43d84c611b24f48ce20a70eac6d53948914e93242a25b8b52cc4bc760ee611ddcd77481306c1f9e721 exiv2-0.27.2-Source.tar.gz
-cfe0b534c29c37e7b6e5a00e8ec320cb57eb17187813fe30677a097e930655f1b097ce77806e0124affbdc423b48d9910560158eed9d2d03418a824244dafba9 exiv2-0.27.2-POC-file_issue_1019
-d2c0f59e9e2daf00066b0ad73253bb7bb09b3319606813f16478ef5717751e4cbb93d12f5c9339dae2965dcf6a63138bdb4205b698aeab57a75f97ddf458d4f7 exiv2-0.27.2-Jp2Image_readMetadata_loop.poc
-623232624f5382c7261a8b7e66063954c37555b7812e4f2e9af8433c4d8a1f141feafbfd2c5081395208cf1c65307ce1b39e5e34f689c558dce82f78030b29dd CVE-2019-17402.patch
-c819f06a194b8465c66ccd91b8373cb2a359e59bab7583a8abb873c2001efe6188ac8fa4717c6382d2f2396d25e79e7b397c5ebf000d35c4a7dae547db7bc77b CVE-2019-20421.patch"
+sha512sums="6674699ba229adb393beb76c1dd42ca2631c62085104fce3ef2d3db0e973837376212f33992774e486f7f0ee7b49cb206bd08092cf93c3e99b9571365bf8bc1f exiv2-0.27.5_git20220205_46c329081f147d68ba38e7256481d8e432cac64c.tar.gz
+2fffbcd214db0e917479b970937769b66eb52cd41c34b3c676a17fa7ca7e327b61014c160d56257981459040ce7ab4cf2516db09b4095473e002a75101de6631 disable-icc-test.patch"