1 |
commit: 84b430f7ae1ebc8d62757ea50444a053a0f9f8a3 |
2 |
Author: Markus Meier <maekke <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jul 10 09:07:41 2016 +0000 |
4 |
Commit: Markus Meier <maekke <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jul 10 09:07:41 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84b430f7 |
7 |
|
8 |
media-libs/libjpeg-turbo: remove vulnerable versions for bug #585782 |
9 |
|
10 |
Package-Manager: portage-2.3.0 |
11 |
|
12 |
media-libs/libjpeg-turbo/Manifest | 1 - |
13 |
.../libjpeg-turbo/libjpeg-turbo-1.4.2.ebuild | 117 --------------------- |
14 |
2 files changed, 118 deletions(-) |
15 |
|
16 |
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest |
17 |
index 9137c0d..68ea3de 100644 |
18 |
--- a/media-libs/libjpeg-turbo/Manifest |
19 |
+++ b/media-libs/libjpeg-turbo/Manifest |
20 |
@@ -1,3 +1,2 @@ |
21 |
-DIST libjpeg-turbo-1.4.2.tar.gz 1569306 SHA256 521bb5d3043e7ac063ce3026d9a59cc2ab2e9636c655a2515af5f4706122233e SHA512 9bd27c917c29125c425469eb0fdf99b802f25095f187fb416bd7c05e4af95a32404bbb0d06b77343d35d3461029500decf3481337b2eade9e57b58dea69719ee WHIRLPOOL 4a6dfefee5d50b19474a5b0a8b2e3c06a403538985b9cf369a51d3cb2a9e2a0bbb6ac314e1e85d4432a44a8a381472c4e8be1286de909f3f47407692a583a01b |
22 |
DIST libjpeg-turbo-1.5.0.tar.gz 1654276 SHA256 9f397c31a67d2b00ee37597da25898b03eb282ccd87b135a50a69993b6a2035f SHA512 3b7249a5f5c7b1f1fa99924ac6bc9bff3bf811815ef38505af5359d1f0edb0bfb771f0fa54308743a2d9305cb19a997453fdb00d0aade3f2f17ea917a45fde22 WHIRLPOOL 5aee1cda739fb70fe15efd0cdb2cdecd7d99e4bea3d0b05d757420dd781749bc9c4a91ba4f5c1ad68584113323acc0d2784ac18c9daed678d4057a410a289610 |
23 |
DIST libjpeg8_8d-2.debian.tar.gz 14764 SHA256 9b36468b2aba24d63d3c87625de89f31834ac429e6dec7d68d86a52b5110219c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675 WHIRLPOOL bda41c37f3f57733fcd86969126f6dbede2fbf633b0168265a7fe353fb7f3cd995a94e7987bac472957ec6fb0b2dc34d5dd646f0de79e06bc94e59d7cf440939 |
24 |
|
25 |
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.4.2.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.4.2.ebuild |
26 |
deleted file mode 100644 |
27 |
index 613b000..0000000 |
28 |
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-1.4.2.ebuild |
29 |
+++ /dev/null |
30 |
@@ -1,117 +0,0 @@ |
31 |
-# Copyright 1999-2016 Gentoo Foundation |
32 |
-# Distributed under the terms of the GNU General Public License v2 |
33 |
-# $Id$ |
34 |
- |
35 |
-EAPI=5 |
36 |
- |
37 |
-inherit libtool eutils java-pkg-opt-2 libtool toolchain-funcs multilib-minimal |
38 |
- |
39 |
-DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library" |
40 |
-HOMEPAGE="http://libjpeg-turbo.virtualgl.org/ http://sourceforge.net/projects/libjpeg-turbo/" |
41 |
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz |
42 |
- mirror://gentoo/libjpeg8_8d-2.debian.tar.gz" |
43 |
- |
44 |
-LICENSE="BSD IJG" |
45 |
-SLOT="0" |
46 |
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos" |
47 |
-IUSE="java static-libs" |
48 |
- |
49 |
-ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )" |
50 |
-COMMON_DEPEND="!media-libs/jpeg:0 |
51 |
- !media-libs/jpeg:62 |
52 |
- abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5 |
53 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" |
54 |
-RDEPEND="${COMMON_DEPEND} |
55 |
- java? ( >=virtual/jre-1.5 )" |
56 |
-DEPEND="${COMMON_DEPEND} |
57 |
- amd64? ( ${ASM_DEPEND} ) |
58 |
- x86? ( ${ASM_DEPEND} ) |
59 |
- amd64-fbsd? ( ${ASM_DEPEND} ) |
60 |
- x86-fbsd? ( ${ASM_DEPEND} ) |
61 |
- amd64-linux? ( ${ASM_DEPEND} ) |
62 |
- x86-linux? ( ${ASM_DEPEND} ) |
63 |
- x64-macos? ( ${ASM_DEPEND} ) |
64 |
- java? ( >=virtual/jdk-1.5 )" |
65 |
- |
66 |
-MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h ) |
67 |
- |
68 |
-src_prepare() { |
69 |
- epatch "${FILESDIR}"/${PN}-1.2.0-x32.patch #420239 |
70 |
- |
71 |
- elibtoolize |
72 |
- |
73 |
- java-pkg-opt-2_src_prepare |
74 |
-} |
75 |
- |
76 |
-multilib_src_configure() { |
77 |
- local myconf=() |
78 |
- if multilib_is_native_abi; then |
79 |
- myconf+=( $(use_with java) ) |
80 |
- if use java; then |
81 |
- export JAVACFLAGS="$(java-pkg_javac-args)" |
82 |
- export JNI_CFLAGS="$(java-pkg_get-jni-cflags)" |
83 |
- fi |
84 |
- else |
85 |
- myconf+=( --without-java ) |
86 |
- fi |
87 |
- [[ ${ABI} == "x32" ]] && myconf+=( --without-simd ) #420239 |
88 |
- |
89 |
- # Force /bin/bash until upstream generates a new version. #533902 |
90 |
- CONFIG_SHELL=/bin/bash \ |
91 |
- ECONF_SOURCE=${S} \ |
92 |
- econf \ |
93 |
- $(use_enable static-libs static) \ |
94 |
- --with-mem-srcdst \ |
95 |
- "${myconf[@]}" |
96 |
-} |
97 |
- |
98 |
-multilib_src_compile() { |
99 |
- local _java_makeopts |
100 |
- use java && _java_makeopts="-j1" |
101 |
- emake ${_java_makeopts} |
102 |
- |
103 |
- if multilib_is_native_abi; then |
104 |
- pushd ../debian/extra >/dev/null |
105 |
- emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}" |
106 |
- popd >/dev/null |
107 |
- fi |
108 |
-} |
109 |
- |
110 |
-multilib_src_test() { |
111 |
- emake test |
112 |
-} |
113 |
- |
114 |
-multilib_src_install() { |
115 |
- emake \ |
116 |
- DESTDIR="${D}" \ |
117 |
- docdir="${EPREFIX}"/usr/share/doc/${PF} \ |
118 |
- exampledir="${EPREFIX}"/usr/share/doc/${PF} \ |
119 |
- install |
120 |
- |
121 |
- if multilib_is_native_abi; then |
122 |
- pushd "${WORKDIR}"/debian/extra >/dev/null |
123 |
- emake \ |
124 |
- DESTDIR="${D}" prefix="${EPREFIX}"/usr \ |
125 |
- INSTALL="install -m755" INSTALLDIR="install -d -m755" \ |
126 |
- install |
127 |
- popd >/dev/null |
128 |
- |
129 |
- if use java; then |
130 |
- rm -rf "${ED}"/usr/classes |
131 |
- java-pkg_dojar java/turbojpeg.jar |
132 |
- fi |
133 |
- fi |
134 |
-} |
135 |
- |
136 |
-multilib_src_install_all() { |
137 |
- prune_libtool_files |
138 |
- |
139 |
- insinto /usr/share/doc/${PF}/html |
140 |
- doins -r "${S}"/doc/html/* |
141 |
- newdoc "${WORKDIR}"/debian/changelog changelog.debian |
142 |
- if use java; then |
143 |
- insinto /usr/share/doc/${PF}/html/java |
144 |
- doins -r "${S}"/java/doc/* |
145 |
- newdoc "${S}"/java/README README.java |
146 |
- fi |
147 |
-} |