gentoo auto-resync : 15:10:2023 - 16:00:49

3 files changed, 86 insertions, 0 deletions

diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest
index 2011aa445b95..26ee43a9995a 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -1,3 +1,5 @@
+AUX libraw-0.21.1-CVE-2023-1729.patch 810 BLAKE2B 23388d0f1fe99d6d7641a6d871da5165118260107d70dd34dee691704f626e6bd12f9763b4076d0f790f21fccb590d95bdaa26329edb864ac0338b9535c23572 SHA512 c0e77285f9de35bd5511b1f07317facb63393135e5615fc6b44ad9b396d4486b7e95cbee5acef8ba82afd296d95d17fd10ead47686d07919a625b301f72de040
 DIST LibRaw-0.21.1.tar.gz 1638461 BLAKE2B 5db9a02f6854b90acf5e22419e2bc5470118140173be38cb520cc03553a328cad86d97ebda62c149622e045325ce82dcc34df40b5f700c319929c10fc43fdc9e SHA512 8d11df0be2af5fd8a8251f150ccd59103319606f52effff541ee43e97ceb64f1a00a02bba7b730aedd0c1c705c1e465793c8a2a52769712c1102af7f5534dd5d
+EBUILD libraw-0.21.1-r1.ebuild 1604 BLAKE2B 112bd29003dfba67de8df1d608fcb21236461707dafeac4eef55afb6221d4ef59b4f1ae9afe3cc5a8e292e1e4cef7f3bbb8f2b8fdb4f9328cce616fbc5efa677 SHA512 db6a052f4d039ded18a029970deef33553933864de3284f43c5eb102d169f473c4797b3c300fd7cf4d87473c659a6927a15718d132e91500f36b0ed077c6525a
 EBUILD libraw-0.21.1.ebuild 1545 BLAKE2B 6c064249c7ae9c3e1dd1119de71d463313b9a43c333167a373aec29a4434aed6e6b96345a79d0dad09017754b72234e30eda17c69854c0caaa6225a68ba82491 SHA512 4737b259683ca8557f5fa3ae58d10c3025dc63774bb8fb4a184012acc94a96267ebef5536dab3c6a6635d6580cb71c1f8758936c2954162d8d9a9b9ccdc3981c
 MISC metadata.xml 277 BLAKE2B 173d0b654a315fbeb39d77d02381d4acddceb0ea54baf2cdd2026b6cf5665299dc2944e68ae103181620df1e27a53cf82279e54b7e5f497ee1fd1e06db4e4556 SHA512 e2e9247845f55db13088ad027b4c056c7a070e1ab9a7bb74faed666347d646ba28ad121bfb38e3995844518f0a2583e1a51f6b3ca49295639157f98728444fda
diff --git a/media-libs/libraw/files/libraw-0.21.1-CVE-2023-1729.patch b/media-libs/libraw/files/libraw-0.21.1-CVE-2023-1729.patch
new file mode 100644
index 000000000000..427b3c852c16
--- /dev/null
+++ b/media-libs/libraw/files/libraw-0.21.1-CVE-2023-1729.patch
@@ -0,0 +1,22 @@
+From 9ab70f6dca19229cb5caad7cc31af4e7501bac93 Mon Sep 17 00:00:00 2001
+From: Alex Tutubalin <lexa@lexa.ru>
+Date: Sat, 14 Jan 2023 18:32:59 +0300
+Subject: [PATCH] do not set shrink flag for 3/4 component images
+
+---
+ src/preprocessing/raw2image.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/preprocessing/raw2image.cpp b/src/preprocessing/raw2image.cpp
+index e65e2ad7..702cf290 100644
+--- a/src/preprocessing/raw2image.cpp
++++ b/src/preprocessing/raw2image.cpp
+@@ -43,6 +43,8 @@ void LibRaw::raw2image_start()
+ 
+   // adjust for half mode!
+   IO.shrink =
++	  !imgdata.rawdata.color4_image && !imgdata.rawdata.color3_image &&
++	  !imgdata.rawdata.float4_image && !imgdata.rawdata.float3_image &&
+       P1.filters &&
+       (O.half_size || ((O.threshold || O.aber[0] != 1 || O.aber[2] != 1)));
+ 
diff --git a/media-libs/libraw/libraw-0.21.1-r1.ebuild b/media-libs/libraw/libraw-0.21.1-r1.ebuild
new file mode 100644
index 000000000000..98313a578726
--- /dev/null
+++ b/media-libs/libraw/libraw-0.21.1-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-minimal toolchain-funcs
+
+MY_PN=LibRaw
+MY_PV="${PV/_b/-B}"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="LibRaw is a library for reading RAW files obtained from digital photo cameras"
+HOMEPAGE="https://www.libraw.org/ https://github.com/LibRaw/LibRaw"
+SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1 CDDL"
+# SONAME isn't exactly the same as PV but it does correspond and
+# libraw has unstable ABI across releases.
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples jpeg +lcms openmp zlib"
+
+RDEPEND="
+	jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
+	lcms? ( >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] )
+	zlib? ( sys-libs/zlib[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( Changelog.txt README.md )
+
+PATCHES=( "${FILESDIR}/${P}-CVE-2023-1729.patch" )
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-jasper
+		$(multilib_native_use_enable examples)
+		$(use_enable jpeg)
+		$(use_enable lcms)
+		$(use_enable openmp)
+		$(use_enable zlib)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# package installs .pc files
+	find "${D}" -name '*.la' -delete || die
+}