From 46eedbedafdb0040c37884982d4c775ce277fb7b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 20 Oct 2021 10:22:14 +0100 Subject: gentoo resync : 20.10.2021 --- media-libs/libjpeg-turbo/Manifest | 8 -- .../files/libjpeg-turbo-1.2.0-x32.patch | 38 ------ .../files/libjpeg-turbo-1.5.3-CVE-2020-13790.patch | 43 ------- .../files/libjpeg-turbo-1.5.3-cve-2018-11813.patch | 45 -------- .../files/libjpeg-turbo-1.5.3-divzero_fix.patch | 18 --- .../libjpeg-turbo/libjpeg-turbo-1.5.3-r4.ebuild | 126 -------------------- .../libjpeg-turbo/libjpeg-turbo-2.1.0-r2.ebuild | 128 --------------------- 7 files changed, 406 deletions(-) delete mode 100644 media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-x32.patch delete mode 100644 media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-CVE-2020-13790.patch delete mode 100644 media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-cve-2018-11813.patch delete mode 100644 media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-divzero_fix.patch delete mode 100644 media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r4.ebuild delete mode 100644 media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r2.ebuild (limited to 'media-libs/libjpeg-turbo') diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest index 6ee8d9b364bc..f203e9a63a0b 100644 --- a/media-libs/libjpeg-turbo/Manifest +++ b/media-libs/libjpeg-turbo/Manifest @@ -1,13 +1,5 @@ -AUX libjpeg-turbo-1.2.0-x32.patch 1248 BLAKE2B 760f35a02c6a565a43702a4188186732f93c57a5c879cdc6920c427da097c3dc5eb111189c40510252c0209caf63100ecff7ffec1b10a177b09449db4dc5c3c6 SHA512 9ffc28a89db43eba9545bca2d4c1f5a11953f36a46e294b697bda190058dcaa59982f83552ce54f37ef83970d4b0fefd1e14497854c7991db38ab7f7c1c6afae -AUX libjpeg-turbo-1.5.3-CVE-2020-13790.patch 1744 BLAKE2B 7cfd68e3f29b530ad573c5f6476ef539e3499d2cfafbe5be129c1a246cf2f3e7f170e71bfb33adbaebe6b3812ccdfd72d99c5961011e093f740d7182fd7c1398 SHA512 1f97899970327fb6dabe521e93029a518f1493bdf45f9a345f55e803f97af7f36b65d569e4921c1aab7478006b4cd34c4f17bf150a7ffdd3760f14d9acb5b303 -AUX libjpeg-turbo-1.5.3-cve-2018-11813.patch 1240 BLAKE2B 469eefb5673f48ca8892050507bc7566cacb0b7ff2d2914428971a994bb41d9d717be7fe0a4908cee2ee57a74f6ca8112bee53cb021f4fadbef201536ebee979 SHA512 2542833a6afdbf1f2112695c524197bf5a319ef99c1c6ecea0fe0436681c45321bb6eb59e25fa97d8fa923717452f609e3f85d25547751fa4f8fe99f4ee789c9 -AUX libjpeg-turbo-1.5.3-divzero_fix.patch 792 BLAKE2B 31d3617155ac639ebd49a5db9c3898fdd6b20dc04776003121d6c906a96a8963984405b674ad6bee81c6de97304da78fa1de249cca7000fa7eed42f011e5a918 SHA512 b8ba793319e1f8c658f550fe6427625b2053486d784133c6b9e6778fac74c4eedadb6b9c208c6725a27cf585b4857c719ae03efaf602e181c4b782d55cb9b47a AUX libjpeg-turbo-2.1.1-arm64-relro.patch 679 BLAKE2B f6ea6f311cc05ff960d76cdc49afc1d14bf4d638052d1f6007defe239757002ecad18823d706a2e5f5e51245a2447c237c97daf0862e2e1889c751b52f3890b7 SHA512 56ef2f905fe54921618a0c4f79de67cf74070d1ee595d3b4b41f19b33e23701d8045b250b28b8c53b1bd8911f4179dd3b1594a5e85ac9dbce8c869feef1ad124 -DIST libjpeg-turbo-1.5.3.tar.gz 1658672 BLAKE2B 4d2182802aa9963fa57ec2c4fb5cf0a586847d43803e4c2d2e12cf1144c4da0ede7fdbace5965c77cd6df4547090165615960ebb65c964fd2fac823c021f50b7 SHA512 b611b1cc3d1ddedddad871854b42449d053a5f910ed1bdfa45c98e0270f4ecc110fde3a10111d2b876d847a826fa634f09c0bb8c357056c9c3a91c9065eb5202 -DIST libjpeg-turbo-2.1.0.tar.gz 2255497 BLAKE2B 693eccd00e8e1574e60ceb7464552ce9c4fd370c5ec4fc0dc3696ead7b4cd031228aaaf0eef3ceba194bb96bac6134b9c951162c0b81e88637edd6e71f4577f7 SHA512 6632a2a71cb3a350fe4f850fe84e51e361755c373babf2b47fb164c3a9fc3fd66705639bebedd8c1b40cf6c15fd702e814425b0be5919048987bbec357828605 DIST libjpeg-turbo-2.1.1.tar.gz 2256321 BLAKE2B ad3fc108e0136220586cc59a277735d573a82d740146d2ac091cbb50af84019b7c623ca1c9c2e6e0f8a672b6fde7ed23441b199eef2435a52013abd73a3a7157 SHA512 9cf61b4677b38e254063248a3fdbe138634d23a35ae8f2ee2661bdb3248b1d0500bd43201b8d9fe66c779d578074fd9ed19bc097ba22e10143530c2a19738673 DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675 -EBUILD libjpeg-turbo-1.5.3-r4.ebuild 2978 BLAKE2B 50575c65e6fd694e2a9b3a124294f72974a2996ed3d8434ef7cc60ca00c59bec617f0ee5472bc5fbf8a0afa6bb4bb3d2c0e5fff6087c287ba9818133d8a79eb1 SHA512 50937ee99535fe2d4aa9da3b403f9dc412a39ea15551f216845645ac8cdcb711570553ed444c9154bfd980c8019da230c0d1b2089abea34f40aa00f9b3d89866 -EBUILD libjpeg-turbo-2.1.0-r2.ebuild 3224 BLAKE2B e96c8b4aea2e7b1f445c80f4c4cff87b83169f7c273df39bc06dfe95cd3609e7213c685118097ca549efed282e1c315a9a1901d5001f3aa8e155fbc6def1a8f9 SHA512 7d91d57218b278bcc19010250be0446c4d85982c063469553649cfaa7038e00fce92bb59820e24c397915a5f7e8a4f952b64fb84d57caa70a6b73ba7496fd745 EBUILD libjpeg-turbo-2.1.1-r2.ebuild 3308 BLAKE2B a564ec8e512f77cf44021081698ed5b0e14b441bfa8b3a112ecfc7a9d0fa2c1afdc9988a46a4a5fe29464b7dd1c46874fe70256d2f4dad8cfd98a28d11a10191 SHA512 59d55f613e9625be5ae27dd8942874ab632dca5e3db3cbc7eff7394f46558bbd8bbfac633d9266e92cfcc374929d47ac8af11c2d645aaeb74d5e6b9e573e5fb1 MISC metadata.xml 567 BLAKE2B b4e2dc1098bc3a518b8af80dd63a9d6d000c6a62ab26e9d7792743b10955738bfccde4f6e32d46599194d8f63066913dad4b20c7a8674917d7bf9cd217a0f9bc SHA512 d9af7f4a6ca425c6ae75ac96da3b4467c62dc3baa0be04e590dc821f17e03e12279ed1faf2e66944ce0bed9ed0c9b176e7e372278062588db7adc9ed71f200c1 diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-x32.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-x32.patch deleted file mode 100644 index 523eed7557d5..000000000000 --- a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-x32.patch +++ /dev/null @@ -1,38 +0,0 @@ -https://bugs.gentoo.org/420239 - -https://sourceforge.net/tracker/?func=detail&aid=3533795&group_id=303195&atid=1278160 - ---- a/configure -+++ b/configure -@@ -33,7 +33,11 @@ case "$host_os" in - linux*) - case "$host_cpu" in - x86_64) -- objfmt='ELF64' -+ if echo __ILP32__ | $CC $CFLAGS -E - | grep __ILP32__ > /dev/null; then -+ objfmt='ELF64' -+ else -+ objfmt='ELFX32' -+ fi - ;; - *) - objfmt='ELF' -@@ -94,6 +98,7 @@ case "$objfmt" in - a.out) NAFLAGS='-faout -DAOUT';; - BSD-a.out) NAFLAGS='-faoutb -DAOUT';; - ELF) NAFLAGS='-felf -DELF';; -+ ELFX32) NAFLAGS='-felfx32 -DELF -D__x86_64__';; - ELF64) NAFLAGS='-felf64 -DELF -D__x86_64__';; - RDF) NAFLAGS='-frdf -DRDF';; - Mach-O) NAFLAGS='-fmacho -DMACHO';; ---- a/simd/nasm_lt.sh -+++ b/simd/nasm_lt.sh -@@ -11,7 +11,7 @@ while [ $# -gt 0 ]; do - pic=yes - fi - ;; -- -f|-fbin|-faout|-faoutb|-fcoff|-felf|-felf64|-fas86| \ -+ -f|-fbin|-faout|-faoutb|-fcoff|-felf|-felf64|-felfx32|-fas86| \ - -fobj|-fwin32|-fwin64|-frdf|-fieee|-fmacho|-fmacho64) - # it's a file format specifier for nasm. - command="$command $1" diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-CVE-2020-13790.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-CVE-2020-13790.patch deleted file mode 100644 index 8a9fcbd79724..000000000000 --- a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-CVE-2020-13790.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 1bfb0b5247f4fc8f6677639781ce468543490216 Mon Sep 17 00:00:00 2001 -From: DRC -Date: Tue, 2 Jun 2020 14:15:37 -0500 -Subject: [PATCH] rdppm.c: Fix buf overrun caused by bad binary PPM - -This extends the fix in 1e81b0c3ea26f4ea8f56de05367469333de64a9f to -include binary PPM files with maximum values < 255, thus preventing a -malformed binary PPM input file with those specifications from -triggering an overrun of the rescale array and potentially crashing -cjpeg, TJBench, or any program that uses the tjLoadImage() function. - -Fixes #433 -diff --git a/rdppm.c b/rdppm.c -index c0c096218..899436eec 100644 ---- a/rdppm.c -+++ b/rdppm.c -@@ -5,7 +5,7 @@ - * Copyright (C) 1991-1997, Thomas G. Lane. - * Modified 2009 by Bill Allombert, Guido Vollbeding. - * libjpeg-turbo Modifications: -- * Copyright (C) 2015, 2016, D. R. Commander. -+ * Copyright (C) 2015, 2016, 2020, D. R. Commander. - * For conditions of distribution and use, see the accompanying README.ijg - * file. - * -@@ -22,6 +22,7 @@ - * the file is indeed PPM format). - */ - -+#define JPEG_INTERNALS - #include "cdjpeg.h" /* Common decls for cjpeg/djpeg applications */ - - #ifdef PPM_SUPPORTED -@@ -425,7 +426,7 @@ start_input_ppm (j_compress_ptr cinfo, cjpeg_source_ptr sinfo) - /* On 16-bit-int machines we have to be careful of maxval = 65535 */ - source->rescale = (JSAMPLE *) - (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, -- (size_t) (((long) maxval + 1L) * -+ (size_t) (((long) MAX(maxval, 255) + 1L) * - sizeof(JSAMPLE))); - half_maxval = maxval / 2; - for (val = 0; val <= (long) maxval; val++) { - diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-cve-2018-11813.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-cve-2018-11813.patch deleted file mode 100644 index f99a1ab27f97..000000000000 --- a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-cve-2018-11813.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 909a8cfc7bca9b2e6707425bdb74da997e8fa499 Mon Sep 17 00:00:00 2001 -From: DRC -Date: Tue, 12 Jun 2018 16:08:26 -0500 -Subject: [PATCH] Fix CVE-2018-11813 - -Refer to change log for details. - -Fixes #242 ---- - ChangeLog.md | 14 ++++++++++++++ - rdtarga.c | 6 ++---- - 2 files changed, 16 insertions(+), 4 deletions(-) - ---- libjpeg-turbo-1.5.3/rdtarga.c -+++ libjpeg-turbo-1.5.3/rdtarga.c -@@ -125,11 +125,10 @@ - read_non_rle_pixel (tga_source_ptr sinfo) - /* Read one Targa pixel from the input file; no RLE expansion */ - { -- register FILE *infile = sinfo->pub.input_file; - register int i; - - for (i = 0; i < sinfo->pixel_size; i++) { -- sinfo->tga_pixel[i] = (U_CHAR) getc(infile); -+ sinfo->tga_pixel[i] = (U_CHAR) read_byte(sinfo); - } - } - -@@ -138,7 +137,6 @@ - read_rle_pixel (tga_source_ptr sinfo) - /* Read one Targa pixel from the input file, expanding RLE data as needed */ - { -- register FILE *infile = sinfo->pub.input_file; - register int i; - - /* Duplicate previously read pixel? */ -@@ -160,7 +158,7 @@ - - /* Read next pixel */ - for (i = 0; i < sinfo->pixel_size; i++) { -- sinfo->tga_pixel[i] = (U_CHAR) getc(infile); -+ sinfo->tga_pixel[i] = (U_CHAR) read_byte(sinfo); - } - } - diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-divzero_fix.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-divzero_fix.patch deleted file mode 100644 index c7e6d1056769..000000000000 --- a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.3-divzero_fix.patch +++ /dev/null @@ -1,18 +0,0 @@ -Backported from -https://github.com/libjpeg-turbo/libjpeg-turbo/commit/43e84cff1bb2bd8293066f6ac4eb0df61ddddbc6 - ---- libjpeg-turbo-1.5.3/rdbmp.c -+++ libjpeg-turbo-1.5.3/rdbmp.c -@@ -434,6 +434,12 @@ - progress->total_extra_passes++; /* count file input as separate pass */ - } - -+ /* Ensure that biWidth * cinfo->input_components doesn't exceed the maximum -+ value of the JDIMENSION type. This is only a danger with BMP files, since -+ their width and height fields are 32-bit integers. */ -+ if ((unsigned long long)biWidth * -+ (unsigned long long)cinfo->input_components > 0xFFFFFFFFULL) -+ ERREXIT(cinfo, JERR_WIDTH_OVERFLOW); - /* Allocate one-row buffer for returned data */ - source->pub.buffer = (*cinfo->mem->alloc_sarray) - ((j_common_ptr) cinfo, JPOOL_IMAGE, diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r4.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r4.ebuild deleted file mode 100644 index 0df02e0f65ee..000000000000 --- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.3-r4.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools java-pkg-opt-2 toolchain-funcs multilib-minimal - -DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library" -HOMEPAGE="https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz - mirror://gentoo/libjpeg8_8d-2.debian.tar.gz" - -LICENSE="BSD IJG ZLIB" -SLOT="0/0.1" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="java static-libs" - -ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )" - -COMMON_DEPEND="!media-libs/jpeg:0 - !media-libs/jpeg:62" - -BDEPEND="amd64? ( ${ASM_DEPEND} ) - x86? ( ${ASM_DEPEND} ) - amd64-fbsd? ( ${ASM_DEPEND} ) - x86-fbsd? ( ${ASM_DEPEND} ) - amd64-linux? ( ${ASM_DEPEND} ) - x86-linux? ( ${ASM_DEPEND} ) - x64-macos? ( ${ASM_DEPEND} ) - x64-cygwin? ( ${ASM_DEPEND} )" - -DEPEND="${COMMON_DEPEND} - java? ( >=virtual/jdk-1.5 )" - -RDEPEND="${COMMON_DEPEND} - java? ( >=virtual/jre-1.5 )" - -MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h ) - -PATCHES=( - "${FILESDIR}"/${PN}-1.2.0-x32.patch #420239 - "${FILESDIR}"/${P}-divzero_fix.patch #658624 - "${FILESDIR}"/${P}-cve-2018-11813.patch - "${FILESDIR}"/${P}-CVE-2020-13790.patch -) - -src_prepare() { - default - - eautoreconf - - java-pkg-opt-2_src_prepare -} - -multilib_src_configure() { - local myconf=() - if multilib_is_native_abi; then - myconf+=( $(use_with java) ) - if use java; then - export JAVACFLAGS="$(java-pkg_javac-args)" - export JNI_CFLAGS="$(java-pkg_get-jni-cflags)" - fi - else - myconf+=( --without-java ) - fi - [[ ${ABI} == "x32" ]] && myconf+=( --without-simd ) #420239 - - # Force /bin/bash until upstream generates a new version. #533902 - CONFIG_SHELL="${EPREFIX}"/bin/bash \ - ECONF_SOURCE=${S} \ - econf \ - $(use_enable static-libs static) \ - --with-mem-srcdst \ - "${myconf[@]}" -} - -multilib_src_compile() { - local _java_makeopts - use java && _java_makeopts="-j1" - emake ${_java_makeopts} - - if multilib_is_native_abi; then - pushd ../debian/extra >/dev/null - emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}" - popd >/dev/null - fi -} - -multilib_src_test() { - emake test -} - -multilib_src_install() { - emake \ - DESTDIR="${D}" \ - docdir="${EPREFIX}"/usr/share/doc/${PF} \ - exampledir="${EPREFIX}"/usr/share/doc/${PF} \ - install - - if multilib_is_native_abi; then - pushd "${WORKDIR}"/debian/extra >/dev/null - emake \ - DESTDIR="${D}" prefix="${EPREFIX}"/usr \ - INSTALL="install -m755" INSTALLDIR="install -d -m755" \ - install - popd >/dev/null - - if use java; then - rm -rf "${ED}"/usr/classes - java-pkg_dojar java/turbojpeg.jar - fi - fi -} - -multilib_src_install_all() { - find "${ED}" -type f -name '*.la' -delete || die - - docinto html - dodoc -r "${S}"/doc/html/* - newdoc "${WORKDIR}"/debian/changelog changelog.debian - if use java; then - docinto html/java - dodoc -r "${S}"/java/doc/* - newdoc "${S}"/java/README README.java - fi -} diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r2.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r2.ebuild deleted file mode 100644 index c9b389047486..000000000000 --- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r2.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_ECLASS=cmake -inherit cmake-multilib java-pkg-opt-2 - -DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library" -HOMEPAGE="https://libjpeg-turbo.org/ https://sourceforge.net/projects/libjpeg-turbo/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz - mirror://gentoo/libjpeg8_8d-2.debian.tar.gz" - -LICENSE="BSD IJG ZLIB" -SLOT="0/0.2" -if [[ "$(ver_cut 3)" -lt 90 ]] ; then - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris" -fi -IUSE="cpu_flags_arm_neon java static-libs" - -ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )" - -COMMON_DEPEND="!media-libs/jpeg:0 - !media-libs/jpeg:62" - -BDEPEND=">=dev-util/cmake-3.16.5 - amd64? ( ${ASM_DEPEND} ) - x86? ( ${ASM_DEPEND} ) - amd64-fbsd? ( ${ASM_DEPEND} ) - x86-fbsd? ( ${ASM_DEPEND} ) - amd64-linux? ( ${ASM_DEPEND} ) - x86-linux? ( ${ASM_DEPEND} ) - x64-macos? ( ${ASM_DEPEND} ) - x64-cygwin? ( ${ASM_DEPEND} )" - -DEPEND="${COMMON_DEPEND} - java? ( >=virtual/jdk-1.8:* )" - -RDEPEND="${COMMON_DEPEND} - java? ( >=virtual/jre-1.8:* )" - -MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h ) - -src_prepare() { - local FILE - ln -snf ../debian/extra/*.c . || die - - for FILE in ../debian/extra/*.c; do - FILE=${FILE##*/} - cat >> CMakeLists.txt <> CMakeLists.txt <> CMakeLists.txt <