diff options
| -rw-r--r-- | media-libs/tiff/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/tiff/Manifest | 18 | ||||
| -rw-r--r-- | media-libs/tiff/files/tiff-3.9.4-CVE-2011-0192.patch | 13 | ||||
| -rw-r--r-- | media-libs/tiff/files/tiff-3.9.4-CVE-2011-1167.patch | 62 | ||||
| -rw-r--r-- | media-libs/tiff/tiff-3.9.4-r1.ebuild | 55 |
5 files changed, 14 insertions, 140 deletions
diff --git a/media-libs/tiff/ChangeLog b/media-libs/tiff/ChangeLog index b96248a4abad..14a4b007138c 100644 --- a/media-libs/tiff/ChangeLog +++ b/media-libs/tiff/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/tiff # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.174 2011/09/17 11:02:09 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.175 2011/10/10 20:24:39 ssuominen Exp $ + + 10 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> -tiff-3.9.4-r1.ebuild, + -files/tiff-3.9.4-CVE-2011-0192.patch, -files/tiff-3.9.4-CVE-2011-1167.patch: + old 17 Sep 2011; Raúl Porcel <armin76@gentoo.org> tiff-3.9.5.ebuild: alpha/arm/ia64/m68k/s390/sh/sparc stable wrt #371308 diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest index 3795d92010ec..f6d89c88d35b 100644 --- a/media-libs/tiff/Manifest +++ b/media-libs/tiff/Manifest @@ -2,20 +2,20 @@ Hash: SHA1 AUX tiff-3.9.2-CVE-2009-2347.patch 2571 RMD160 142c305b3a1cd9c0f27b482ced15104e82f43a19 SHA1 04c0bb3f6bcfa27e89f00f97c843b2f9d5220ce8 SHA256 27839133f0ddd51b7c5f53e85b7985f68284ab0da4ba589e629fe085be62074b -AUX tiff-3.9.4-CVE-2011-0192.patch 439 RMD160 8d57853f8b9a3312b6d4ec9dbef5058372b4cb41 SHA1 062f1dc95ec4f844aaf49930041016995ceef686 SHA256 10e4cbc100538f43dde12cd2378af20e51ab954c6508d5e5aea6ed3075940bbc -AUX tiff-3.9.4-CVE-2011-1167.patch 1924 RMD160 b5cc360a86f986728e6834c3a79ac9ace31c85de SHA1 494977ffe25a2374ca2b4f378454f88d5b3a6f0c SHA256 7198ae383a617cfae8034eccaf63ff7de897f8217aa6aa77c67f95443ac6deb1 -DIST tiff-3.9.4.tar.gz 1436968 RMD160 3e0a74b6294297c16fb983ad68056a1dfbbdb1de SHA1 a4e32d55afbbcabd0391a9c89995e8e8a19961de SHA256 67b76d075fb74f7cb32e7e4b217701674755fe6cee0f463b259a753fce691da6 DIST tiff-3.9.5.tar.gz 1455502 RMD160 c67742bf6b9b10ca0700e69ce575007d40c4f89c SHA1 f40aab20fb2f609b5cbc1171c40b66a1445e3773 SHA256 ecf2e30582698dbc61d269203bbd1e701a1a50fb26c87d709e10d89669badb33 DIST tiff-4.0.0beta7.tar.gz 2004539 RMD160 2bdac755802112ba93a534baeb50c08c42e5677d SHA1 91686943ebb7a0e1b162ba61f5abf9598109a391 SHA256 7b622db9e62a14464b0ae27e5eed4e2e893d7aab889c778e56ac28df069c3ded -EBUILD tiff-3.9.4-r1.ebuild 1639 RMD160 59b9116f478b7f5eeab2ec4f97198630e311c862 SHA1 d48a8e2de2b37e40eecfe5b5725cd0075a0d82eb SHA256 dc7d5d43d64058b4434beac9b90c6e46e6a7e449463c7271d7f2107d05e0e928 EBUILD tiff-3.9.5.ebuild 1535 RMD160 c1721defb89f93aaa216abf22abad474f9ba4240 SHA1 9acb6a00732c81ae7a8d04ffc7bc639e07247c77 SHA256 07ef04430a12fd8e7cc17bb36437d8fd35aefba712d8c210bb77f7443392a621 EBUILD tiff-4.0.0_beta7.ebuild 1729 RMD160 a135ed8b20aec1a678f815710dd604f6e18d12a8 SHA1 796cabbaa70a96c263b3fefdd2daf11b8825959c SHA256 ce50c0c1a7163f798c3d8c47f72e96ffa6bbe496ad0abd152b39ee1d4e8c42d5 -MISC ChangeLog 24244 RMD160 0aab73f6949bdf2fd54787a9f9222d4291938fb6 SHA1 00c2cbfca7e7a7ca6d6313a4fa7a09351c1227dd SHA256 d25c5841effc95565e306b656ab78758c2b1c6b47300505e1ebe6f2efde2772e +MISC ChangeLog 24410 RMD160 f32733d3441bdd5ace075faebfb67da8c4491be6 SHA1 3ee26dc3750ccd4215b79404dc0a260db718018a SHA256 57a53a8e0432bd28fc4dae78a660c9c6cd6986f0261a224c6f82012fc2d6f74e MISC metadata.xml 448 RMD160 0419f91f1f20efdc94d3894f6a4fc6471f22d0a1 SHA1 d743d16f4afb124bbe57a45b217b92f71b515f20 SHA256 61b04082cf0ccec1f58146fab271f88e56009277edee28b3f297eafb0562f4c9 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk50fjcACgkQuQc30/atMkDfVwCaAtEgtf+pp/cbuj4CFuIqA3tk -41MAnRfacjhzbtwIHmoZDyeAR3nGsy0B -=ecea +iQEcBAEBAgAGBQJOk1SaAAoJEEdUh39IaPFN38sH/RVkke5+GllG+e3Wo4yR9qfH +G8PhAkSgkPoIhcaWmdvq11P67aLCHw9LaoHC1WH89VJx0A2troFGOjrXWKJMB/th +qQFc/DxNu36Dl0HCb9w66hoE3sdCsHPC8PiQ1cS8XJNvb9tfqHRL0hjzmndbSHOk +APUxXCyPxvUOSFOThg+t6/BhJ7FoVMSQIYGvlUhMi7CQ9jjjZAUhmmqSBLg6bS0Z +9J4s9lMgQDuP4sJxb+e89OsHgPcGQsbVbtpfDeW7MyOngbn8hq91em6jzrnERsMx +QAepWxnqE1JUaCf181hHWSG/38fIqchdoCwRh9GME8kCf/UENyDRwDC4NPBq6xQ= +=ycAb -----END PGP SIGNATURE----- diff --git a/media-libs/tiff/files/tiff-3.9.4-CVE-2011-0192.patch b/media-libs/tiff/files/tiff-3.9.4-CVE-2011-0192.patch deleted file mode 100644 index dbeb8825db0a..000000000000 --- a/media-libs/tiff/files/tiff-3.9.4-CVE-2011-0192.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: libtiff/tif_fax3.h -=================================================================== -RCS file: /cvs/maptools/cvsroot/libtiff/libtiff/tif_fax3.h,v -retrieving revision 1.7 -retrieving revision 1.9 -diff -r1.7 -r1.9 -480a481,486 -> if (b1 <= (int) (a0 + TabEnt->Param)) { \ -> if (b1 < (int) (a0 + TabEnt->Param) || pa != thisrun) { \ -> unexpected("VL", a0); \ -> goto eol2d; \ -> } \ -> } \ diff --git a/media-libs/tiff/files/tiff-3.9.4-CVE-2011-1167.patch b/media-libs/tiff/files/tiff-3.9.4-CVE-2011-1167.patch deleted file mode 100644 index 5783a2b23a0c..000000000000 --- a/media-libs/tiff/files/tiff-3.9.4-CVE-2011-1167.patch +++ /dev/null @@ -1,62 +0,0 @@ -Index: ChangeLog -=================================================================== -RCS file: /cvs/maptools/cvsroot/libtiff/ChangeLog,v -retrieving revision 1.602.2.130 -diff -r1.602.2.130 ChangeLog -0a1,7 -> 2011-03-12 Frank Warmerdam <warmerdam@pobox.com> -> -> * libtiff/tif_thunder.c: Correct potential buffer overflow with -> thunder encoded files with wrong bitspersample set. The libtiff -> development team would like to thank Marin Barbella and TippingPoint's -> Zero Day Initiative for reporting this vulnerability (ZDI-CAN-1004). -> -Index: libtiff/tif_thunder.c -=================================================================== -RCS file: /cvs/maptools/cvsroot/libtiff/libtiff/tif_thunder.c,v -retrieving revision 1.5.2.1 -diff -r1.5.2.1 tif_thunder.c -27a28 -> #include <assert.h> -58,62c59,65 -< #define SETPIXEL(op, v) { \ -< lastpixel = (v) & 0xf; \ -< if (npixels++ & 1) \ -< *op++ |= lastpixel; \ -< else \ ---- -> #define SETPIXEL(op, v) { \ -> lastpixel = (v) & 0xf; \ -> if ( npixels < maxpixels ) \ -> { \ -> if (npixels++ & 1) \ -> *op++ |= lastpixel; \ -> else \ -63a67,84 -> } \ -> } -> -> static int -> ThunderSetupDecode(TIFF* tif) -> { -> static const char module[] = "ThunderSetupDecode"; -> -> if( tif->tif_dir.td_bitspersample != 4 ) -> { -> TIFFErrorExt(tif->tif_clientdata, module, -> "Wrong bitspersample value (%d), Thunder decoder only supports 4bits per sample.", -> (int) tif->tif_dir.td_bitspersample ); -> return 0; -> } -> -> -> return (1); -145c166,167 -< return (1); ---- -> -> return (1); -153a176 -> tif->tif_setupdecode = ThunderSetupDecode; -165a189 -> diff --git a/media-libs/tiff/tiff-3.9.4-r1.ebuild b/media-libs/tiff/tiff-3.9.4-r1.ebuild deleted file mode 100644 index c5cc61ded62c..000000000000 --- a/media-libs/tiff/tiff-3.9.4-r1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-3.9.4-r1.ebuild,v 1.2 2011/04/23 16:38:13 nerdboy Exp $ - -EAPI=3 -inherit eutils libtool - -DESCRIPTION="Library for manipulation of TIFF (Tag Image File Format) images" -HOMEPAGE="http://www.remotesensing.org/libtiff/" -SRC_URI="ftp://ftp.remotesensing.org/pub/libtiff/${P}.tar.gz" - -LICENSE="as-is" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="+cxx jbig jpeg static-libs zlib" - -RDEPEND="jpeg? ( virtual/jpeg ) - jbig? ( media-libs/jbigkit ) - zlib? ( sys-libs/zlib )" - -DEPEND="${RDEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/${P}-CVE-2011-0192.patch - epatch "${FILESDIR}"/${P}-CVE-2011-1167.patch - elibtoolize -} - -src_configure() { - econf \ - --disable-dependency-tracking \ - $(use_enable static-libs static) \ - $(use_enable cxx) \ - $(use_enable zlib) \ - $(use_enable jpeg) \ - $(use_enable jbig) \ - --without-x \ - --with-docdir="${EPREFIX}"/usr/share/doc/${PF} -} - -src_install() { - emake DESTDIR="${D}" install || die - dodoc ChangeLog README TODO -} - -pkg_postinst() { - if use jbig; then - echo - elog "JBIG support is intended for Hylafax fax compression, so we" - elog "really need more feedback in other areas (most testing has" - elog "been done with fax). Be sure to recompile anything linked" - elog "against tiff if you rebuild it with jbig support." - echo - fi -} |