Skip to contentSkip to conversation

package/exiv2: bump version to 0.27.3

PATCH New Nicolas Serafini 2 participants 2 messages Jul 13, 2020

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 package/exiv2: bump version to 0.27.3

Bump version 0.27.3 and remove 0001[1] and 0002[2] local patches that has been upstreamed.

Release notes:
https://github.com/Exiv2/exiv2/blob/v0.27.3/releasenotes/releasenotes.txt

[1]: https://github.com/Exiv2/exiv2/commit/b7890776c62398ca1005e8edc32786859d60fcf7
[2]: https://github.com/Exiv2/exiv2/commit/1b917c3f7dd86336a9f6fda4456422c419dfe88c

---
v2: Remove BSD-3-Clause license attached to removed COPYING-CMAKE-SCRIPTS file

---
 ...k-offset-and-size-against-total-size.patch | 32 -------
 .../0002-fix_1011_jp2_readmetadata_loop.patch | 86 -------------------
 package/exiv2/exiv2.hash                      |  3 +-
 package/exiv2/exiv2.mk                        | 17 +---
 4 files changed, 4 insertions(+), 134 deletions(-)
 delete mode 100644 package/exiv2/0001-crwimage-Check-offset-and-size-against-total-size.patch
 delete mode 100644 package/exiv2/0002-fix_1011_jp2_readmetadata_loop.patch
package/exiv2/0001-crwimage-Check-offset-and-size-against-total-size.patch deleted +0 -32
deleted file mode 100644
index f26006e3a5..0000000000
@@ -1,32 +0,0 @@
-From b7890776c62398ca1005e8edc32786859d60fcf7 Mon Sep 17 00:00:00 2001
-From: Jens Georg <[email protected]>
-Date: Sun, 6 Oct 2019 15:05:20 +0200
-Subject: [PATCH] crwimage: Check offset and size against total size
-
-Corrupted or specially crafted CRW images might exceed the overall
-buffersize.
-
-Fixes #1019
-
-(cherry picked from commit 683451567284005cd24e1ccb0a76ca401000968b)
-[Retrieved (and slightly updated to keep only the fix) from:
-https://github.com/Exiv2/exiv2/commit/50e9dd964a439da357798344ed1dd86edcadf0ec]
-Signed-off-by: Fabrice Fontaine <[email protected]>
----
- src/crwimage_int.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/crwimage_int.cpp b/src/crwimage_int.cpp
-index 29311fdb7..c0d955350 100644
---- a/src/crwimage_int.cpp
-+++ b/src/crwimage_int.cpp
-@@ -268,6 +268,9 @@ namespace Exiv2 {
- #ifdef EXIV2_DEBUG_MESSAGES
-         std::cout << "Reading directory 0x" << std::hex << tag() << "\n";
- #endif
-+        if (this->offset() + this->size() > size)
-+            throw Error(kerOffsetOutOfRange);
-+
-         readDirectory(pData + offset(), this->size(), byteOrder);
- #ifdef EXIV2_DEBUG_MESSAGES
-         std::cout << "<---- 0x" << std::hex << tag() << "\n";
package/exiv2/0002-fix_1011_jp2_readmetadata_loop.patch deleted +0 -86

86 lines not on this page · raw message

package/exiv2/exiv2.hash +1 -2
index 7937d3f572..94ab4ac638 100644
@@ -1,4 +1,3 @@
 # Locally calculated
-sha256 3dbcaf01fbc5b98d42f091d1ff0d4b6cd9750dc724de3d9c0d113948570b2934 exiv2-0.27.2.tar.gz
+sha256 6398bc743c32b85b2cb2a604273b8c90aa4eb0fd7c1700bf66cbb2712b4f00c1 exiv2-0.27.3.tar.gz
 sha256 a7ba75cb966aca374711e2af49e5f3aea6a4443a803440f5d93e73a5a1222f66 COPYING
-sha256 46cde7dc11e64c78d650b4851b88f6704b4665ff60f22a1caf68ceb15e217e5b COPYING-CMAKE-SCRIPTS
package/exiv2/exiv2.mk +3 -14
index 5ca16c4747..7f38473609 100644
@@ -4,22 +4,11 @@
 #
 ################################################################################
 
-EXIV2_VERSION = 0.27.2
+EXIV2_VERSION = 0.27.3
 EXIV2_SITE = $(call github,Exiv2,exiv2,v$(EXIV2_VERSION))
 EXIV2_INSTALL_STAGING = YES
-EXIV2_LICENSE = GPL-2.0+, BSD-3-Clause
-EXIV2_LICENSE_FILES = COPYING COPYING-CMAKE-SCRIPTS
-
-# CVE-2019-13504 is misclassified (by our CVE tracker) as affecting version
-# 0.27.2, while in fact both commits that fixed this issue are already in this
-# version.
-EXIV2_IGNORE_CVES += CVE-2019-13504
-
-# 0001-crwimage-Check-offset-and-size-against-total-size.patch
-EXIV2_IGNORE_CVES += CVE-2019-17402
-
-# 0002-fix_1011_jp2_readmetadata_loop.patch
-EXIV2_IGNORE_CVES += CVE-2019-20421
+EXIV2_LICENSE = GPL-2.0+
+EXIV2_LICENSE_FILES = COPYING
 
 EXIV2_CONF_OPTS += -DEXIV2_ENABLE_BUILD_SAMPLES=OFF
 
Signature · 1 line
2.27.0
#1 lore raw

PATCH v2 1/1 package/exiv2: bump version to 0.27.3

Quoted 13 lines · On Mon, 13 Jul 2020 12:25:13 +0200 Nicolas Serafini…

Bump version 0.27.3 and remove 0001[1] and 0002[2] local patches that has been upstreamed.

Release notes:
https://github.com/Exiv2/exiv2/blob/v0.27.3/releasenotes/releasenotes.txt

[1]: https://github.com/Exiv2/exiv2/commit/b7890776c62398ca1005e8edc32786859d60fcf7
[2]: https://github.com/Exiv2/exiv2/commit/1b917c3f7dd86336a9f6fda4456422c419dfe88c

---
v2: Remove BSD-3-Clause license attached to removed COPYING-CMAKE-SCRIPTS file

Quoted 8 lines
---
 ...k-offset-and-size-against-total-size.patch | 32 -------
 .../0002-fix_1011_jp2_readmetadata_loop.patch | 86 -------------------
 package/exiv2/exiv2.hash                      |  3 +-
 package/exiv2/exiv2.mk                        | 17 +---
 4 files changed, 4 insertions(+), 134 deletions(-)
 delete mode 100644 package/exiv2/0001-crwimage-Check-offset-and-size-against-total-size.patch
 delete mode 100644 package/exiv2/0002-fix_1011_jp2_readmetadata_loop.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com