Attachment #243106 for bug #272311

View | Details | Raw Unified | Return to bug 272311 | Differences between

and this patch




PORTNAME=	exiv2
DISTVERSION=	0.28.0
DISTVERSIONSUFFIX=	-Source
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
WWW=		https://www.exiv2.org/

LICENSE=	GPLv2+
LICENSE_FILE=	${WRKSRC}/COPYING

LIB_DEPENDS=	libbrotlidec.so:archivers/brotli \
		libexpat.so:textproc/expat2 \
		libinih.so:devel/inih \
		libpng.so:graphics/png

USES=		cmake compiler:c++17-lang cpe dos2unix gettext-tools iconv \
		localbase:ldflags pathfix shebangfix
USE_LDCONFIG=	yes
DOS2UNIX_FILES=	cmake/compilerFlags.cmake
USE_LDCONFIG=	yes
SHEBANG_FILES=	fuzz/mkdictionary.py tests/runner.py

CMAKE_ARGS=	-DPython${PYTHON_MAJOR_VER}_EXECUTABLE:FILEPATH="${PYTHON_CMD}"

CMAKE_ON=	EXIV2_ENABLE_VIDEO
CMAKE_OFF=	EXIV2_ENABLE_EXTERNAL_XMP

LDFLAGS_mips=	-lintl
LDFLAGS_mips64=	-lintl
TEST_IMPLIES=	SAMPLE

WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}-Source
NLS_USES=	gettext-runtime

SAMPLE_DESC=	Include sample applications
SAMPLE_CMAKE_BOOL=	EXIV2_BUILD_SAMPLES

OPTIONS_DEFINE=	DOCS DOXYGEN NLS SAMPLE TEST
OPTIONS_SUB=	yes

SAMPLE_DESC=	Include sample applications

DOXYGEN_BUILD_DEPENDS=	dot:graphics/graphviz \
			doxygen:devel/doxygen
DOXYGEN_CMAKE_BOOL=	EXIV2_BUILD_DOC
DOXYGEN_ALL_TARGET=	all doc
DOXYGEN_PORTDOCS=	*

NLS_USES=	gettext-runtime
NLS_CMAKE_BOOL=	EXIV2_ENABLE_NLS

SAMPLE_CMAKE_BOOL=	EXIV2_BUILD_SAMPLES
LDFLAGS_mips64=		-lintl

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_TEST_TARGET=	test
		${WRKSRC}/test/functions.source

.include <bsd.port.mk>




TIMESTAMP = 1688222531
SHA256 (exiv2-0.28.0-Source.tar.gz) = 89af3b5ef7277753ef7a7b5374ae017c6b9e304db3b688f1948e73e103491f3d
SIZE (exiv2-0.28.0-Source.tar.gz) = 44893310
SHA256 (16c1cd7da0cd159ee2d53c39088564edaf046c77.patch) = 04cc88ba5e575fef02545022a8f862dadc16752e21d9bbfdbc3788b86992821b
SIZE (16c1cd7da0cd159ee2d53c39088564edaf046c77.patch) = 4997
SHA256 (2876c8c5f70f71b5b51b0f26b31dd0dc08583212.patch) = f05ab7b3355ae6d5346f6bbd9d0fc9d8db26b04943f27b0f851ac5ad13561a41
SIZE (2876c8c5f70f71b5b51b0f26b31dd0dc08583212.patch) = 2269
SHA256 (3664f5b826f5688b82470235d1dceef0c9c4c47d.patch) = 6b725a884c8bc225b0bda6a907a39e2238fe0cee4800f7852d18377e66aad2a3
SIZE (3664f5b826f5688b82470235d1dceef0c9c4c47d.patch) = 12997
SHA256 (b4f435a4ecceba0ef3a785dbe8eead6f55f49cc1.patch) = e3b0dce84cdacbdbb24c6c39772f6cdbba7e3e3101be540d7695d3d981c810e5
SIZE (b4f435a4ecceba0ef3a785dbe8eead6f55f49cc1.patch) = 755
SHA256 (c5c4a54d4cf4ea544c30fe6780dab2755f404300.patch) = ef9789c846982e6d15ef47f53f25c42229e7d2eb135ac9fa5e0e09e7da0e0d91
SIZE (c5c4a54d4cf4ea544c30fe6780dab2755f404300.patch) = 778
SHA256 (f47e7bd666aa063d016bdf00ea8f62c97a5b5a7a.patch) = f96c50432d45adf30bffbb21ebfda30c1ffeae08ce3a603eacda1befb9240fb8
SIZE (f47e7bd666aa063d016bdf00ea8f62c97a5b5a7a.patch) = 1127

