commit: 64cfcaa52778c853abeb26d16803346a4023f181 Author: John Helmert III <ajak <AT> gentoo <DOT> org> AuthorDate: Thu Oct 14 21:59:28 2021 +0000 Commit: John Helmert III <ajak <AT> gentoo <DOT> org> CommitDate: Sun Oct 17 20:36:35 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64cfcaa5
media-libs/libjpeg-turbo: drop 1.5.3-r4, 2.1.0-r2 Bug: https://bugs.gentoo.org/797424 Bug: https://bugs.gentoo.org/814206 Closes: https://bugs.gentoo.org/787422 Signed-off-by: John Helmert III <ajak <AT> gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/22581 media-libs/libjpeg-turbo/Manifest | 2 - .../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, 400 deletions(-) diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest index cfac31e30b1..5ba827745c7 100644 --- a/media-libs/libjpeg-turbo/Manifest +++ b/media-libs/libjpeg-turbo/Manifest @@ -1,4 +1,2 @@ -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 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 523eed7557d..00000000000 --- 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 8a9fcbd7972..00000000000 --- 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 <[email protected]> -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 f99a1ab27f9..00000000000 --- 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 <[email protected]> -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 c7e6d105676..00000000000 --- 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 0df02e0f65e..00000000000 --- 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 c9b38904748..00000000000 --- 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 <<EOF || die -add_executable(${FILE%.c} ${FILE}) -install(TARGETS ${FILE%.c}) -EOF - done - - for FILE in ../debian/extra/exifautotran; do - cat >> CMakeLists.txt <<EOF || die -install(FILES \${CMAKE_CURRENT_SOURCE_DIR}/${FILE} DESTINATION \${CMAKE_INSTALL_BINDIR}) -EOF - done - - for FILE in ../debian/extra/*.[0-9]*; do - cat >> CMakeLists.txt <<EOF || die -install(FILES \${CMAKE_CURRENT_SOURCE_DIR}/${FILE} DESTINATION \${CMAKE_INSTALL_MANDIR}/man${FILE##*.}) -EOF - done - - cmake_src_prepare - java-pkg-opt-2_src_prepare -} - -multilib_src_configure() { - if multilib_is_native_abi && use java ; then - export JAVACFLAGS="$(java-pkg_javac-args)" - export JNI_CFLAGS="$(java-pkg_get-jni-cflags)" - fi - - local mycmakeargs=( - -DCMAKE_INSTALL_DEFAULT_DOCDIR="${EPREFIX}/usr/share/doc/${PF}" - -DENABLE_STATIC="$(usex static-libs)" - -DWITH_JAVA="$(multilib_native_usex java)" - -DWITH_MEM_SRCDST=ON - ) - - # Avoid ARM ABI issues by disabling SIMD for CPUs without NEON. #792810 - if use arm; then - mycmakeargs+=( - -DWITH_SIMD:BOOL=$(usex cpu_flags_arm_neon ON OFF) - ) - fi - - # mostly for Prefix, ensure that we use our yasm if installed and - # not pick up host-provided nasm - if has_version -b dev-lang/yasm && ! has_version -b dev-lang/nasm; then - mycmakeargs+=( - -DCMAKE_ASM_NASM_COMPILER=$(type -P yasm) - ) - fi - - cmake_src_configure -} - -multilib_src_install() { - cmake_src_install - - if multilib_is_native_abi && use java ; then - rm -rf "${ED}"/usr/classes || die - java-pkg_dojar java/turbojpeg.jar - fi -} - -multilib_src_install_all() { - find "${ED}" -type f -name '*.la' -delete || die - - local -a DOCS=( README.md ChangeLog.md ) - einstalldocs - - newdoc "${WORKDIR}"/debian/changelog changelog.debian - - docinto html - dodoc -r "${S}"/doc/html/. - - if use java; then - docinto html/java - dodoc -r "${S}"/java/doc/. - newdoc "${S}"/java/README README.java - fi -}
