1 |
ssuominen 14/02/04 16:27:21 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: tiff-4.0.3-r6.ebuild |
5 |
Log: |
6 |
Use multilib_build_binaries() to be multilib-portage (multilib-overlay) friendly wrt #489590 by Thomas Sachau. Force USE="jpeg" for testsuite wrt #483132 by Johann Schmitz. Apply security patch from Fedora wrt #486590. |
7 |
|
8 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4868F14D) |
9 |
|
10 |
Revision Changes Path |
11 |
1.256 media-libs/tiff/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/tiff/ChangeLog?rev=1.256&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/tiff/ChangeLog?rev=1.256&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/tiff/ChangeLog?r1=1.255&r2=1.256 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v |
20 |
retrieving revision 1.255 |
21 |
retrieving revision 1.256 |
22 |
diff -u -r1.255 -r1.256 |
23 |
--- ChangeLog 26 Oct 2013 08:19:22 -0000 1.255 |
24 |
+++ ChangeLog 4 Feb 2014 16:27:21 -0000 1.256 |
25 |
@@ -1,6 +1,14 @@ |
26 |
# ChangeLog for media-libs/tiff |
27 |
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.255 2013/10/26 08:19:22 mgorny Exp $ |
29 |
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
30 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.256 2014/02/04 16:27:21 ssuominen Exp $ |
31 |
+ |
32 |
+*tiff-4.0.3-r6 (04 Feb 2014) |
33 |
+ |
34 |
+ 04 Feb 2014; Samuli Suominen <ssuominen@g.o> |
35 |
+ +files/tiff-4.0.3-CVE-2013-4244.patch, +tiff-4.0.3-r6.ebuild: |
36 |
+ Use multilib_build_binaries() to be multilib-portage (multilib-overlay) |
37 |
+ friendly wrt #489590 by Thomas Sachau. Force USE="jpeg" for testsuite wrt |
38 |
+ #483132 by Johann Schmitz. Apply security patch from Fedora wrt #486590. |
39 |
|
40 |
26 Oct 2013; Michał Górny <mgorny@g.o> tiff-3.9.7-r1.ebuild: |
41 |
Override multilib_src_install_all() not to install docs rather than removing |
42 |
|
43 |
|
44 |
|
45 |
1.1 media-libs/tiff/tiff-4.0.3-r6.ebuild |
46 |
|
47 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/tiff/tiff-4.0.3-r6.ebuild?rev=1.1&view=markup |
48 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/tiff/tiff-4.0.3-r6.ebuild?rev=1.1&content-type=text/plain |
49 |
|
50 |
Index: tiff-4.0.3-r6.ebuild |
51 |
=================================================================== |
52 |
# Copyright 1999-2014 Gentoo Foundation |
53 |
# Distributed under the terms of the GNU General Public License v2 |
54 |
# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-4.0.3-r6.ebuild,v 1.1 2014/02/04 16:27:21 ssuominen Exp $ |
55 |
|
56 |
EAPI=5 |
57 |
inherit eutils libtool multilib-minimal |
58 |
|
59 |
DESCRIPTION="Tag Image File Format (TIFF) library" |
60 |
HOMEPAGE="http://www.remotesensing.org/libtiff/" |
61 |
SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz |
62 |
ftp://ftp.remotesensing.org/pub/libtiff/${P}.tar.gz" |
63 |
|
64 |
LICENSE="libtiff" |
65 |
SLOT="0" |
66 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris" |
67 |
IUSE="+cxx jbig jpeg lzma static-libs test zlib" |
68 |
|
69 |
RDEPEND="jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) |
70 |
jbig? ( media-libs/jbigkit:=[${MULTILIB_USEDEP}] ) |
71 |
lzma? ( app-arch/xz-utils:=[${MULTILIB_USEDEP}] ) |
72 |
zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] ) |
73 |
abi_x86_32? ( |
74 |
!<=app-emulation/emul-linux-x86-baselibs-20130224-r9 |
75 |
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
76 |
)" |
77 |
DEPEND="${RDEPEND}" |
78 |
|
79 |
REQUIRED_USE="test? ( jpeg )" #483132 |
80 |
|
81 |
MULTILIB_WRAPPED_HEADERS=( |
82 |
/usr/include/tiffconf.h |
83 |
) |
84 |
|
85 |
src_prepare() { |
86 |
epatch "${FILESDIR}"/${PN}-4.0.3-tiff2pdf-colors.patch #145055 |
87 |
epatch "${FILESDIR}"/${P}-CVE-2012-{4447,4564}.patch #440944 |
88 |
epatch "${FILESDIR}"/${P}-CVE-2013-{1960,1961}.patch #468334 |
89 |
epatch "${FILESDIR}"/${P}-CVE-2013-{4231,4232}.patch #480466 |
90 |
epatch "${FILESDIR}"/${P}-CVE-2013-4244.patch #486590 |
91 |
epatch "${FILESDIR}"/${P}-libjpeg-turbo.patch |
92 |
|
93 |
elibtoolize |
94 |
} |
95 |
|
96 |
multilib_src_configure() { |
97 |
ECONF_SOURCE="${S}" econf \ |
98 |
$(use_enable static-libs static) \ |
99 |
$(use_enable zlib) \ |
100 |
$(use_enable jpeg) \ |
101 |
$(use_enable jbig) \ |
102 |
$(use_enable lzma) \ |
103 |
$(use_enable cxx) \ |
104 |
--without-x \ |
105 |
--with-docdir="${EPREFIX}"/usr/share/doc/${PF} |
106 |
|
107 |
# remove useless subdirs |
108 |
if ! multilib_build_binaries ; then |
109 |
sed -i \ |
110 |
-e 's/ tools//' \ |
111 |
-e 's/ contrib//' \ |
112 |
-e 's/ man//' \ |
113 |
-e 's/ html//' \ |
114 |
Makefile || die |
115 |
fi |
116 |
} |
117 |
|
118 |
multilib_src_test() { |
119 |
if ! multilib_build_binaries ; then |
120 |
cd tools |
121 |
emake |
122 |
cd "${BUILD_DIR}" |
123 |
fi |
124 |
emake check |
125 |
} |
126 |
|
127 |
multilib_src_install_all() { |
128 |
prune_libtool_files --all |
129 |
rm -f "${ED}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION} |
130 |
} |