Skip to content

Commit dfb4bba

Browse files
kevinbackhousemergify[bot]
kevinbackhouse
authored and
mergify[bot]
committed
Exiv2 v0.28.3
(cherry picked from commit c5b922c) # Conflicts: # CMakeLists.txt # doc/ChangeLog # meson.build # po/exiv2.pot
1 parent 35a6b8f commit dfb4bba

File tree

5 files changed

+92
-0
lines changed

5 files changed

+92
-0
lines changed

‎CMakeLists.txt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Minimum version imposed by Ubuntu:20.04
22
cmake_minimum_required(VERSION 3.16.3)
33

4+
<<<<<<< HEAD
45
# use TWEAK to categorize the build:
56
#
67
# * 1.00.0 = GM (tagged and released)
@@ -15,6 +16,12 @@ project(
1516
VERSION 1.00.0.9
1617
DESCRIPTION "Exif/IPTC/Xmp C++ metadata library and tools plus ICC Profiles, Previews and more."
1718
LANGUAGES C CXX
19+
=======
20+
project(exiv2
21+
VERSION 0.28.3
22+
DESCRIPTION "Exif/IPTC/Xmp C++ metadata library and tools plus ICC Profiles, Previews and more."
23+
LANGUAGES C CXX
24+
>>>>>>> c5b922cf5 (Exiv2 v0.28.3)
1825
)
1926

2027
# Shared Object versioning (SemVer-like: must bump major on API breakage)

‎SECURITY.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
| v0.28 | 2023-05-08 | v0.28.0 | 0.28.x | v0.28.0 | 2023-05-08 | v0.28.0 |
88
| | | | | v0.28.1 | 2023-11-06 | v0.28.1 |
99
| | | | | v0.28.2 | 2024-02-13 | v0.28.2 |
10+
| | | | | v0.28.3 | 2024-07-08 | v0.28.3 |
1011
| v0.27 | 2018-12-20 | 0.27 | 0.27-maintenance | v0.27.0 | 2018-12-20 | v0.27.0 |
1112
| | | | | v0.27.1 | 2019-04-18 | v0.27.1 |
1213
| | | | | v0.27.2 | 2019-07-29 | v0.27.2 |

‎doc/ChangeLog‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,77 @@
1+
<<<<<<< HEAD
2+
=======
3+
Changes from version 0.28.2 to 0.28.3
4+
-------------------------------------
5+
6+
Release Notes:
7+
8+
* https://github.com/Exiv2/exiv2/issues/3008
9+
* https://github.com/Exiv2/exiv2/milestone/14?closed=1
10+
11+
This release also fixes a low-severity security issue in asfvideo.cpp:
12+
13+
* [CVE-2024-39695](https://github.com/Exiv2/exiv2/security/advisories/GHSA-38rv-8x93-pvrh): out-of-bounds read in AsfVideo::streamProperties.
14+
15+
This vulnerability is in a new feature (ASF video) that was added in version 0.28.0, so earlier versions of Exiv2 are not affected.
16+
17+
Changes from version 0.28.1 to 0.28.2
18+
-------------------------------------
19+
20+
Release Notes:
21+
22+
* https://github.com/Exiv2/exiv2/issues/2914
23+
* https://github.com/Exiv2/exiv2/milestone/13?closed=1
24+
25+
This release also fixes two low-severity security issues in quicktimevideo.cpp:
26+
27+
* [CVE-2024-24826](https://github.com/Exiv2/exiv2/security/advisories/GHSA-g9xm-7538-mq8w): out-of-bounds read in QuickTimeVideo::NikonTagsDecoder.
28+
* [CVE-2024-25112](https://github.com/Exiv2/exiv2/security/advisories/GHSA-crmj-qh74-2r36): denial of service due to unbounded recursion in QuickTimeVideo::multipleEntriesDecoder.
29+
30+
These vulnerabilities are in a new feature (quicktime video) that was added in version 0.28.0, so earlier versions of Exiv2 are not affected.
31+
32+
Changes from version 0.28.0 to 0.28.1
33+
-------------------------------------
34+
35+
Release Notes:
36+
https://github.com/Exiv2/exiv2/issues/2813
37+
38+
This release also fixes [CVE-2023-44398](https://github.com/Exiv2/exiv2/security/advisories/GHSA-hrw9-ggg3-3r4r), an out-of-bounds write in `BmffImage::brotliUncompress`. The vulnerability is in new code that was added in version 0.28.0, so earlier versions of Exiv2 are not affected.
39+
40+
Changes from version 0.27.6 to 0.28.0
41+
-------------------------------------
42+
43+
Release Notes:
44+
https://github.com/Exiv2/exiv2/issues/2406#issuecomment-1529139799
45+
46+
Changes from version 0.27.5 to 0.27.6
47+
-------------------------------------
48+
49+
Closed:
50+
https://github.com/Exiv2/exiv2/milestone/10?closed=1
51+
52+
Open:
53+
https://github.com/Exiv2/exiv2/milestone/10?open=1
54+
55+
Release Notes:
56+
https://github.com/Exiv2/exiv2/issues/2406#issuecomment-1383302378
57+
58+
Changes from version 0.27.4 to 0.27.5
59+
-------------------------------------
60+
61+
Closed:
62+
https://github.com/Exiv2/exiv2/milestone/9?closed=1
63+
64+
Open:
65+
https://github.com/Exiv2/exiv2/milestone/9?open=1
66+
67+
Release Notes:
68+
https://github.com/Exiv2/exiv2/issues/1018#issuecomment-948573657
69+
70+
+++++++++++++++++++++++++++++++++++++
71+
------------- History ---------------
72+
+++++++++++++++++++++++++++++++++++++
73+
74+
>>>>>>> c5b922cf5 (Exiv2 v0.28.3)
175
Changes from version 0.27.3 to 0.27.4
276
-------------------------------------
377

‎meson.build‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
project(
22
'exiv2',
33
'cpp',
4+
<<<<<<< HEAD
45
version: '1.0.0',
6+
=======
7+
version: '0.28.3',
8+
>>>>>>> c5b922cf5 (Exiv2 v0.28.3)
59
meson_version: '>=0.54.1',
610
default_options: ['warning_level=0', 'cpp_std=c++17'],
711
)

‎po/exiv2.pot‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,15 @@
66
#, fuzzy
77
msgid ""
88
msgstr ""
9+
<<<<<<< HEAD
910
"Project-Id-Version: PACKAGE VERSION\n"
1011
"Report-Msgid-Bugs-To: [email protected]\n"
1112
"POT-Creation-Date: 2017-03-21 21:42+0100\n"
13+
=======
14+
"Project-Id-Version: exiv2 0.28.3\n"
15+
"Report-Msgid-Bugs-To: https://github.com/Exiv2/exiv2/issues\n"
16+
"POT-Creation-Date: 2024-04-03 16:17+0200\n"
17+
>>>>>>> c5b922cf5 (Exiv2 v0.28.3)
1218
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1319
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1420
"Language-Team: LANGUAGE <[email protected]>\n"

0 commit comments

Comments
 (0)