mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-05 06:33:50 +02:00
exempi: update to 2.6.2.
This commit is contained in:
parent
be3ec273c9
commit
aad3d0a023
3 changed files with 31 additions and 45 deletions
|
@ -1,43 +0,0 @@
|
||||||
From 8ed2f034705fd2d032c81383eee8208fd4eee0ac Mon Sep 17 00:00:00 2001
|
|
||||||
From: Victor Rodriguez <victor.rodriguez.bahena@intel.com>
|
|
||||||
Date: Sat, 18 Aug 2018 13:54:55 +0000
|
|
||||||
Subject: [PATCH] Issue #9 - Fix null-pointer-dereference (CVE-2018-12648)
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
The WEBP::GetLE32 function in
|
|
||||||
XMPFiles/source/FormatSupport/WEBP_Support.hpp in Exempi 2.4.5 has a
|
|
||||||
NULL pointer dereference.
|
|
||||||
|
|
||||||
https://bugs.freedesktop.org/show_bug.cgi?id=106981
|
|
||||||
https://gitlab.freedesktop.org/libopenraw/exempi/issues/9
|
|
||||||
|
|
||||||
Signed-off-by: Victor Rodriguez <victor.rodriguez.bahena@intel.com>
|
|
||||||
Signed-off-by: Hubert Figuière <hub@figuiere.net>
|
|
||||||
---
|
|
||||||
XMPFiles/source/FormatSupport/WEBP_Support.cpp | 8 +++++---
|
|
||||||
1 file changed, 5 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/XMPFiles/source/FormatSupport/WEBP_Support.cpp b/XMPFiles/source/FormatSupport/WEBP_Support.cpp
|
|
||||||
index ffaf220..4fe705b 100644
|
|
||||||
--- a/XMPFiles/source/FormatSupport/WEBP_Support.cpp
|
|
||||||
+++ b/XMPFiles/source/FormatSupport/WEBP_Support.cpp
|
|
||||||
@@ -160,9 +160,11 @@ bool VP8XChunk::xmp()
|
|
||||||
}
|
|
||||||
void VP8XChunk::xmp(bool hasXMP)
|
|
||||||
{
|
|
||||||
- XMP_Uns32 flags = GetLE32(&this->data[0]);
|
|
||||||
- flags ^= (-hasXMP ^ flags) & (1 << XMP_FLAG_BIT);
|
|
||||||
- PutLE32(&this->data[0], flags);
|
|
||||||
+ if (&this->data[0] != NULL) {
|
|
||||||
+ XMP_Uns32 flags = GetLE32(&this->data[0]);
|
|
||||||
+ flags ^= (-hasXMP ^ flags) & (1 << XMP_FLAG_BIT);
|
|
||||||
+ PutLE32(&this->data[0], flags);
|
|
||||||
+ }
|
|
||||||
}
|
|
||||||
|
|
||||||
Container::Container(WEBP_MetaHandler* handler) : Chunk(NULL, handler)
|
|
||||||
--
|
|
||||||
2.18.0
|
|
||||||
|
|
29
srcpkgs/exempi/patches/exempi-e23c213-typeinfos.patch
Normal file
29
srcpkgs/exempi/patches/exempi-e23c213-typeinfos.patch
Normal file
|
@ -0,0 +1,29 @@
|
||||||
|
Source: https://src.fedoraproject.org/rpms/exempi/blob/f37/f/exempi-e23c213-typeinfos.patch
|
||||||
|
|
||||||
|
From d45c06270576493e1537080fa43c1af667c4337a Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Nikola=20Forr=C3=B3?= <nforro@redhat.com>
|
||||||
|
Date: Tue, 12 Oct 2021 14:15:17 +0200
|
||||||
|
Subject: [PATCH] Avoid multiple definitions of typeinfos
|
||||||
|
|
||||||
|
---
|
||||||
|
XMPFiles/source/XMPFiles_Impl.cpp | 4 +++-
|
||||||
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/XMPFiles/source/XMPFiles_Impl.cpp b/XMPFiles/source/XMPFiles_Impl.cpp
|
||||||
|
index 2f918ac..ff45040 100644
|
||||||
|
--- a/XMPFiles/source/XMPFiles_Impl.cpp
|
||||||
|
+++ b/XMPFiles/source/XMPFiles_Impl.cpp
|
||||||
|
@@ -47,7 +47,9 @@ using namespace std;
|
||||||
|
/// This file ...
|
||||||
|
///
|
||||||
|
// =================================================================================================
|
||||||
|
-#include "public/include/XMP.incl_cpp"
|
||||||
|
+#if ! XMP_StaticBuild
|
||||||
|
+ #include "public/include/XMP.incl_cpp"
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
#if XMP_WinBuild
|
||||||
|
#pragma warning ( disable : 4290 ) // C++ exception specification ignored except to indicate a function is not __declspec(nothrow)
|
||||||
|
--
|
||||||
|
2.33.0
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Template file for 'exempi'
|
# Template file for 'exempi'
|
||||||
pkgname=exempi
|
pkgname=exempi
|
||||||
version=2.5.0
|
version=2.6.2
|
||||||
revision=1
|
revision=1
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--with-boost=${XBPS_CROSS_BASE}/usr --disable-static --disable-unittest"
|
configure_args="--with-boost=${XBPS_CROSS_BASE}/usr --disable-static --disable-unittest"
|
||||||
|
@ -10,7 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
|
||||||
license="BSD-3-Clause"
|
license="BSD-3-Clause"
|
||||||
homepage="https://libopenraw.freedesktop.org/wiki/Exempi"
|
homepage="https://libopenraw.freedesktop.org/wiki/Exempi"
|
||||||
distfiles="https://libopenraw.freedesktop.org/download/exempi-${version}.tar.bz2"
|
distfiles="https://libopenraw.freedesktop.org/download/exempi-${version}.tar.bz2"
|
||||||
checksum=dc82fc24c0540a44a63fa4ad21775d24e00e63f1dedd3e2ae6f7aa27583b711b
|
checksum=4d17d4c93df2a95da3e3172c45b7a5bf317dd31dafd1c7a340169728c7089d1d
|
||||||
|
|
||||||
post_install() {
|
post_install() {
|
||||||
vlicense COPYING
|
vlicense COPYING
|
||||||
|
|
Loading…
Add table
Reference in a new issue