graphics/exiv2: Update to 0.28.2

Fixes CVE-2024-24826, CVE-2024-25112 and CVE-2023-44398 (0.28.1) Changelog: https://github.com/Exiv2/exiv2/blob/v0.28.2/doc/ChangeLog PR: 277146 Sponsored by: Blinkinblox
freebsd · Mar 6, 2024 · 5a50cca · 5a50cca
1 parent edc147c
commit 5a50cca
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 136 deletions.
diff --git a/graphics/exiv2/Makefile b/graphics/exiv2/Makefile
@@ -1,20 +1,8 @@
 PORTNAME=	exiv2
-DISTVERSION=	0.28.0
-DISTVERSIONSUFFIX=	-Source
-PORTREVISION=	1
+DISTVERSIONPREFIX=	v
+DISTVERSION=	0.28.2
 PORTEPOCH=	1
 CATEGORIES=	graphics
-MASTER_SITES=	https://github.com/Exiv2/exiv2/releases/download/v${DISTVERSION}/
-
-# https://git.alpinelinux.org/aports/log/community/exiv2
-# https://github.com/Exiv2/exiv2/compare/v0.28.0...0.28.x
-PATCH_SITES=	https://github.com/Exiv2/exiv2/commit/
-PATCHFILES=	16c1cd7da0cd159ee2d53c39088564edaf046c77.patch:-p1 \
-		2876c8c5f70f71b5b51b0f26b31dd0dc08583212.patch:-p1 \
-		3664f5b826f5688b82470235d1dceef0c9c4c47d.patch:-p1 \
-		b4f435a4ecceba0ef3a785dbe8eead6f55f49cc1.patch:-p1 \
-		c5c4a54d4cf4ea544c30fe6780dab2755f404300.patch:-p1 \
-		f47e7bd666aa063d016bdf00ea8f62c97a5b5a7a.patch:-p1
 
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Exif, IPTC, and XMP metadata manipulation library and tools
@@ -31,19 +19,18 @@ LIB_DEPENDS=	libbrotlidec.so:archivers/brotli \
 USES=		cmake compiler:c++17-lang cpe dos2unix gettext-tools iconv \
 		localbase:ldflags pathfix shebangfix
 DOS2UNIX_FILES=	cmake/compilerFlags.cmake
-USE_LDCONFIG=	yes
 SHEBANG_FILES=	fuzz/mkdictionary.py tests/runner.py
+USE_LDCONFIG=	yes
 
-CMAKE_ARGS=	-DPython${PYTHON_MAJOR_VER}_EXECUTABLE:FILEPATH="${PYTHON_CMD}"
+USE_GITHUB=	yes
+GH_ACCOUNT=	Exiv2
 
 CMAKE_ON=	EXIV2_ENABLE_VIDEO
 CMAKE_OFF=	EXIV2_ENABLE_EXTERNAL_XMP
 
 LDFLAGS_mips=	-lintl
 LDFLAGS_mips64=	-lintl
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}-Source
-
 OPTIONS_DEFINE=	DOCS DOXYGEN NLS SAMPLE TEST
 OPTIONS_SUB=	yes
 
@@ -60,11 +47,12 @@ NLS_CMAKE_BOOL=	EXIV2_ENABLE_NLS
 
 SAMPLE_CMAKE_BOOL=	EXIV2_BUILD_SAMPLES
 
-TEST_IMPLIES=		SAMPLE
 TEST_LIB_DEPENDS=	libgtest.so:devel/googletest
 TEST_TEST_DEPENDS=	bash:shells/bash
 TEST_USES=		python:build,test
 TEST_CMAKE_BOOL=	EXIV2_BUILD_UNIT_TESTS
+TEST_CMAKE_ON=		-DPython${PYTHON_MAJOR_VER}_EXECUTABLE:FILEPATH="${PYTHON_CMD}"
 TEST_TEST_TARGET=	test
