diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-07-09 15:43:36 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-07-09 15:43:36 +0100 |
commit | 2719f73b6813d11d13a9650cdd2ab8ec6e69385d (patch) | |
tree | 8c816148bcbd22757d892089c989ae614eae4f5a /media-gfx/exif | |
parent | 0f558761aa2dee1017b4751e4017205e015a9560 (diff) |
gentoo resync : 09.07.2022
Diffstat (limited to 'media-gfx/exif')
-rw-r--r-- | media-gfx/exif/Manifest | 2 | ||||
-rw-r--r-- | media-gfx/exif/exif-0.6.22-r1.ebuild | 31 | ||||
-rw-r--r-- | media-gfx/exif/files/exif-0.6.22-empty-string-check.patch | 40 |
3 files changed, 73 insertions, 0 deletions
diff --git a/media-gfx/exif/Manifest b/media-gfx/exif/Manifest index 8165f702b487..95a8476f3eee 100644 --- a/media-gfx/exif/Manifest +++ b/media-gfx/exif/Manifest @@ -1,3 +1,5 @@ +AUX exif-0.6.22-empty-string-check.patch 1272 BLAKE2B ea6d3c4f2c3dd75ca1d9c75433a830282b252197c5b9885278823ed70dcd1ab0e319536c9f012d093da32f7af345280f7004b5b78f0e7800ede9ea4e16de46e2 SHA512 bce1a58033f7597219f2be2edbc4b8b821b1fb6f4de591d3b94010806f278d0bad20af24d7e05aff00b02057ed70ecea548f848ac8412748312eca3a6e6d6682 DIST exif-0.6.22.tar.gz 569665 BLAKE2B 556927fca99416ff174c0c4403337f2f8b85cb14472d920a48a9598d8b7e3be6b800b0b37a764cd89fb45b62376a05ef1f0ae6b260a076f0949aadf8a441a2eb SHA512 b194bacb28ff2b910014edce732f97a875852abd486ce62bcf9274eb0ed668a0ee9c954cf60455191969aacb48d3d4d3172958a183b29f050c0bf8d55de14e7d +EBUILD exif-0.6.22-r1.ebuild 724 BLAKE2B aac4d306ca20bab2cef5775d2fb8d617fd1f730eb2baf7fb7539d450f68aeb2eea789b329363b257a3d458e06ee20e5b3feefe5cc4918952a0bb28c16fff6b9d SHA512 7ea9bb8ec897186f2a50e1735ae3641ee5b0809d5bbace8e9134b589158291419dc26fc51ff4e731624184f62995d257356d89d71ed8fccddcffb13d1d120d3e EBUILD exif-0.6.22.ebuild 661 BLAKE2B 8bd9f5447a59f623dfdd84523c165a930bb574e065542e61eb1829442d294b2397228ca307b55e610d02c6055fd5df4f00fe16dc8a8f1013ef86a0f065e3a341 SHA512 5659604e4c43e7301487d4f5a0d66311cffa3d5a2b5ee205c3236b31726bef926aa7c3ef37bca4670c3910c7192e412ff76813e125748aa122f4022c6eb936ef MISC metadata.xml 250 BLAKE2B 8eb6eab9ea8b6b85471a0f59c7f2dedef42afde5fac2bab4db03005a5496fc934f220f62fd54180e8372065e52b15fc5637fb73932d123ae73dbcacf800594cf SHA512 9e3dfd65976e61d9d51d5affddeb0aea1778cd3ce8de7e9c51668a71c0bbf8fd459df72d958d0acb8b4f2a495343a10648df398537803d6f0bde356c2066f6d1 diff --git a/media-gfx/exif/exif-0.6.22-r1.ebuild b/media-gfx/exif/exif-0.6.22-r1.ebuild new file mode 100644 index 000000000000..fd7f812a2eb9 --- /dev/null +++ b/media-gfx/exif/exif-0.6.22-r1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Small CLI util to show EXIF infos hidden in JPEG files" +HOMEPAGE="https://libexif.github.io/ https://github.com/libexif/exif" +SRC_URI="https://github.com/lib${PN}/${PN}/releases/download/${PN}-${PV//./_}-release/${P}.tar.gz" + +LICENSE="LGPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="nls" + +BDEPEND=" + virtual/pkgconfig + nls? ( sys-devel/gettext ) +" +DEPEND=" + dev-libs/popt + >=media-libs/libexif-${PV} +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-empty-string-check.patch +) + +src_configure() { + econf $(use_enable nls) +} diff --git a/media-gfx/exif/files/exif-0.6.22-empty-string-check.patch b/media-gfx/exif/files/exif-0.6.22-empty-string-check.patch new file mode 100644 index 000000000000..377e905940b5 --- /dev/null +++ b/media-gfx/exif/files/exif-0.6.22-empty-string-check.patch @@ -0,0 +1,40 @@ +https://bugs.gentoo.org/783522 + +Source: https://github.com/libexif/exif/commit/f6334d9d32437ef13dc902f0a88a2be0063d9d1c.patch +From: Marcus Meissner <marcus@jet.franken.de> +Date: Thu, 25 Feb 2021 08:31:53 +0100 +Subject: [PATCH] added empty strign check, which would lead to NULL ptr + deref/crash in exif XML display. fixes + https://github.com/libexif/exif/issues/4 + +--- a/exif/actions.c ++++ b/exif/actions.c +@@ -661,6 +661,8 @@ escape_xml(const char *text) + char *out; + size_t len; + ++ if (!strlen(text)) return "empty string"; ++ + for (out=escaped, len=0; *text; ++len, ++out, ++text) { + /* Make sure there's plenty of room for a quoted character */ + if ((len + 8) > escaped_size) { + +Source: https://github.com/libexif/exif/commit/eb84b0e3c5f2a86013b6fcfb800d187896a648fa.patch +From: Marcus Meissner <marcus@jet.franken.de> +Date: Thu, 25 Feb 2021 09:45:36 +0100 +Subject: [PATCH] actually return empty stringand not 'em,pty string' as + expected + +--- a/exif/actions.c ++++ b/exif/actions.c +@@ -661,7 +661,7 @@ escape_xml(const char *text) + char *out; + size_t len; + +- if (!strlen(text)) return "empty string"; ++ if (!strlen(text)) return ""; + + for (out=escaped, len=0; *text; ++len, ++out, ++text) { + /* Make sure there's plenty of room for a quoted character */ + + |