[gentoo-commits] repo/gentoo:master commit in: media-libs/libjpeg-turbo/, media-libs/libjpeg-turbo/files/

[Lars Wendler]

commit:     8492c4dc39731d78f748997e51371244e9a7a03f
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  1 07:45:49 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Aug  1 07:57:38 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8492c4dc

media-libs/libjpeg-turbo: Bump to version 2.0.0. Removed old.

Package-Manager: Portage-2.3.44, Repoman-2.3.10

 media-libs/libjpeg-turbo/Manifest                  |  2 +-
 .../files/libjpeg-turbo-1.5.90-divzero_fix.patch   | 41 ----------------------
 ...1.5.90-r1.ebuild => libjpeg-turbo-2.0.0.ebuild} |  4 ---
 3 files changed, 1 insertion(+), 46 deletions(-)

diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index 834f2379e8b..986b30cb310 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -2,5 +2,5 @@ DIST libjpeg-turbo-1.5.0.tar.gz 1654276 BLAKE2B b3f1ad4c6bbe5b75ef8daa38e0ccf616
 DIST libjpeg-turbo-1.5.1.tar.gz 1650647 BLAKE2B 5e9eb7889c430a735a8b8ac22fbf66fc98102acf372d08aa2dbd86ac55d43c5700438a77925f894c473e81289e4d3d2e6fe3da435d2799db21782da9bd5dfe41 SHA512 a03823cf4b3d1aada24e502fea0a979b1f656c01e55ffddc06013b9c79509c2da1e3bcf0b85282289451d77d4cb5f56dd8cbf6e492744836ddda1f7136534852
 DIST libjpeg-turbo-1.5.2.tar.gz 1657235 BLAKE2B 8d26af1cf6219e02f13f8729b688175590b01a4ce538ae861e72e6344a319475f8114ad05aefe2f8ffd6b5481c7915bd18097466408729d80212a2db7f99ad5c SHA512 c7fe5cc77e38fad33af3f10e6db961c8edf033a86c09541121f49bfa20547179760924e6d3e397f0add7030459ff3babadd3457ab2da4a40a2147dc1574aa444
 DIST libjpeg-turbo-1.5.3.tar.gz 1658672 BLAKE2B 4d2182802aa9963fa57ec2c4fb5cf0a586847d43803e4c2d2e12cf1144c4da0ede7fdbace5965c77cd6df4547090165615960ebb65c964fd2fac823c021f50b7 SHA512 b611b1cc3d1ddedddad871854b42449d053a5f910ed1bdfa45c98e0270f4ecc110fde3a10111d2b876d847a826fa634f09c0bb8c357056c9c3a91c9065eb5202
-DIST libjpeg-turbo-1.5.90.tar.gz 2158825 BLAKE2B 51f1e2c3d4a3ef8d764b87cc3646170eed1df4ff4f9834f156a0d18fbb863625e75f73640518991b5df4b9a66517df76537c203f4d16e4673b15e51fbab78789 SHA512 6322f1013ace231fa51aa2cd2799fa526da14074cde08349c7c6f1719954aa4862d4e9b3975c0041aa93f7efce679dc782abdc5e60f92adfdf7d0c8aa2158e30
+DIST libjpeg-turbo-2.0.0.tar.gz 2158457 BLAKE2B fd4974f0500d23e72d0d0cfd31e7c4eba485779932d5c9515645eff4f7dccf97a2aff61b42be0f539905e6dcd6db2acec48cb7bb5ae61cae7152cd06902c36fe SHA512 220e5248e780d3c40c7842ba52937b9b0860e89164bca16ec6e2afaf99dd5d0bc706dd9320f4d2aef67ac11d4876453ef688b1efeaf93ceb42e8c25e83da2487
 DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675

diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.90-divzero_fix.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.90-divzero_fix.patch
deleted file mode 100644
index d505499a082..00000000000
--- a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.5.90-divzero_fix.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 43e84cff1bb2bd8293066f6ac4eb0df61ddddbc6 Mon Sep 17 00:00:00 2001
-From: DRC <information@×××××××××××××.org>
-Date: Tue, 12 Jun 2018 20:27:00 -0500
-Subject: [PATCH] tjLoadImage(): Fix FPE triggered by malformed BMP
-
-In rdbmp.c, it is necessary to guard against 32-bit overflow/wraparound
-when allocating the row buffer, because since BMP files have 32-bit
-width and height fields, the value of biWidth can be up to 4294967295.
-Specifically, if biWidth is 1073741824 and cinfo->input_components = 4,
-then the samplesperrow argument in alloc_sarray() would wrap around to
-0, and a division by zero error would occur at line 458 in jmemmgr.c.
-
-If biWidth is set to a higher value, then samplesperrow would wrap
-around to a small number, which would likely cause a buffer overflow
-(this has not been tested or verified.)
-diff --git a/rdbmp.c b/rdbmp.c
-index fcabbb13e..a02cfd909 100644
---- a/rdbmp.c
-+++ b/rdbmp.c
-@@ -6,7 +6,7 @@
-  * Modified 2009-2010 by Guido Vollbeding.
-  * libjpeg-turbo Modifications:
-  * Modified 2011 by Siarhei Siamashka.
-- * Copyright (C) 2015, 2017, D. R. Commander.
-+ * Copyright (C) 2015, 2017-2018, D. R. Commander.
-  * For conditions of distribution and use, see the accompanying README.ijg
-  * file.
-  *
-@@ -623,6 +623,12 @@ start_input_bmp(j_compress_ptr cinfo, cjpeg_source_ptr sinfo)
-     }
-   }
- 
-+  /* 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.90-r1.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.0.ebuild
similarity index 97%
rename from media-libs/libjpeg-turbo/libjpeg-turbo-1.5.90-r1.ebuild
rename to media-libs/libjpeg-turbo/libjpeg-turbo-2.0.0.ebuild
index 0cc09fb72cb..9bacfe12a0f 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.90-r1.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.0.ebuild
@@ -34,10 +34,6 @@ DEPEND="${COMMON_DEPEND}
 
 MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
 
-PATCHES=(
-	"${FILESDIR}"/${P}-divzero_fix.patch #658624
-)
-
 src_prepare() {
 	default