+TEST_IMPLIES=		SAMPLE
 
 .include <bsd.port.mk>
diff --git a/graphics/exiv2/distinfo b/graphics/exiv2/distinfo
@@ -1,15 +1,3 @@
-TIMESTAMP = 1688940824
-SHA256 (exiv2-0.28.0-Source.tar.gz) = 89af3b5ef7277753ef7a7b5374ae017c6b9e304db3b688f1948e73e103491f3d
-SIZE (exiv2-0.28.0-Source.tar.gz) = 44893310
-SHA256 (16c1cd7da0cd159ee2d53c39088564edaf046c77.patch) = a82d468d34ed0d656a19d1be529ed29efe19ced5e2c1d0a321b6d10b4ccbe3f7
-SIZE (16c1cd7da0cd159ee2d53c39088564edaf046c77.patch) = 4995
-SHA256 (2876c8c5f70f71b5b51b0f26b31dd0dc08583212.patch) = 43f6fd90aca09e6a8aa9400f1aad3b805766661ecf2b428dbe5b427ffaedde5d
-SIZE (2876c8c5f70f71b5b51b0f26b31dd0dc08583212.patch) = 2265
-SHA256 (3664f5b826f5688b82470235d1dceef0c9c4c47d.patch) = d301da6b22ea163497a17beb773d47c2fd254ed98032bd26c875b997c7bbe05b
-SIZE (3664f5b826f5688b82470235d1dceef0c9c4c47d.patch) = 12991
-SHA256 (b4f435a4ecceba0ef3a785dbe8eead6f55f49cc1.patch) = e3b0dce84cdacbdbb24c6c39772f6cdbba7e3e3101be540d7695d3d981c810e5
-SIZE (b4f435a4ecceba0ef3a785dbe8eead6f55f49cc1.patch) = 755
-SHA256 (c5c4a54d4cf4ea544c30fe6780dab2755f404300.patch) = df98e6aee22365742d5550f1b32b21a486145b7c798f1fea805ad3d690898ae1
-SIZE (c5c4a54d4cf4ea544c30fe6780dab2755f404300.patch) = 776
-SHA256 (f47e7bd666aa063d016bdf00ea8f62c97a5b5a7a.patch) = c2e1f84d0a86cf899fddd50b2741add3902c25a79925b32964a7c5187f4deabd
-SIZE (f47e7bd666aa063d016bdf00ea8f62c97a5b5a7a.patch) = 1125
+TIMESTAMP = 1707967147
+SHA256 (Exiv2-exiv2-v0.28.2_GH0.tar.gz) = 543bead934135f20f438e0b6d8858c55c5fcb7ff80f5d1d55489965f1aad58b9
+SIZE (Exiv2-exiv2-v0.28.2_GH0.tar.gz) = 45224206
diff --git a/graphics/exiv2/files/patch-_MSVC_LANG-warning-Wundef b/graphics/exiv2/files/patch-_MSVC_LANG-warning-Wundef
diff --git a/graphics/exiv2/files/patch-src_version.cpp b/graphics/exiv2/files/patch-src_version.cpp
diff --git a/graphics/exiv2/pkg-plist b/graphics/exiv2/pkg-plist
@@ -62,11 +62,12 @@ include/exiv2/version.hpp
 include/exiv2/webpimage.hpp
 include/exiv2/xmp_exiv2.hpp
 include/exiv2/xmpsidecar.hpp
-lib/cmake/exiv2/exiv2Config-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/exiv2/exiv2Config.cmake
 lib/cmake/exiv2/exiv2ConfigVersion.cmake
+lib/cmake/exiv2/exiv2Export-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/exiv2/exiv2Export.cmake
 lib/libexiv2.so
-lib/libexiv2.so.0.28.0
+lib/libexiv2.so.0.28.2
 lib/libexiv2.so.28
 libdata/pkgconfig/exiv2.pc
 share/man/man1/exiv2.1.gz