summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2020-07-16 00:22:23 +0000
committerSam James <sam@gentoo.org>2020-07-16 01:01:30 +0000
commitff3214301f4015791a9d77d37e42a8d46e44af01 (patch)
tree042446fcac0c7ae75ff7f484eeefe8cd12d42662
parentapp-emulation/conmon: Bump to version 2.0.19 (diff)
downloadgentoo-ff3214301f4015791a9d77d37e42a8d46e44af01.tar.gz
gentoo-ff3214301f4015791a9d77d37e42a8d46e44af01.tar.bz2
gentoo-ff3214301f4015791a9d77d37e42a8d46e44af01.zip
media-libs/jpeg: security cleanup
Bug: https://bugs.gentoo.org/727908 Package-Manager: Portage-2.3.99, Repoman-2.3.23 Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r--media-libs/jpeg/Manifest4
-rw-r--r--media-libs/jpeg/files/jpeg-8d-CVE-2013-6629.patch17
-rw-r--r--media-libs/jpeg/jpeg-6b-r12.ebuild47
-rw-r--r--media-libs/jpeg/jpeg-8d-r2.ebuild51
-rw-r--r--media-libs/jpeg/jpeg-9c.ebuild71
5 files changed, 0 insertions, 190 deletions
diff --git a/media-libs/jpeg/Manifest b/media-libs/jpeg/Manifest
index 8a90f434577..d1334310aa3 100644
--- a/media-libs/jpeg/Manifest
+++ b/media-libs/jpeg/Manifest
@@ -1,6 +1,2 @@
-DIST jpeg-6b-patchset-1.tar.xz 2592 BLAKE2B 6518fc5e94dcb4cecbb2d9f4edd2ad297d1f7b64f3da4f03ab54acc6eb9f11374091b7337b005a76f644c6795cdddc2ea032a9f41c9a9a3f5e06e0ba9f02f939 SHA512 6deb845a08f4ac6b88c47803b528842cedd145fb12295060d52553b8c803ba192478306496701a409c796c264ceaed0988575ae8f7717e2e7b24da5733bc9c2b
-DIST jpegsrc.v6b.tar.gz 613261 BLAKE2B d08406bebcbec9aa0197ef7854f163dc12d916e7e7df466e5408e715aa20738c047f0f709699311186e17da443af9afc208765f74bcc51a7bab2284c54351868 SHA512 5d37d3695105fc345ca269ab98cd991472e5de72f702c9a8a652a7d114a40eb99670c69a87ecb24bf64e96318fc0ee2bcb44c497d9d3d2a67378c99e4eb348fe
-DIST jpegsrc.v8d.tar.gz 991456 BLAKE2B 6644af7dd47a3b1cbcbc8f6bc111c882ed1790eaad6bee06e9b95b803bf756beb6ad61abc76c889d53dfcd05139286ec870372d50d2b79bf28b32d0e8d50a2ab SHA512 7a8b4cff5b1caf6a7281c5dce4e1efa1b68360bd64dd2e619b60c9e1d49f22624bc8780b681bfab073e7b1d4b7f41008a464a58f0eeeacb0a40ff996d7eb5753
-DIST jpegsrc.v9c.tar.gz 1028200 BLAKE2B 621ef910f3fa397da0d19da1e1771b13ae1e524ba541f7f2562de1da27a8a3b26abc63d01218ae56ddbf480ba5d6ea6a778a23693304f7b4364edb1bcd4839e7 SHA512 c95aacb0f1972a2271953ee17b5c6a6c3662d5f4fbc4d1e9aef59dece42a169b0f34d3fa1d385b88580ad11cefd194250094ee72843f4e0028204df6741cb611
DIST jpegsrc.v9d.tar.gz 1070160 BLAKE2B a905a15c0eadc8ebd797fe009685a2c300dc39600ed7416d58adf1ed326a26ca45146387fe73a87a589f4bed95e652f5385b4df5e7544a4e348bda27356295c2 SHA512 c425cf413e679e4112b428592e6facc813cadf92e42a6b850c5d348b3dd47b0599e2f4a119d7ff543b762cdcadd42a77ed1429a08874e73f64a54fb869714357
DIST libjpeg8_8d-1.debian.tar.gz 13676 BLAKE2B ac6fab3e52f91c9ece95ed809fc972afc92c55754a59358f7dacb056917b1878f6f9be85a20ccb34eb13489a9963a00659fe25c27e8b18b44961c6ba5f3214cd SHA512 7def4f13524f0af3b9adf35a370027a18f43b9a635f56a17d5bb7883370db8b18b8a12737d0f0cb4b0287ccf8fb474eb5f754de6b398ffe7d522c54e5bf68040
diff --git a/media-libs/jpeg/files/jpeg-8d-CVE-2013-6629.patch b/media-libs/jpeg/files/jpeg-8d-CVE-2013-6629.patch
deleted file mode 100644
index a1535a79ffe..00000000000
--- a/media-libs/jpeg/files/jpeg-8d-CVE-2013-6629.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-http://bugs.gentoo.org/491152
-
---- jdmarker.c
-+++ jdmarker.c
-@@ -347,6 +347,12 @@
-
- TRACEMS3(cinfo, 1, JTRC_SOS_COMPONENT, cc,
- compptr->dc_tbl_no, compptr->ac_tbl_no);
-+
-+ /* This CSi (cc) should differ from the previous CSi */
-+ for (ci = 0; ci < i; ci++) {
-+ if (cinfo->cur_comp_info[ci] == compptr)
-+ ERREXIT1(cinfo, JERR_BAD_COMPONENT_ID, cc);
-+ }
- }
-
- /* Collect the additional scan parameters Ss, Se, Ah/Al. */
diff --git a/media-libs/jpeg/jpeg-6b-r12.ebuild b/media-libs/jpeg/jpeg-6b-r12.ebuild
deleted file mode 100644
index 1c6ea51b57d..00000000000
--- a/media-libs/jpeg/jpeg-6b-r12.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# this ebuild is only for the libjpeg.so.62 SONAME for ABI compat
-
-PATCH_VER=1
-inherit eutils libtool toolchain-funcs multilib-minimal
-
-DESCRIPTION="library to load, handle and manipulate images in the JPEG format (transition package)"
-HOMEPAGE="http://www.ijg.org/"
-SRC_URI="mirror://gentoo/jpegsrc.v${PV}.tar.gz
- https://dev.gentoo.org/~ssuominen/${P}-patchset-${PATCH_VER}.tar.xz"
-
-LICENSE="IJG"
-SLOT="62"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DOCS=""
-
-RDEPEND="!>=media-libs/libjpeg-turbo-1.3.0-r2:0"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
- EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patch
- epatch "${FILESDIR}"/${PN}-8d-CVE-2013-6629.patch
- elibtoolize
-}
-
-multilib_src_configure() {
- tc-export CC
- ECONF_SOURCE=${S} \
- econf \
- --enable-shared \
- --disable-static \
- --enable-maxmem=64
-}
-
-multilib_src_compile() {
- emake libjpeg.la
-}
-
-multilib_src_install() {
- newlib.so .libs/libjpeg.so.62.0.0 libjpeg.so.62
-}
diff --git a/media-libs/jpeg/jpeg-8d-r2.ebuild b/media-libs/jpeg/jpeg-8d-r2.ebuild
deleted file mode 100644
index e8f537b6324..00000000000
--- a/media-libs/jpeg/jpeg-8d-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# this ebuild is only for the libjpeg.so.8 SONAME for ABI compat
-
-inherit eutils libtool toolchain-funcs multilib-minimal
-
-DESCRIPTION="Library to load, handle and manipulate images in the JPEG format"
-HOMEPAGE="http://jpegclub.org/ http://www.ijg.org/"
-SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz"
-
-LICENSE="IJG"
-SLOT="8"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="!=media-libs/jpeg-8*:0
- !<media-libs/libjpeg-turbo-1.3.0-r2"
-DEPEND="${RDEPEND}"
-
-DOCS=""
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-7-maxmem_sysconf.patch \
- "${FILESDIR}"/${P}-CVE-2013-6629.patch
- elibtoolize
-}
-
-multilib_src_configure() {
- # Fix building against this library on eg. Solaris and DragonFly BSD, see:
- # http://mail-index.netbsd.org/pkgsrc-bugs/2010/01/18/msg035644.html
- local ldverscript=
- [[ ${CHOST} == *-solaris* ]] && ldverscript="--disable-ld-version-script"
-
- ECONF_SOURCE=${S} \
- econf \
- --disable-static \
- --enable-maxmem=64 \
- ${ldverscript}
-}
-
-multilib_src_compile() {
- emake libjpeg.la
-}
-
-multilib_src_install() {
- newlib.so .libs/libjpeg.so.8.4.0 libjpeg.so.8
-}
diff --git a/media-libs/jpeg/jpeg-9c.ebuild b/media-libs/jpeg/jpeg-9c.ebuild
deleted file mode 100644
index 8839bf4b7e7..00000000000
--- a/media-libs/jpeg/jpeg-9c.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit libtool toolchain-funcs multilib-minimal
-
-DESCRIPTION="Library to load, handle and manipulate images in the JPEG format"
-HOMEPAGE="http://jpegclub.org/ http://www.ijg.org/"
-SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz
- mirror://debian/pool/main/libj/lib${PN}8/lib${PN}8_8d-1.debian.tar.gz"
-
-LICENSE="IJG"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-DEPEND=""
-RDEPEND="!media-libs/libjpeg-turbo:0"
-
-DOCS=( change.log example.c README {coderules,filelist,install,jconfig,libjpeg,structure,usage,wizard}.txt )
-
-PATCHES=( "${FILESDIR}"/${PN}-7-maxmem_sysconf.patch )
-
-src_prepare() {
- default
- elibtoolize
-}
-
-multilib_src_configure() {
- # Fix building against this library on eg. Solaris and DragonFly BSD, see:
- # http://mail-index.netbsd.org/pkgsrc-bugs/2010/01/18/msg035644.html
- local ldverscript=
- [[ ${CHOST} == *-solaris* ]] && ldverscript="--disable-ld-version-script"
-
- ECONF_SOURCE=${S} \
- econf \
- $(use_enable static-libs static) \
- --enable-maxmem=64 \
- ${ldverscript}
-}
-
-multilib_src_compile() {
- emake
-
- if multilib_is_native_abi; then
- # Build exifautotran and jpegexiforient
- cd ../debian/extra
- emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}"
- fi
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
-}
-
-multilib_src_install_all() {
- find "${D}" -name '*.la' -delete || die
-
- einstalldocs
-
- # Install exifautotran and jpegexiforient
- newdoc ../debian/changelog changelog.debian
- cd ../debian/extra
- emake \
- DESTDIR="${D}" prefix="${EPREFIX}"/usr \
- INSTALL="install -m755" INSTALLDIR="install -d -m755" \
- install
- # Remove +x bits from man pages.
- find "${ED}"/usr/share/man/ -type f -perm /1 -exec chmod a-x {} + || die
-}