commit: fc1ce929dcdaa63179c68c5c83e74fdb5a6e227a Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Tue Jun 4 02:48:24 2019 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Tue Jun 4 02:48:24 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc1ce929
media-libs/ilmbase: Drop vulnerable versions, bug 620324 Bug: https://bugs.gentoo.org/620324 Package-Manager: Portage-2.3.67, Repoman-2.3.13 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> media-libs/ilmbase/Manifest | 4 -- .../ilmbase/files/ilmbase-1.0.0-asneeded.patch | 11 --- media-libs/ilmbase/files/ilmbase-1.0.2-gcc43.patch | 11 --- .../ilmbase-2.2.0-Remove-register-keyword.patch | 79 ---------------------- media-libs/ilmbase/ilmbase-1.0.2.ebuild | 37 ---------- media-libs/ilmbase/ilmbase-2.0.1-r1.ebuild | 17 ----- media-libs/ilmbase/ilmbase-2.1.0.ebuild | 26 ------- media-libs/ilmbase/ilmbase-2.2.0-r1.ebuild | 33 --------- media-libs/ilmbase/ilmbase-2.2.0.ebuild | 26 ------- 9 files changed, 244 deletions(-) diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest index cb8ef67725d..b89e75e8259 100644 --- a/media-libs/ilmbase/Manifest +++ b/media-libs/ilmbase/Manifest @@ -1,5 +1 @@ -DIST ilmbase-1.0.2.tar.gz 496540 BLAKE2B 1727be15753102f56d7b23bb88c68897006cdba546000653f7028c511e6cd208bcbf23b27478db25f41890bb362e687e10fc9342785d25a92df6a3d7b0b77d90 SHA512 5a1a0011ef43132f33832d2e322320abb81a0f495e921de52af8f6e9ee50e0bed63897a0054de228f4081cc2f6591cb99a686f908620e87bf86c9d2d689923cd -DIST ilmbase-2.0.1.tar.gz 555828 BLAKE2B 95cf3019c74c1efd95e1b7ddf2df224f4bcc93bafb9936c408f94ddaa2fa243161c91f8527ec9e67d7d48fb9d41dc84c42a2745d8e75d3a648f66bf0331d41e7 SHA512 0f2341fefd7c661b62bfd42590c9f29e5b58fbf303a4418e17d3bb831c40ebe23848250f360bc755113b84882665eb8c90497ee2f8d77bc5ed8e1fd43182c712 -DIST ilmbase-2.1.0.tar.gz 557552 BLAKE2B f210d47ab886cf9d2d76ca6ef6cc86123f887a0a3971e4063b5451293827861f10a6cc94bbe2399a9fcbacf48492e8d739b216b4baef72cc167bec1f2ed5fd6f SHA512 2d168accc4f4fb8256fa7a4488c1a930bf1f088bda93f6d8272d3ce15219716d3e85dfa1e85dc2766bce10438e8fb38607a232a145c00d5d742cbde6604df342 -DIST ilmbase-2.2.0.tar.gz 525289 BLAKE2B 951f6601075098b5f38e26d47f28a83f923d2689d306c02c855a0e8c846a339dfa589f574c6ffcb70e56ed8d7ff0202fea0709939c65aeaff3978ab9e2d58f4a SHA512 0bbad14ed2bd286dff3987b16ef8631470211da54f822cb3e29b7931807216845ded81c9bf41fd2d22a8b362e8b9904a5450f61f5a242e460083e86b846513f1 DIST ilmbase-2.3.0.tar.gz 595490 BLAKE2B db956fe7dbabf94632eb98635f4ebda8e937f26e26ed69f33743069fa2bf6d5ed3711f00eb33377c98b4f8ea367bbfc51b11d4cb884ce02238b537857cc19a9c SHA512 db0804a7c37c2a97f9dbf81b20f40f7fdea73242baa2759d9dc3728e6849e7ecae0e178fa1c710add980d050499151650675e4b2cda6cbbaa61aca406a1f929a diff --git a/media-libs/ilmbase/files/ilmbase-1.0.0-asneeded.patch b/media-libs/ilmbase/files/ilmbase-1.0.0-asneeded.patch deleted file mode 100644 index a3953efd351..00000000000 --- a/media-libs/ilmbase/files/ilmbase-1.0.0-asneeded.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/IlmThread/Makefile.in -+++ b/IlmThread/Makefile.in -@@ -209,7 +209,7 @@ - IlmThreadMutexPosix.cpp - - libIlmThread_la_LDFLAGS = -version-info @LIBTOOL_VERSION@ -no-undefined --libIlmThread_la_LIBADD = ../Iex/libIex.la -+libIlmThread_la_LIBADD = ../Iex/libIex.la -lpthread - libIlmThreadincludedir = $(includedir)/OpenEXR - libIlmThreadinclude_HEADERS = IlmThreadPool.h IlmThread.h \ - IlmThreadSemaphore.h IlmThreadMutex.h diff --git a/media-libs/ilmbase/files/ilmbase-1.0.2-gcc43.patch b/media-libs/ilmbase/files/ilmbase-1.0.2-gcc43.patch deleted file mode 100644 index a4e186058fe..00000000000 --- a/media-libs/ilmbase/files/ilmbase-1.0.2-gcc43.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Imath/ImathMatrix.h -+++ b/Imath/ImathMatrix.h -@@ -37,6 +37,8 @@ - #ifndef INCLUDED_IMATHMATRIX_H - #define INCLUDED_IMATHMATRIX_H - -+#include <cstring> -+ - //---------------------------------------------------------------- - // - // 2D (3x3) and 3D (4x4) transformation matrix templates. diff --git a/media-libs/ilmbase/files/ilmbase-2.2.0-Remove-register-keyword.patch b/media-libs/ilmbase/files/ilmbase-2.2.0-Remove-register-keyword.patch deleted file mode 100644 index 3fd95aceda9..00000000000 --- a/media-libs/ilmbase/files/ilmbase-2.2.0-Remove-register-keyword.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 6d297f35c5dbfacc8a5e94f33b986db7ab468db9 Mon Sep 17 00:00:00 2001 -From: Larry Gritz <[email protected]> -Date: Fri, 30 Sep 2016 15:58:27 -0700 -Subject: [PATCH] Remove 'register' keyword. - -'register' is a relic of K&R-era C, it's utterly useless in modern -compilers. It's been deprecated in C++11, and therefore will generate -warnings when encountered -- and many packages that use OpenEXR's public -headers use -Werr to turn warnings into errors. Starting in C++17, the -keyword is removed entirely, and thus will certainly be a build break -for that version of the standard. So it's time for it to go. ---- - IlmBase/Half/half.cpp | 6 +++--- - IlmBase/Half/half.h | 4 ++-- - IlmBase/Imath/ImathMatrix.h | 8 ++++---- - 3 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/Half/half.cpp b/Half/half.cpp -index 609aaa1..09a50aa 100644 ---- a/Half/half.cpp -+++ b/Half/half.cpp -@@ -94,9 +94,9 @@ half::convert (int i) - // of float and half (127 versus 15). - // - -- register int s = (i >> 16) & 0x00008000; -- register int e = ((i >> 23) & 0x000000ff) - (127 - 15); -- register int m = i & 0x007fffff; -+ int s = (i >> 16) & 0x00008000; -+ int e = ((i >> 23) & 0x000000ff) - (127 - 15); -+ int m = i & 0x007fffff; - - // - // Now reassemble s, e and m into a half: -diff --git a/Half/half.h b/Half/half.h -index f78e4f6..da418d6 100644 ---- a/Half/half.h -+++ b/Half/half.h -@@ -459,7 +459,7 @@ half::half (float f) - // to do the float-to-half conversion. - // - -- register int e = (x.i >> 23) & 0x000001ff; -+ int e = (x.i >> 23) & 0x000001ff; - - e = _eLut[e]; - -@@ -470,7 +470,7 @@ half::half (float f) - // bits and combine it with the sign and exponent. - // - -- register int m = x.i & 0x007fffff; -+ int m = x.i & 0x007fffff; - _h = e + ((m + 0x00000fff + ((m >> 13) & 1)) >> 13); - } - else -diff --git a/Imath/ImathMatrix.h b/Imath/ImathMatrix.h -index 3e96c2f..1d7f8dc 100644 ---- a/Imath/ImathMatrix.h -+++ b/Imath/ImathMatrix.h -@@ -2527,11 +2527,11 @@ Matrix44<T>::multiply (const Matrix44<T> &a, - const Matrix44<T> &b, - Matrix44<T> &c) - { -- register const T * IMATH_RESTRICT ap = &a.x[0][0]; -- register const T * IMATH_RESTRICT bp = &b.x[0][0]; -- register T * IMATH_RESTRICT cp = &c.x[0][0]; -+ const T * IMATH_RESTRICT ap = &a.x[0][0]; -+ const T * IMATH_RESTRICT bp = &b.x[0][0]; -+ T * IMATH_RESTRICT cp = &c.x[0][0]; - -- register T a0, a1, a2, a3; -+ T a0, a1, a2, a3; - - a0 = ap[0]; - a1 = ap[1]; --- -2.14.1 - diff --git a/media-libs/ilmbase/ilmbase-1.0.2.ebuild b/media-libs/ilmbase/ilmbase-1.0.2.ebuild deleted file mode 100644 index b92d275e1df..00000000000 --- a/media-libs/ilmbase/ilmbase-1.0.2.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit libtool - -DESCRIPTION="OpenEXR ILM Base libraries" -HOMEPAGE="http://openexr.com/"; -SRC_URI="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"; - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 -arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="static-libs" - -RDEPEND="!<media-libs/openexr-1.5.0" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/${PN}-1.0.0-asneeded.patch" - "${FILESDIR}/${P}-gcc43.patch" -) - -src_prepare() { - default - elibtoolize -} - -src_configure() { - econf \ - $(use_enable static-libs static) -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die "Pruning failed" -} diff --git a/media-libs/ilmbase/ilmbase-2.0.1-r1.ebuild b/media-libs/ilmbase/ilmbase-2.0.1-r1.ebuild deleted file mode 100644 index e9d83ade3ac..00000000000 --- a/media-libs/ilmbase/ilmbase-2.0.1-r1.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools-multilib - -DESCRIPTION="OpenEXR ILM Base libraries" -HOMEPAGE="http://openexr.com/"; -SRC_URI="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"; - -LICENSE="BSD" -SLOT="0/2.0.1" # 2.0.1 for the namespace off -> on switch, caused library renaming -KEYWORDS="~amd64 -arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" -IUSE="static-libs" - -DOCS=( AUTHORS ChangeLog NEWS README ) -MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/IlmBaseConfig.h ) diff --git a/media-libs/ilmbase/ilmbase-2.1.0.ebuild b/media-libs/ilmbase/ilmbase-2.1.0.ebuild deleted file mode 100644 index bdbfe9d413f..00000000000 --- a/media-libs/ilmbase/ilmbase-2.1.0.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools-multilib - -DESCRIPTION="OpenEXR ILM Base libraries" -HOMEPAGE="http://openexr.com/"; -SRC_URI="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"; - -LICENSE="BSD" -SLOT="0/11" # 11 from SONAME -KEYWORDS="amd64 -arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" -IUSE="static-libs" - -DOCS=( AUTHORS ChangeLog NEWS README ) -MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/IlmBaseConfig.h ) - -src_configure() { - # Disable use of ucontext.h wrt #482890 - if use hppa || use ppc || use ppc64; then - export ac_cv_header_ucontext_h=no - fi - - autotools-multilib_src_configure -} diff --git a/media-libs/ilmbase/ilmbase-2.2.0-r1.ebuild b/media-libs/ilmbase/ilmbase-2.2.0-r1.ebuild deleted file mode 100644 index db5418878b6..00000000000 --- a/media-libs/ilmbase/ilmbase-2.2.0-r1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit multilib-minimal - -DESCRIPTION="OpenEXR ILM Base libraries" -HOMEPAGE="http://openexr.com/"; -SRC_URI="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"; - -LICENSE="BSD" -SLOT="0/12" # based on SONAME -KEYWORDS="amd64 -arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" -IUSE="static-libs" - -DEPEND="virtual/pkgconfig[${MULTILIB_USEDEP}]" - -DOCS=( AUTHORS ChangeLog NEWS README ) -MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/IlmBaseConfig.h ) - -# https://bugs.gentoo.org/632259 -RESTRICT="test" - -PATCHES=( "${FILESDIR}/${P}-Remove-register-keyword.patch" ) - -multilib_src_configure() { - # Disable use of ucontext.h wrt #482890 - if use hppa || use ppc || use ppc64; then - export ac_cv_header_ucontext_h=no - fi - - ECONF_SOURCE=${S} econf "$(use_enable static-libs static)" -} diff --git a/media-libs/ilmbase/ilmbase-2.2.0.ebuild b/media-libs/ilmbase/ilmbase-2.2.0.ebuild deleted file mode 100644 index ed86d10473a..00000000000 --- a/media-libs/ilmbase/ilmbase-2.2.0.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -inherit autotools-multilib - -DESCRIPTION="OpenEXR ILM Base libraries" -HOMEPAGE="http://openexr.com/"; -SRC_URI="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"; - -LICENSE="BSD" -SLOT="0/12" # based on SONAME -KEYWORDS="~amd64 -arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" -IUSE="static-libs" - -DOCS=( AUTHORS ChangeLog NEWS README ) -MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/IlmBaseConfig.h ) - -src_configure() { - # Disable use of ucontext.h wrt #482890 - if use hppa || use ppc || use ppc64; then - export ac_cv_header_ucontext_h=no - fi - - autotools-multilib_src_configure -}