Lines 1-11 Link Here

(-)b/graphics/exiv2/files/patch-cmake_mainSetup.cmake (-2 / +2 lines)
1	--- cmake/mainSetup.cmake.orig 2019-07-13 09:31:40 UTC	1	--- cmake/mainSetup.cmake.orig 2023-05-08 16:01:13 UTC
2	+++ cmake/mainSetup.cmake	2	+++ cmake/mainSetup.cmake
3	@@ -13,7 +13,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}	3	@@ -17,7 +17,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
4	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})	4	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
5	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})	5	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
6		6
7	-if (NOT CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")	7	-if (NOT CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
8	+if (NOT CMAKE_CXX_COMPILER_ID STREQUAL "Clang")	8	+if (NOT CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
9	set(CMAKE_CXX_VISIBILITY_PRESET hidden)	9	set(CMAKE_CXX_VISIBILITY_PRESET hidden)
10	set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)	10	set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
11	endif()	11	endif()




This patch fixes a crash when the procstat_getfiles()
return list contains non-vnodes that don't have an fs_path.

filed as https://github.com/Exiv2/exiv2/pull/2672

--- src/version.cpp.orig	2023-05-08 16:01:13 UTC
+++ src/version.cpp
@@ -148,7 +148,7 @@ static std::vector<std::string> getLoadedLibraries() {
     struct filestat_list* files = procs ? procstat_getfiles(procstat, procs, true) : nullptr;
     if (files) {
       filestat* entry;
-      STAILQ_FOREACH(entry, files, next) {
+      STAILQ_FOREACH(entry, files, next) if (entry && PS_FST_TYPE_VNODE == entry->fs_type && entry->fs_path) {
         std::string path(entry->fs_path);
         pushPath(path, libs, paths);
       }




XMP code is not dealing with format types properly. Cast argument to match format string.

filed as https://github.com/Exiv2/exiv2/pull/2671

--- xmpsdk/src/XMPMeta.cpp.orig	2023-05-08 16:01:13 UTC
+++ xmpsdk/src/XMPMeta.cpp
@@ -87,7 +87,7 @@ static const char * kTenSpaces = "          ";
 #define OutProcHexInt(num)	{ snprintf ( buffer, sizeof(buffer), "%X", (num) ); /* AUDIT: Using sizeof for snprintf length is safe */	\
 							  status = (*outProc) ( refCon, buffer, strlen(buffer) );  if ( status != 0 ) goto EXIT; }
 #else
-#define OutProcHexInt(num)	{ snprintf ( buffer, sizeof(buffer), "%lX", (num) ); /* AUDIT: Using sizeof for snprintf length is safe */	\
+#define OutProcHexInt(num)	{ snprintf ( buffer, sizeof(buffer), "%lX", (long)(num) ); /* AUDIT: Using sizeof for snprintf length is safe */	\
 							  status = (*outProc) ( refCon, buffer, strlen(buffer) );  if ( status != 0 ) goto EXIT; }
 #endif
 




XMP code is not dealing with format types properly.
Provide a variable that matches the format string to
avoid crashes when sizeof(long long) != sizeof(XMP_Int64).

filed as https://github.com/Exiv2/exiv2/pull/2671

--- xmpsdk/src/XMPUtils.cpp.orig	2023-05-08 16:01:13 UTC
+++ xmpsdk/src/XMPUtils.cpp
@@ -1215,7 +1215,7 @@ XMPUtils::ConvertToInt64 ( XMP_StringPtr strValue )
 
 	int count;
 	char nextCh;
-	XMP_Int64 result;
+	long long result;
 
 	if ( ! XMP_LitNMatch ( strValue, "0x", 2 ) ) {
 		count = sscanf ( strValue, "%lld%c", &result, &nextCh );




%%SAMPLE%%bin/addmoddel
%%SAMPLE%%bin/exifcomment
%%SAMPLE%%bin/exifdata
%%SAMPLE%%bin/exifprint
%%SAMPLE%%bin/exifvalue
bin/exiv2
%%SAMPLE%%bin/exiv2json
%%SAMPLE%%bin/geotag
%%SAMPLE%%bin/iptceasy
%%SAMPLE%%bin/iptcprint
%%SAMPLE%%bin/metacopy
%%SAMPLE%%bin/mrwthumb
%%SAMPLE%%bin/taglist
%%SAMPLE%%bin/xmpdump
%%SAMPLE%%bin/xmpparse
%%SAMPLE%%bin/xmpprint
%%SAMPLE%%bin/xmpsample
include/exiv2/asfvideo.hpp
include/exiv2/basicio.hpp
include/exiv2/bmffimage.hpp
include/exiv2/bmpimage.hpp
include/exiv2/config.h
include/exiv2/convert.hpp
include/exiv2/cr2image.hpp
include/exiv2/crwimage.hpp
include/exiv2/datasets.hpp
include/exiv2/easyaccess.hpp
include/exiv2/epsimage.hpp
include/exiv2/error.hpp
include/exiv2/exif.hpp
include/exiv2/exiv2.hpp
include/exiv2/exiv2lib_export.h
include/exiv2/exv_conf.h
include/exiv2/futils.hpp
include/exiv2/gifimage.hpp
include/exiv2/http.hpp
include/exiv2/image.hpp
include/exiv2/image_types.hpp
include/exiv2/iptc.hpp
include/exiv2/jp2image.hpp
include/exiv2/jpgimage.hpp
include/exiv2/matroskavideo.hpp
include/exiv2/metadatum.hpp
include/exiv2/mrwimage.hpp
include/exiv2/orfimage.hpp
include/exiv2/pgfimage.hpp
include/exiv2/photoshop.hpp
include/exiv2/pngimage.hpp
include/exiv2/preview.hpp
include/exiv2/properties.hpp
include/exiv2/psdimage.hpp
include/exiv2/quicktimevideo.hpp
include/exiv2/rafimage.hpp
include/exiv2/riffvideo.hpp
include/exiv2/rw2image.hpp
include/exiv2/rwlock.hpp
include/exiv2/slice.hpp
include/exiv2/ssh.hpp
include/exiv2/tags.hpp
include/exiv2/tgaimage.hpp
include/exiv2/tiffimage.hpp
include/exiv2/types.hpp
include/exiv2/utilsvideo.hpp
include/exiv2/value.hpp
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/libexiv2.so
lib/libexiv2.so.0.28.0
lib/libexiv2.so.28
lib/libexiv2-xmp.a
libdata/pkgconfig/exiv2.pc
share/man/man1/exiv2.1.gz
%%NLS%%share/locale/bs/LC_MESSAGES/exiv2.mo
%%NLS%%share/locale/ca/LC_MESSAGES/exiv2.mo
%%NLS%%share/locale/de/LC_MESSAGES/exiv2.mo
%%NLS%%share/locale/es/LC_MESSAGES/exiv2.mo
%%NLS%%share/locale/fi/LC_MESSAGES/exiv2.mo
%%NLS%%share/locale/fr/LC_MESSAGES/exiv2.mo
%%NLS%%share/locale/gl/LC_MESSAGES/exiv2.mo
%%NLS%%share/locale/ms/LC_MESSAGES/exiv2.mo
%%NLS%%share/locale/nl/LC_MESSAGES/exiv2.mo
%%NLS%%share/locale/pl/LC_MESSAGES/exiv2.mo
%%NLS%%share/locale/pt/LC_MESSAGES/exiv2.mo
%%NLS%%share/locale/ru/LC_MESSAGES/exiv2.mo
%%NLS%%share/locale/sk/LC_MESSAGES/exiv2.mo
%%NLS%%share/locale/sv/LC_MESSAGES/exiv2.mo
%%NLS%%share/locale/ug/LC_MESSAGES/exiv2.mo
%%NLS%%share/locale/uk/LC_MESSAGES/exiv2.mo
%%NLS%%share/locale/vi/LC_MESSAGES/exiv2.mo
- 

Return to bug 272311

Lines 1-58 Link Here

(-)b/graphics/exiv2/Makefile (-30 / +41 lines)
1	PORTNAME= exiv2	1	PORTNAME= exiv2
2	DISTVERSION= 0.27.6	2	DISTVERSION= 0.28.0
3	DISTVERSIONSUFFIX= -Source	3	DISTVERSIONSUFFIX= -Source
4	PORTEPOCH= 1	4	PORTEPOCH= 1
5	CATEGORIES= graphics	5	CATEGORIES= graphics
6	MASTER_SITES= https://github.com/Exiv2/exiv2/releases/download/v${DISTVERSION}/	6	MASTER_SITES= https://github.com/Exiv2/exiv2/releases/download/v${DISTVERSION}/
7		7
		8	# https://git.alpinelinux.org/aports/log/community/exiv2
		9	# https://github.com/Exiv2/exiv2/compare/v0.28.0...0.28.x
		10	PATCH_SITES= https://github.com/Exiv2/exiv2/commit/
		11	PATCHFILES= 16c1cd7da0cd159ee2d53c39088564edaf046c77.patch:-p1 \
		12	2876c8c5f70f71b5b51b0f26b31dd0dc08583212.patch:-p1 \
		13	3664f5b826f5688b82470235d1dceef0c9c4c47d.patch:-p1 \
		14	b4f435a4ecceba0ef3a785dbe8eead6f55f49cc1.patch:-p1 \
		15	c5c4a54d4cf4ea544c30fe6780dab2755f404300.patch:-p1 \
		16	f47e7bd666aa063d016bdf00ea8f62c97a5b5a7a.patch:-p1
		17
8	MAINTAINER= multimedia@FreeBSD.org	18	MAINTAINER= multimedia@FreeBSD.org
9	COMMENT= Exif, IPTC, and XMP metadata manipulation library and tools	19	COMMENT= Exif, IPTC, and XMP metadata manipulation library and tools
10	WWW= https://www.exiv2.org/	20	WWW= https://www.exiv2.org/
11		21
12	LICENSE= GPLv2+	22	LICENSE= GPLv2+
13	LICENSE_FILE= ${WRKSRC}/COPYING	23	LICENSE_FILE= ${WRKSRC}/COPYING
14		24
15	LIB_DEPENDS= libexpat.so:textproc/expat2	25	LIB_DEPENDS= libbrotlidec.so:archivers/brotli \
16	TEST_DEPENDS= bash:shells/bash	26	libexpat.so:textproc/expat2 \
17	TEST_LIB_DEPENDS= libgtest.so:devel/googletest	27	libinih.so:devel/inih \
		28	libpng.so:graphics/png
18		29
19	USES= cmake compiler:c++11-lang cpe dos2unix gettext-tools pathfix \	30	USES= cmake compiler:c++17-lang cpe dos2unix gettext-tools iconv \
20	python:test localbase:ldflags	31	localbase:ldflags pathfix shebangfix
21	USE_LDCONFIG= yes
22	DOS2UNIX_FILES= cmake/compilerFlags.cmake	32	DOS2UNIX_FILES= cmake/compilerFlags.cmake
		33	USE_LDCONFIG= yes
		34	SHEBANG_FILES= fuzz/mkdictionary.py tests/runner.py
23		35
24	TEST_TARGET= tests	36	CMAKE_ARGS= -DPython${PYTHON_MAJOR_VER}_EXECUTABLE:FILEPATH="${PYTHON_CMD}"
25		37
26	CMAKE_ON= EXIV2_ENABLE_VIDEO	38	CMAKE_ON= EXIV2_ENABLE_VIDEO
27	CMAKE_OFF= EXIV2_ENABLE_LIBXMP	39	CMAKE_OFF= EXIV2_ENABLE_EXTERNAL_XMP
28		40
29	OPTIONS_DEFINE= NLS SAMPLE TEST	41	LDFLAGS_mips= -lintl
30	OPTIONS_SUB= yes	42	LDFLAGS_mips64= -lintl
31	TEST_IMPLIES= SAMPLE
32		43
33	NLS_CMAKE_BOOL= EXIV2_ENABLE_NLS	44	WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}-Source
34	NLS_USES= gettext-runtime
35
36	SAMPLE_DESC= Include sample applications
37	SAMPLE_CMAKE_BOOL= EXIV2_BUILD_SAMPLES
38		45
39	TEST_CMAKE_BOOL= EXIV2_BUILD_UNIT_TESTS	46	OPTIONS_DEFINE= DOCS DOXYGEN NLS SAMPLE TEST
		47	OPTIONS_SUB= yes
40		48
41	PATHFIX_CMAKELISTSTXT= CMakeChecks.txt	49	SAMPLE_DESC= Include sample applications
42		50
43	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-Source	51	DOXYGEN_BUILD_DEPENDS= dot:graphics/graphviz \
		52	doxygen:devel/doxygen
		53	DOXYGEN_CMAKE_BOOL= EXIV2_BUILD_DOC
		54	DOXYGEN_ALL_TARGET= all doc
		55	DOXYGEN_PORTDOCS= *
44		56
45	.include <bsd.port.options.mk>	57	NLS_USES= gettext-runtime
		58	NLS_CMAKE_BOOL= EXIV2_ENABLE_NLS
46		59
47	LDFLAGS_mips= -lintl	60	SAMPLE_CMAKE_BOOL= EXIV2_BUILD_SAMPLES
48	LDFLAGS_mips64= -lintl
49		61
50	post-patch:	62	TEST_IMPLIES= SAMPLE
51	@${REINPLACE_CMD} -e 's\|python3\|${PYTHON_CMD}\|' \	63	TEST_LIB_DEPENDS= libgtest.so:devel/googletest
52	${WRKSRC}/CMakeLists.txt	64	TEST_TEST_DEPENDS= bash:shells/bash
53	@${REINPLACE_CMD} -e 's\|python3\|${PYTHON_CMD}\|' \	65	TEST_USES= python:build,test
54	${WRKSRC}/test/Makefile	66	TEST_CMAKE_BOOL= EXIV2_BUILD_UNIT_TESTS
55	@${REINPLACE_CMD} -e 's\|python3\|${PYTHON_CMD}\|' \	67	TEST_TEST_TARGET= test
56	${WRKSRC}/test/functions.source
57		68
58	.include <bsd.port.mk>	69	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/graphics/exiv2/distinfo (-3 / +15 lines)
1	TIMESTAMP = 1674215187	1	TIMESTAMP = 1688222531
2	SHA256 (exiv2-0.27.6-Source.tar.gz) = 4c192483a1125dc59a3d70b30d30d32edace9e14adf52802d2f853abf72db8a6	2	SHA256 (exiv2-0.28.0-Source.tar.gz) = 89af3b5ef7277753ef7a7b5374ae017c6b9e304db3b688f1948e73e103491f3d
3	SIZE (exiv2-0.27.6-Source.tar.gz) = 32280263	3	SIZE (exiv2-0.28.0-Source.tar.gz) = 44893310
		4	SHA256 (16c1cd7da0cd159ee2d53c39088564edaf046c77.patch) = 04cc88ba5e575fef02545022a8f862dadc16752e21d9bbfdbc3788b86992821b
		5	SIZE (16c1cd7da0cd159ee2d53c39088564edaf046c77.patch) = 4997
		6	SHA256 (2876c8c5f70f71b5b51b0f26b31dd0dc08583212.patch) = f05ab7b3355ae6d5346f6bbd9d0fc9d8db26b04943f27b0f851ac5ad13561a41
		7	SIZE (2876c8c5f70f71b5b51b0f26b31dd0dc08583212.patch) = 2269
		8	SHA256 (3664f5b826f5688b82470235d1dceef0c9c4c47d.patch) = 6b725a884c8bc225b0bda6a907a39e2238fe0cee4800f7852d18377e66aad2a3
		9	SIZE (3664f5b826f5688b82470235d1dceef0c9c4c47d.patch) = 12997
		10	SHA256 (b4f435a4ecceba0ef3a785dbe8eead6f55f49cc1.patch) = e3b0dce84cdacbdbb24c6c39772f6cdbba7e3e3101be540d7695d3d981c810e5
		11	SIZE (b4f435a4ecceba0ef3a785dbe8eead6f55f49cc1.patch) = 755
		12	SHA256 (c5c4a54d4cf4ea544c30fe6780dab2755f404300.patch) = ef9789c846982e6d15ef47f53f25c42229e7d2eb135ac9fa5e0e09e7da0e0d91
		13	SIZE (c5c4a54d4cf4ea544c30fe6780dab2755f404300.patch) = 778
		14	SHA256 (f47e7bd666aa063d016bdf00ea8f62c97a5b5a7a.patch) = f96c50432d45adf30bffbb21ebfda30c1ffeae08ce3a603eacda1befb9240fb8
		15	SIZE (f47e7bd666aa063d016bdf00ea8f62c97a5b5a7a.patch) = 1127

Added Link Here

(-)b/graphics/exiv2/files/patch-src_version.cpp (+16 lines)
1	This patch fixes a crash when the procstat_getfiles()
2	return list contains non-vnodes that don't have an fs_path.
3
4	filed as https://github.com/Exiv2/exiv2/pull/2672
5
6	--- src/version.cpp.orig 2023-05-08 16:01:13 UTC
7	+++ src/version.cpp
8	@@ -148,7 +148,7 @@ static std::vector<std::string> getLoadedLibraries() {
9	struct filestat_list* files = procs ? procstat_getfiles(procstat, procs, true) : nullptr;
10	if (files) {
11	filestat* entry;
12	- STAILQ_FOREACH(entry, files, next) {
13	+ STAILQ_FOREACH(entry, files, next) if (entry && PS_FST_TYPE_VNODE == entry->fs_type && entry->fs_path) {
14	std::string path(entry->fs_path);
15	pushPath(path, libs, paths);
16	}

Added Link Here

(-)b/graphics/exiv2/files/patch-xmpsdk_src_XMPMeta.cpp (+15 lines)
1	XMP code is not dealing with format types properly. Cast argument to match format string.
2
3	filed as https://github.com/Exiv2/exiv2/pull/2671
4
5	--- xmpsdk/src/XMPMeta.cpp.orig 2023-05-08 16:01:13 UTC
6	+++ xmpsdk/src/XMPMeta.cpp
7	@@ -87,7 +87,7 @@ static const char * kTenSpaces = " ";
8	#define OutProcHexInt(num) { snprintf ( buffer, sizeof(buffer), "%X", (num) ); /* AUDIT: Using sizeof for snprintf length is safe */ \
9	status = (*outProc) ( refCon, buffer, strlen(buffer) ); if ( status != 0 ) goto EXIT; }
10	#else
11	-#define OutProcHexInt(num) { snprintf ( buffer, sizeof(buffer), "%lX", (num) ); /* AUDIT: Using sizeof for snprintf length is safe */ \
12	+#define OutProcHexInt(num) { snprintf ( buffer, sizeof(buffer), "%lX", (long)(num) ); /* AUDIT: Using sizeof for snprintf length is safe */ \
13	status = (*outProc) ( refCon, buffer, strlen(buffer) ); if ( status != 0 ) goto EXIT; }
14	#endif
15

Added Link Here

(-)b/graphics/exiv2/files/patch-xmpsdk_src_XMPUtils.cpp (+17 lines)
1	XMP code is not dealing with format types properly.
2	Provide a variable that matches the format string to
3	avoid crashes when sizeof(long long) != sizeof(XMP_Int64).
4
5	filed as https://github.com/Exiv2/exiv2/pull/2671
6
7	--- xmpsdk/src/XMPUtils.cpp.orig 2023-05-08 16:01:13 UTC
8	+++ xmpsdk/src/XMPUtils.cpp
9	@@ -1215,7 +1215,7 @@ XMPUtils::ConvertToInt64 ( XMP_StringPtr strValue )
10
11	int count;
12	char nextCh;
13	- XMP_Int64 result;
14	+ long long result;
15
16	if ( ! XMP_LitNMatch ( strValue, "0x", 2 ) ) {
17	count = sscanf ( strValue, "%lld%c", &result, &nextCh );

Lines 1-93 Link Here

(-)b/graphics/exiv2/pkg-plist (-9 / +4 lines)
1	%%SAMPLE%%bin/addmoddel	1	%%SAMPLE%%bin/addmoddel
2	%%SAMPLE%%bin/exifcomment	2	%%SAMPLE%%bin/exifcomment
3	%%SAMPLE%%bin/exifdata	3	%%SAMPLE%%bin/exifdata
4	%%SAMPLE%%bin/exifprint	4	%%SAMPLE%%bin/exifprint
5	%%SAMPLE%%bin/exifvalue	5	%%SAMPLE%%bin/exifvalue
6	bin/exiv2	6	bin/exiv2
7	%%SAMPLE%%bin/exiv2json
8	%%SAMPLE%%bin/geotag	7	%%SAMPLE%%bin/geotag
9	%%SAMPLE%%bin/iptceasy	8	%%SAMPLE%%bin/iptceasy
10	%%SAMPLE%%bin/iptcprint	9	%%SAMPLE%%bin/iptcprint
11	%%SAMPLE%%bin/metacopy	10	%%SAMPLE%%bin/metacopy
12	%%SAMPLE%%bin/mrwthumb	11	%%SAMPLE%%bin/mrwthumb
13	%%SAMPLE%%bin/taglist	12	%%SAMPLE%%bin/taglist
14	%%SAMPLE%%bin/xmpdump	13	%%SAMPLE%%bin/xmpdump
15	%%SAMPLE%%bin/xmpparse	14	%%SAMPLE%%bin/xmpparse
16	%%SAMPLE%%bin/xmpprint	15	%%SAMPLE%%bin/xmpprint
17	%%SAMPLE%%bin/xmpsample	16	%%SAMPLE%%bin/xmpsample
18	include/exiv2/asfvideo.hpp	17	include/exiv2/asfvideo.hpp
19	include/exiv2/basicio.hpp	18	include/exiv2/basicio.hpp
20	include/exiv2/bmffimage.hpp	19	include/exiv2/bmffimage.hpp
21	include/exiv2/bmpimage.hpp	20	include/exiv2/bmpimage.hpp
22	include/exiv2/config.h	21	include/exiv2/config.h
23	include/exiv2/convert.hpp	22	include/exiv2/convert.hpp
24	include/exiv2/cr2image.hpp	23	include/exiv2/cr2image.hpp
25	include/exiv2/crwimage.hpp	24	include/exiv2/crwimage.hpp
26	include/exiv2/datasets.hpp	25	include/exiv2/datasets.hpp
27	include/exiv2/easyaccess.hpp	26	include/exiv2/easyaccess.hpp
28	include/exiv2/epsimage.hpp	27	include/exiv2/epsimage.hpp
29	include/exiv2/error.hpp	28	include/exiv2/error.hpp
30	include/exiv2/exif.hpp	29	include/exiv2/exif.hpp
31	include/exiv2/exiv2.hpp	30	include/exiv2/exiv2.hpp
32	include/exiv2/exiv2lib_export.h	31	include/exiv2/exiv2lib_export.h
33	include/exiv2/exv_conf.h	32	include/exiv2/exv_conf.h
34	include/exiv2/futils.hpp	33	include/exiv2/futils.hpp
35	include/exiv2/gifimage.hpp	34	include/exiv2/gifimage.hpp
36	include/exiv2/http.hpp	35	include/exiv2/http.hpp
37	include/exiv2/image.hpp	36	include/exiv2/image.hpp
38	include/exiv2/ini.hpp	37	include/exiv2/image_types.hpp
39	include/exiv2/iptc.hpp	38	include/exiv2/iptc.hpp
40	include/exiv2/jp2image.hpp	39	include/exiv2/jp2image.hpp
41	include/exiv2/jpgimage.hpp	40	include/exiv2/jpgimage.hpp
42	include/exiv2/matroskavideo.hpp	41	include/exiv2/matroskavideo.hpp
43	include/exiv2/metadatum.hpp	42	include/exiv2/metadatum.hpp
44	include/exiv2/mrwimage.hpp	43	include/exiv2/mrwimage.hpp
45	include/exiv2/orfimage.hpp	44	include/exiv2/orfimage.hpp
46	include/exiv2/pgfimage.hpp	45	include/exiv2/pgfimage.hpp
		46	include/exiv2/photoshop.hpp
47	include/exiv2/pngimage.hpp	47	include/exiv2/pngimage.hpp
48	include/exiv2/preview.hpp	48	include/exiv2/preview.hpp
49	include/exiv2/properties.hpp	49	include/exiv2/properties.hpp
50	include/exiv2/psdimage.hpp	50	include/exiv2/psdimage.hpp
51	include/exiv2/quicktimevideo.hpp	51	include/exiv2/quicktimevideo.hpp
52	include/exiv2/rafimage.hpp	52	include/exiv2/rafimage.hpp
53	include/exiv2/riffvideo.hpp	53	include/exiv2/riffvideo.hpp
54	include/exiv2/rw2image.hpp	54	include/exiv2/rw2image.hpp
55	include/exiv2/rwlock.hpp
56	include/exiv2/slice.hpp	55	include/exiv2/slice.hpp
57	include/exiv2/ssh.hpp
58	include/exiv2/tags.hpp	56	include/exiv2/tags.hpp
59	include/exiv2/tgaimage.hpp	57	include/exiv2/tgaimage.hpp
60	include/exiv2/tiffimage.hpp	58	include/exiv2/tiffimage.hpp
61	include/exiv2/types.hpp	59	include/exiv2/types.hpp
62	include/exiv2/utilsvideo.hpp
63	include/exiv2/value.hpp	60	include/exiv2/value.hpp
64	include/exiv2/version.hpp	61	include/exiv2/version.hpp
65	include/exiv2/webpimage.hpp	62	include/exiv2/webpimage.hpp
66	include/exiv2/xmp_exiv2.hpp	63	include/exiv2/xmp_exiv2.hpp
67	include/exiv2/xmpsidecar.hpp	64	include/exiv2/xmpsidecar.hpp
68	lib/cmake/exiv2/exiv2Config-%%CMAKE_BUILD_TYPE%%.cmake	65	lib/cmake/exiv2/exiv2Config-%%CMAKE_BUILD_TYPE%%.cmake
69	lib/cmake/exiv2/exiv2Config.cmake	66	lib/cmake/exiv2/exiv2Config.cmake
70	lib/cmake/exiv2/exiv2ConfigVersion.cmake	67	lib/cmake/exiv2/exiv2ConfigVersion.cmake
71	lib/libexiv2.so	68	lib/libexiv2.so
72	lib/libexiv2.so.0.27.6	69	lib/libexiv2.so.0.28.0
73	lib/libexiv2.so.27	70	lib/libexiv2.so.28
74	lib/libexiv2-xmp.a
75	libdata/pkgconfig/exiv2.pc	71	libdata/pkgconfig/exiv2.pc
76	share/man/man1/exiv2.1.gz	72	share/man/man1/exiv2.1.gz
77	%%NLS%%share/locale/bs/LC_MESSAGES/exiv2.mo	73	%%NLS%%share/locale/bs/LC_MESSAGES/exiv2.mo
78	%%NLS%%share/locale/ca/LC_MESSAGES/exiv2.mo	74	%%NLS%%share/locale/ca/LC_MESSAGES/exiv2.mo
79	%%NLS%%share/locale/de/LC_MESSAGES/exiv2.mo	75	%%NLS%%share/locale/de/LC_MESSAGES/exiv2.mo
80	%%NLS%%share/locale/es/LC_MESSAGES/exiv2.mo	76	%%NLS%%share/locale/es/LC_MESSAGES/exiv2.mo
81	%%NLS%%share/locale/fi/LC_MESSAGES/exiv2.mo	77	%%NLS%%share/locale/fi/LC_MESSAGES/exiv2.mo
82	%%NLS%%share/locale/fr/LC_MESSAGES/exiv2.mo	78	%%NLS%%share/locale/fr/LC_MESSAGES/exiv2.mo
83	%%NLS%%share/locale/gl/LC_MESSAGES/exiv2.mo	79	%%NLS%%share/locale/gl/LC_MESSAGES/exiv2.mo
84	%%NLS%%share/locale/ms/LC_MESSAGES/exiv2.mo	80	%%NLS%%share/locale/ms/LC_MESSAGES/exiv2.mo
85	%%NLS%%share/locale/nl/LC_MESSAGES/exiv2.mo	81	%%NLS%%share/locale/nl/LC_MESSAGES/exiv2.mo
86	%%NLS%%share/locale/pl/LC_MESSAGES/exiv2.mo	82	%%NLS%%share/locale/pl/LC_MESSAGES/exiv2.mo
87	%%NLS%%share/locale/pt/LC_MESSAGES/exiv2.mo	83	%%NLS%%share/locale/pt/LC_MESSAGES/exiv2.mo
88	%%NLS%%share/locale/ru/LC_MESSAGES/exiv2.mo	84	%%NLS%%share/locale/ru/LC_MESSAGES/exiv2.mo
89	%%NLS%%share/locale/sk/LC_MESSAGES/exiv2.mo	85	%%NLS%%share/locale/sk/LC_MESSAGES/exiv2.mo
90	%%NLS%%share/locale/sv/LC_MESSAGES/exiv2.mo	86	%%NLS%%share/locale/sv/LC_MESSAGES/exiv2.mo
91	%%NLS%%share/locale/ug/LC_MESSAGES/exiv2.mo	87	%%NLS%%share/locale/ug/LC_MESSAGES/exiv2.mo
92	%%NLS%%share/locale/uk/LC_MESSAGES/exiv2.mo	88	%%NLS%%share/locale/uk/LC_MESSAGES/exiv2.mo
93	%%NLS%%share/locale/vi/LC_MESSAGES/exiv2.mo	89	%%NLS%%share/locale/vi/LC_MESSAGES/exiv2.mo
94	-