Skip to content

Commit

Permalink
exiv2: Autospec creation for update from version 0.28.0 to version 0.…
Browse files Browse the repository at this point in the history
…27.6

Antonio Rojas (1):
      Fix build with gtest 1.11

Attila Oláh (1):
      Fix compilation with -Wunused-variable

Christoph Hasse (4):
      fix: avoid processing MOV (quicktime) files when BMFF is enabled
      fix: incorrectly triggered enforce check during preview extraction in LoaderTiff::getData(), closes #1829
      workaround for softprops/action-gh-release#139
      fix naming of canon EF 35-80mm.closes #2247

David Houlder (2):
      Canon cr3 previews (#1958)
      Performance boost: don't read boxes we're not interested in

Heiko Bauke (1):
      fix out of range access, minor performance improvement

John55h (1):
      Update canonmn_int.cpp

Kevin Backhouse (140):
      Regression test for GHSA-5p8g-9xf3-gfrr
      Improve bound checking in WebPImage::doWriteMetadata()
      Regression test for GHSA-jgm9-5fw5-pw9p
      Better bounds checking in Jp2Image::encodeJp2Header()
      Fix signed/unsigned compiler warnings.
      Regression test for GHSA-8949-hhfh-j7rj
      Add more bounds checks in Jp2Image::encodeJp2Header
      Regression test for GHSA-7569-phvm-vwc2
      Add bounds check in Jp2Image::doWriteMetadata().
      Fix infinite loop caused by subBox with zero size.
      Prevent large allocation.
      Initialize field.
      Use readOrThrow to check error conditions of iIo.read().
      Fix quadratic complexity performance bug.
      Regression test for Exiv2/exiv2#1570.
      Fix out-of-bounds read in bmffimage.cpp
      Stop the test from failing when EXIV2_ENABLE_BMFF=Off.
      Fix signed/unsigned compiler warning.
      Fix signed/unsigned compiler warning.
      Fix LGTM warning about format specifier
      Check that the string is properly terminated.
      Regression test for GHSA-mv9g-fxh2-m49m
      Don't crash if s > size.
      Print message to stderr when EXIV2_DEBUG_MESSAGES is enabled.
      fix: use vector::at() rather than operator[] (#1735)
      fix: zero initialize local variables. (#1737)
      fix: stricter date parsing in value.cpp (#1720)
      Regression test for GHSA-pvjp-m4f6-q984
      Prevent divide-by-zero crash.
      Defensive coding to avoid 0x80000000/0xFFFFFFFF FPE.
      fix: fix incorrect loop condition (#1752)
      Regression test for GHSA-h9x9-4f77-336w
      Throw exception if lens info wasn't found.
      Check that findKey didn't return end().
      Regression test for GHSA-583f-w9pm-99r2
      Better bounds checking in Jp2Image::printStructure
      Regression test for GHSA-hqjh-hpv8-8r9p
      Extra checking to prevent the loop counter from wrapping around.
      Defensive coding changes to avoid integer overflow in loop conditions.
      Better fix for potential integer overflow in `bytes.size() - 3`.
      Type of escapeStart should be size_t.
      Regression test for GHSA-v5g7-46xf-h728
      Check that `type` isn't an empty string.
      Safer std::vector indexing.
      Better way to print the error message.
      Regression test for GHSA-m479-7frc-gqqg
      dirLength == 0 can cause an infinite loop.
      Defensive programming in Image::printIFDStructure
      Regression test for GHSA-9jh3-fcc3-g6hv
      Make sure that read is complete to prevent infinite loop.
      Regression test for https://github.com/Exiv2/exiv2/security/advisories/GHSA-g44w-q3vm-gwjq
      &bytes[0] will crash if bytes has zero elements.
      Skip unittest because -pR is disabled in release builds so the test fails.
      Remove redundant check.
      Regression test for GHSA-mvc4-g5pv-4qqq
      bufRead needs to be adjusted after seek()
      Improved handling of jpg segments to avoid out-of-bound reads.
      Fix compiler warning.
      Update src/jpgimage.cpp
      poc from GHSA-9jh3-fcc3-g6hv can now be parsed without error.
      Add comment to explain bounds-check.
      Fix build error when EXIV2_DEBUG_MESSAGES is enabled.
      Fix warning: comparison of integer expressions of different signedness
      Regression test for Exiv2/exiv2#1812
      Check size before allocation to avoid out-of-memory errors.
      Regression test for Exiv2/exiv2#1815
      Add bounds-check to prevent out-of-bounds read in memcmp.
      Regression test for Exiv2/exiv2#1817
      Use DataBuf, rather than new[], for automatic delete when an exception is throw.
      Regression test for Exiv2/exiv2#1819
      Check that the string isn't empty
      Add static_cast to fix build error on Windows.
      Add comment to explain the bounds-check.
      Regression test for Exiv2/exiv2#1827
      Check value is in range before casting from double to uint32_t, to avoid undefined behavior.
      Update src/tags_int.cpp
      Regression test for Exiv2/exiv2#1830
      Safer casting from double to long.
      Replace assertion with an error message.
      Regression test for Exiv2/exiv2#1838
      Check that the float is within the range of an int before casting.
      Regression test for Exiv2/exiv2#1841
      Use DataBuf rather than raw malloc.
      Replace assertion with an error message.
      Test for Exiv2/exiv2#1821
      Regression test for Exiv2/exiv2#1845
      Replace assertion with an error message.
      Regression test for Exiv2/exiv2#1793
      Add `pbox_end` param to `BmffImage::boxHandler` to enforce box nesting.
      Support for 64-bit box lengths looked broken.
      address + box_length == box_end
      Extra protection against large allocations.
      Fix compiler warnings.
      Fix format specifier.
      Backport other minor fixes from main.
      Fix compiler warning.
      Don't use `auto` on 0.27-maintenance.
      Back-port Actions and fuzzer to the 0.27-maintenance branch
      Fix for Exiv2/exiv2#1856
      Set -DEXIV2_ENABLE_BMFF=ON in the Actions workflows.
      Fix mistake in macOS release workflow.
      Update version: 0.27.5.1 (0.27.5 RC1)
      Add doc to release build.
      Remove failing Conan steps from macOS workflow.
      Update releasenotes.txt
      Credit to OSS-Fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=37363
      Add test to improve code coverage.
      Don't use C++11 features.
      Fix expat link error on Windows.
      Only build XMLValidator when XMP is enabled.
      Regression test for Exiv2/exiv2#1881
      Credit to OSS-Fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=37492
      Add second test file for better code coverage.
      Regression test for Exiv2/exiv2#1887
      Credit to OSS-Fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=37889
      Standardize on conan 1.39.0
      Credit to OSS-Fuzz: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=38887
      Add regression test to Exiv2/exiv2#1918
      Regression test for Exiv2/exiv2#1901
      Comment out bogus code.
      Add more checks to prevent integer overflow.
      Throw an exception on integer overflow.
      Fix indentation
      Fix build error on Fedora.
      We can't use decltype on the 0.27-maintenance branch.
      Add second test to improve code coverage.
      Add third test to improve code coverage.
      Add workaround for conan outage.
      Revert "Fix for Exiv2/exiv2#1856"
      Fix indentation
      Only include expat.h when XMP is enabled.
      DataBuf::read_uint methods don't exist on the 0.27-maintenance branch.
      Add bounds checking.
      Treat Exif.Sony1.PreviewImage as undefined tag.
      PoC image file for Exiv2/exiv2#2027
      Use memmove, rather than memcpy, because memory regions might overlap.
      Update tiffvisitor_int.cpp
      Fix bug in loop. It wasn't iterating over the elements of dateStrings as intended.
      Regression test for Exiv2/exiv2#2268
      Replace assert with enforce. (Fix for Exiv2/exiv2#2268)

Luis Diaz (4):
      ci: sync workflows with latest changes on main branch
      Fix out of bounds read in isValidBoxFileType()
      Add poc for fuzzing coverage
      ci: update conan version in ci jobs and dependencies version

Luis Díaz Más (15):
      ci: use always pip3 for installing conan
      ci: Use same travis jobs as in main (drop Ubuntu 16.04)
      New mergify config file to forward changes to main
      ci-travis: trying to fix valgrind build
      msvc: fix compiler warning on x86
      cmake: ignore PDBs warnings on Win/Debug/Static buils
      Increase the timeout from 20 to 60 seconds
      increase timeout
      Fix conan ci luis (#2018)
      0.27 Running tests with ctest (#2024)
      0.27 Nightly pre-builds for 0.27 (#2025)
      Fix JP2 write/read metadata
      Detect integer-overflow and throw in that case
      Add POC file for issue 2190
      Fix integer overflow #2179

Miloš Komarčević (30):
      Update bmffimage.hpp include order and path (#1648)
      Merge pull request #1548 from Exiv2/add_exif_gamma
      Check if embedded RAF image is really a TIFF
      Clarify comment on old vs new RAF
      Check I/O read result on RAF inspection
      Add test
      Limit CR3 previews to JPEG only
      Limit CR3 previews to JPEG only
      Expose unsupported CR3 previews as binary
      Streamline MinGW package installation for CI
      Update README.md for pacman command simplification
      Remove legacy MinGW CI builds
      Initial MSYS2 workflow for GHA
      Handle unused warnings
      Add more DNG 1.6 tags
      Switch Cygwin CI to GHA (#2032)
      Update conan for Windows CI
      Add Sony ARW compression to dict (#2046)
      Strip XMP raw packet before decoding (#2139)
      Update CI actions (0.27-maintenance) (#2142)
      Initial support for OM System MakerNote
      Add OM System MakerNote test
      Account for header bytes for Exif and XMP boxes (backport #2234)
      Add some F mount lenses
      PNG: always strip the existing iCCP chunk
      Add Nikon LensData v0802 (backport #2287)
      Add Nikon3.WhiteBalanceBias2 (backport #2311)
      ci: Upgrade conan to version 1.51.0
      Add more MIME type mappings for TIFF-based raws
      Exif start can be at any byte in payload, not word aligned

Nehal J Wani (3):
      Bump conan version
      Replace array with std::vector in decodeBase64()
      Exiv2 v0.27.6

Peter (3):
      Fix rename text in manpage (#2328)
      Fix bmff exception; Bump Conan version (#2375)
      Update docs concerning BMFF-based files (#2404)

Robin Mills (36):
      bump_release_number_0.37.4.39
      fix_enableBMFF
      Bump version number.
      Update releasenotes.txt
      update changelog
      fix_broken_man_page
      v0.27.4
      Fix Ubuntu 20.04/Release/Sanitizer test breaker
      update_docs_for_0.27.5.1
      Good catch, @hassec.  I noticed that change and thought "oh, somebody has update the man page.  I didn't know it searched the current directory."  I added that code 5+ years ago and forgotten what it does.  Right.  My bad.  I've fixed it.
      fix_1516_include_path
      update_docs_again
      update_27.5_docs_again
      Costmetic change to trigger CI.
      The CI is using cmake 3.10.  I've back-ported code from main/src/CMakeLists.txt
      bump_revision_27.5.2
      exiv2_v0.27.5RC3
      Build Trigger.
      Another build trigger.
      Exiv2 v0.27.5
      fix_1558_cmake_build_type
      retrigger checks
      retrigger checks
      retrigger checks
      add --verbose option for Cygwin/CI.  No idea why it's failing.  Been stable since I wrote it a year ago.
      Revert "add --verbose option for Cygwin/CI.  No idea why it's failing.  Been stable since I wrote it a year ago."
      The Cygwin/CI is broken. (#2003)
      Added a sentence to `5.4 Cygwin/64` about `apt-cyg`.
      Initial changes to documentation to support CTest.  I intend to integrate changes from main/README.md in this PR.
      Fixes following review.
      Bringing format/layout of 0.27-maintenance/README.md very close to main/README.md.
      Minor layout improvements.
      I've polished this and minimized the differences with main/README.md.  It's not possible to add lensTest into 0.27-maintenance without modifying Exiv2::getExiv2ConfigPath().
      Fixes following review.
      Fixes following review.
      fix_2044_add_tiff_tags
  • Loading branch information
fenrus75 committed May 31, 2023
1 parent 8adcabb commit bfaa1ef
Show file tree
Hide file tree
Showing 8 changed files with 1,147 additions and 1,143 deletions.
2 changes: 1 addition & 1 deletion Makefile
@@ -1,5 +1,5 @@
PKG_NAME := exiv2
URL = https://github.com/Exiv2/exiv2/archive/v0.28.0/exiv2-0.28.0.tar.gz
URL = https://github.com/Exiv2/exiv2/archive/v0.27.6/exiv2-0.27.6.tar.gz
ARCHIVES =

include ../common/Makefile.common
2 changes: 1 addition & 1 deletion buildreq_cache
@@ -1,2 +1,2 @@
0.28.0
0.27.6
zlib-dev
74 changes: 61 additions & 13 deletions exiv2.spec
Expand Up @@ -5,10 +5,10 @@
#
%define keepstatic 1
Name : exiv2
Version : 0.28.0
Release : 48
URL : https://github.com/Exiv2/exiv2/archive/v0.28.0/exiv2-0.28.0.tar.gz
Source0 : https://github.com/Exiv2/exiv2/archive/v0.28.0/exiv2-0.28.0.tar.gz
Version : 0.27.6
Release : 49
URL : https://github.com/Exiv2/exiv2/archive/v0.27.6/exiv2-0.27.6.tar.gz
Source0 : https://github.com/Exiv2/exiv2/archive/v0.27.6/exiv2-0.27.6.tar.gz
Summary : Exif, Iptc and XMP metadata manipulation library and tools
Group : Development/Tools
License : BSD-3-Clause GPL-2.0
Expand All @@ -25,6 +25,7 @@ BuildRequires : gettext-dev
BuildRequires : glibc-dev
BuildRequires : googletest-dev
BuildRequires : inih-dev
BuildRequires : libssh-dev
BuildRequires : zlib-dev
# Suppress stripping binaries
%define __strip /bin/true
Expand Down Expand Up @@ -79,16 +80,25 @@ Group: Default
man components for the exiv2 package.


%package staticdev
Summary: staticdev components for the exiv2 package.
Group: Default
Requires: exiv2-dev = %{version}-%{release}

%description staticdev
staticdev components for the exiv2 package.


%prep
%setup -q -n exiv2-0.28.0
cd %{_builddir}/exiv2-0.28.0
%setup -q -n exiv2-0.27.6
cd %{_builddir}/exiv2-0.27.6

%build
export http_proxy=http://127.0.0.1:9/
export https_proxy=http://127.0.0.1:9/
export no_proxy=localhost,127.0.0.1,0.0.0.0
export LANG=C.UTF-8
export SOURCE_DATE_EPOCH=1685501262
export SOURCE_DATE_EPOCH=1685542188
mkdir -p clr-build
pushd clr-build
export GCC_IGNORE_WERROR=1
Expand Down Expand Up @@ -121,7 +131,7 @@ make %{?_smp_mflags}
popd

%install
export SOURCE_DATE_EPOCH=1685501262
export SOURCE_DATE_EPOCH=1685542188
rm -rf %{buildroot}
mkdir -p %{buildroot}/usr/share/package-licenses/exiv2
cp %{_builddir}/exiv2-%{version}/COPYING %{buildroot}/usr/share/package-licenses/exiv2/be0b40ce8f9532b75966a20d14af123d3c6b05aa || :
Expand All @@ -140,8 +150,40 @@ popd

%files bin
%defattr(-,root,root,-)
/V3/usr/bin/addmoddel
/V3/usr/bin/exifcomment
/V3/usr/bin/exifdata
/V3/usr/bin/exifprint
/V3/usr/bin/exifvalue
/V3/usr/bin/exiv2
/V3/usr/bin/exiv2json
/V3/usr/bin/geotag
/V3/usr/bin/iptceasy
/V3/usr/bin/iptcprint
/V3/usr/bin/metacopy
/V3/usr/bin/mrwthumb
/V3/usr/bin/taglist
/V3/usr/bin/xmpdump
/V3/usr/bin/xmpparse
/V3/usr/bin/xmpprint
/V3/usr/bin/xmpsample
/usr/bin/addmoddel
/usr/bin/exifcomment
/usr/bin/exifdata
/usr/bin/exifprint
/usr/bin/exifvalue
/usr/bin/exiv2
/usr/bin/exiv2json
/usr/bin/geotag
/usr/bin/iptceasy
/usr/bin/iptcprint
/usr/bin/metacopy
/usr/bin/mrwthumb
/usr/bin/taglist
/usr/bin/xmpdump
/usr/bin/xmpparse
/usr/bin/xmpprint
/usr/bin/xmpsample

%files dev
%defattr(-,root,root,-)
Expand All @@ -165,7 +207,7 @@ popd
/usr/include/exiv2/gifimage.hpp
/usr/include/exiv2/http.hpp
/usr/include/exiv2/image.hpp
/usr/include/exiv2/image_types.hpp
/usr/include/exiv2/ini.hpp
/usr/include/exiv2/iptc.hpp
/usr/include/exiv2/jp2image.hpp
/usr/include/exiv2/jpgimage.hpp
Expand All @@ -174,7 +216,6 @@ popd
/usr/include/exiv2/mrwimage.hpp
/usr/include/exiv2/orfimage.hpp
/usr/include/exiv2/pgfimage.hpp
/usr/include/exiv2/photoshop.hpp
/usr/include/exiv2/pngimage.hpp
/usr/include/exiv2/preview.hpp
/usr/include/exiv2/properties.hpp
Expand All @@ -183,11 +224,14 @@ popd
/usr/include/exiv2/rafimage.hpp
/usr/include/exiv2/riffvideo.hpp
/usr/include/exiv2/rw2image.hpp
/usr/include/exiv2/rwlock.hpp
/usr/include/exiv2/slice.hpp
/usr/include/exiv2/ssh.hpp
/usr/include/exiv2/tags.hpp
/usr/include/exiv2/tgaimage.hpp
/usr/include/exiv2/tiffimage.hpp
/usr/include/exiv2/types.hpp
/usr/include/exiv2/utilsvideo.hpp
/usr/include/exiv2/value.hpp
/usr/include/exiv2/version.hpp
/usr/include/exiv2/webpimage.hpp
Expand All @@ -201,9 +245,9 @@ popd

%files lib
%defattr(-,root,root,-)
/V3/usr/lib64/libexiv2.so.0.28.0
/usr/lib64/libexiv2.so.0.28.0
/usr/lib64/libexiv2.so.28
/V3/usr/lib64/libexiv2.so.0.27.6
/usr/lib64/libexiv2.so.0.27.6
/usr/lib64/libexiv2.so.27

%files license
%defattr(0644,root,root,0755)
Expand All @@ -214,3 +258,7 @@ popd
%files man
%defattr(0644,root,root,0755)
/usr/share/man/man1/exiv2.1

%files staticdev
%defattr(-,root,root,-)
/usr/lib64/libexiv2-xmp.a
2 changes: 1 addition & 1 deletion options.conf
@@ -1,6 +1,6 @@
[package]
name = exiv2
url = https://github.com/Exiv2/exiv2/archive/v0.28.0/exiv2-0.28.0.tar.gz
url = https://github.com/Exiv2/exiv2/archive/v0.27.6/exiv2-0.27.6.tar.gz
archives =
giturl = https://github.com/Exiv2/exiv2.git
domain =
Expand Down
2 changes: 1 addition & 1 deletion release
@@ -1 +1 @@
48
49

0 comments on commit bfaa1ef

Please sign in to comment.