From nobody Wed Mar 06 21:05:34 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TqlML6hCgz5DNkL; Wed, 6 Mar 2024 21:05:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TqlML4lpVz4Mfd; Wed, 6 Mar 2024 21:05:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709759134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tyZ9M+q65OHBSq4ijnI0jWDXeVwFvPoPC22wpi+FF3U=; b=KW2fguUIGymKebzQmYbWXwcOtxivuzRtlI4tNmVfDm50CBhneUaM5eurRY1RYxr6OtTqmK 4EW17seSrXTXw5x1pxekxfkfkqTwwa+hLqFpOrMYyyGB1KjyfA7KCiEvD72Er1Mg37Wwh5 7whc/i9sYdDn2t3QVhvgP6+iDQUbatzlXci2OyWXZqV1ezJQjvCi9g5qXbTGx5PYbrlTAh GMb0toqt105h0Ajxh+8MKkBr880VD0x+Z+8V77uaz58j7lFpFZ992WzbtPjDvgZjEadd4p zAOq/h8gQ9+IPLHJrLKUj4pjvEsxghV2Cv+cMZydEGBGby70hf3N+e6x5GL+Xg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709759134; a=rsa-sha256; cv=none; b=tDuF4latzEx+N+yB9ik8o7/Dixol415xt9k4+owIYrPETcXOwMGgJ4QjGDjoEsUcat3Jp4 bb+DoXRIPeo+z+QV7UjGv26iCDm3IDIUk3B5Dn6LHuxvYBErDNgCjrh2Mf+XfcifA6xsPE 4HilIi5zs5xn2qKmVoAz/coG1UxhXTlbSWXp25XCBmbUUm/WWyLhc3iEhIksB1e4oyaQkN lDzgzER867E/vvraIw91ASey2rCF7VwKUfFxkhpiq/W+77BtwxSikSupkwvB5Tmx26hZYo uQoZXG5uEU0RJeRGl4zulJ4DmQs/0RZ6tjB/KnpStWtU9YuLgGuC00GEe4ET+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709759134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tyZ9M+q65OHBSq4ijnI0jWDXeVwFvPoPC22wpi+FF3U=; b=aXwtnZ/YlHL2/Y9jvnMmee9zN3lNYR0oz4MuFafN+UE6NwwkEOxMXRabCDoQouVbyV7nUE nh/de46z2OqfyFBTmXlBuCQBQetjYQ6XBDF8NLZzmSPzuvK4QgHXw/8p8xjiQKKptnRNMU Mz0cHeD+vLrEGN/Yqayx/qPUnn3F1RAYaWfcJbJLjFAx7/GyyaYh8CoRwo9AqatDjDUMt9 xGhKNLcaW54CyY2Wa9KzqRsylasD402c3kqd944UVjyL5G+qmQTfeqe6m3s14QoFXJQzeN 2aNNLzzKGfZ199Xrr/9FieM3GB5BDi+r12zqoHuyK7cUKhmb9v3pAj0gBhUkYA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TqlML4N9Nz15cf; Wed, 6 Mar 2024 21:05:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 426L5YQg000628; Wed, 6 Mar 2024 21:05:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 426L5YSH000625; Wed, 6 Mar 2024 21:05:34 GMT (envelope-from git) Date: Wed, 6 Mar 2024 21:05:34 GMT Message-Id: <202403062105.426L5YSH000625@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: 5a50cca81b15 - main - graphics/exiv2: Update to 0.28.2 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5a50cca81b15dee32598825a11b7a136fbfa0de6 Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=5a50cca81b15dee32598825a11b7a136fbfa0de6 commit 5a50cca81b15dee32598825a11b7a136fbfa0de6 Author: Daniel Engberg AuthorDate: 2024-03-06 21:02:43 +0000 Commit: Daniel Engberg CommitDate: 2024-03-06 21:04:53 +0000 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 --- graphics/exiv2/Makefile | 26 ++----- graphics/exiv2/distinfo | 18 +---- .../exiv2/files/patch-_MSVC_LANG-warning-Wundef | 84 ---------------------- graphics/exiv2/files/patch-src_version.cpp | 16 ----- graphics/exiv2/pkg-plist | 5 +- 5 files changed, 13 insertions(+), 136 deletions(-) diff --git a/graphics/exiv2/Makefile b/graphics/exiv2/Makefile index 42ea976b7ac1..89c2901944db 100644 --- 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,10 +19,11 @@ 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 @@ -42,8 +31,6 @@ 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 diff --git a/graphics/exiv2/distinfo b/graphics/exiv2/distinfo index 637ac00e4707..f4891eb36e86 100644 --- 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 deleted file mode 100644 index a2286868df66..000000000000 --- a/graphics/exiv2/files/patch-_MSVC_LANG-warning-Wundef +++ /dev/null @@ -1,84 +0,0 @@ -From aaa876159ada768ba0fb2d44b4eaaf23b3b2ed98 Mon Sep 17 00:00:00 2001 -From: Matthias Andree -Date: Mon, 3 Jul 2023 11:16:44 +0200 -Subject: [PATCH] Fix preprocessor warnings about undefined _MSVC_LANG - -Stricter compiler/settings, such as found during a build -on FreeBSD with clang 14, issue warnings of the kind below. - -/usr/local/include/exiv2/value.hpp:1272:31: warning: '_MSVC_LANG' is not defined, evaluates to 0 [-Wundef] -fixed-width font helps here-- ^ - -Fix: Guard use of _MSVC_LANG by a check. - -Personally, I found that MSVC has several feature-specific -checks in predefined macros which might allow for one -standards-based check that matches GCC/clang/MSVC rather than the -split check for C++ standard and MSVC language version settings. - -See https://en.cppreference.com/w/cpp/feature_test - -I am not building Exiv2 on MSVC, so I cannot test/suggest -anything here. ---- include/exiv2/slice.hpp.orig 2023-05-08 16:01:13 UTC -+++ include/exiv2/slice.hpp -@@ -255,7 +255,7 @@ struct ContainerStorage { - using iterator = typename container::iterator; - using const_iterator = typename container::const_iterator; - --#if __cplusplus >= 201402L || _MSVC_LANG >= 201402L -+#if __cplusplus >= 201402L || (defined(_MSVC_LANG) && (_MSVC_LANG >= 201402L)) - using value_type = std::remove_cv_t; - #else - using value_type = typename std::remove_cv::type; -@@ -320,7 +320,7 @@ struct ContainerStorage { - */ - template - struct PtrSliceStorage { --#if __cplusplus >= 201402L || _MSVC_LANG >= 201402L -+#if __cplusplus >= 201402L || (defined(_MSVC_LANG) && (_MSVC_LANG >= 201402L)) - using value_type = std::remove_cv_t>; - #else - using value_type = typename std::remove_cv::type>::type; -@@ -423,7 +423,7 @@ struct Slice : public Internal::MutableSliceBase= 201402L || _MSVC_LANG >= 201402L -+#if __cplusplus >= 201402L || (defined(_MSVC_LANG) && (_MSVC_LANG >= 201402L)) - using value_type = std::remove_cv_t; - #else - using value_type = typename std::remove_cv::type; -@@ -460,7 +460,7 @@ struct Slice : public Internal::Const - using iterator = typename container::iterator; - using const_iterator = typename container::const_iterator; - --#if __cplusplus >= 201402L || _MSVC_LANG >= 201402L -+#if __cplusplus >= 201402L || (defined(_MSVC_LANG) && (_MSVC_LANG >= 201402L)) - using value_type = std::remove_cv_t; - #else - using value_type = typename std::remove_cv::type; - include/exiv2/slice.hpp | 8 ++++---- - include/exiv2/value.hpp | 4 ++-- - 2 files changed, 6 insertions(+), 6 deletions(-) - ---- include/exiv2/value.hpp.orig 2023-05-08 16:01:13 UTC -+++ include/exiv2/value.hpp -@@ -1254,7 +1254,7 @@ class ValueType : public Value { - } else if (std::is_signed::value) { - #endif - // conversion is from unsigned to signed --#if __cplusplus >= 201402L || _MSVC_LANG >= 201402L -+#if __cplusplus >= 201402L || (defined(_MSVC_LANG) && (_MSVC_LANG >= 201402L)) - const auto imax = static_cast>(std::numeric_limits::max()); - #else - const auto imax = static_cast::type>(std::numeric_limits::max()); -@@ -1269,7 +1269,7 @@ class ValueType : public Value { - return 0; - } - // Inputs are not negative so convert them to unsigned. --#if __cplusplus >= 201402L || _MSVC_LANG >= 201402L -+#if __cplusplus >= 201402L || (defined(_MSVC_LANG) && (_MSVC_LANG >= 201402L)) - const auto a_u = static_cast>(a); - const auto b_u = static_cast>(b); - #else diff --git a/graphics/exiv2/files/patch-src_version.cpp b/graphics/exiv2/files/patch-src_version.cpp deleted file mode 100644 index 0175b6a0c1b6..000000000000 --- a/graphics/exiv2/files/patch-src_version.cpp +++ /dev/null @@ -1,16 +0,0 @@ -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 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); - } diff --git a/graphics/exiv2/pkg-plist b/graphics/exiv2/pkg-plist index 0ce169f2b461..1a78dbc27653 100644 --- 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