diff options
| author |   Alexey Shvetsov <alexxy@gentoo.org> | 2011-09-02 08:39:56 +0000 |
|---|---|---|
| committer | Alexey Shvetsov <alexxy@gentoo.org> | 2011-09-02 08:39:56 +0000 |
| commit | 4e0f6bb505ea1ba899932b8626ed583c47b28b12 (patch) | |
| tree | fc3bf3fee2145b68fe6dc23ed280970614ad6d30 /media-libs/tiff-compat | |
| parent | Bump to 3.0.3, from gnome overlay for GNOME 3 (diff) | |
| download | gentoo-2-4e0f6bb505ea1ba899932b8626ed583c47b28b12.tar.gz gentoo-2-4e0f6bb505ea1ba899932b8626ed583c47b28b12.tar.bz2 gentoo-2-4e0f6bb505ea1ba899932b8626ed583c47b28b12.zip | |
[media-libs/tiff-compat] Drop unneded patches
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/tiff-compat')
4 files changed, 7 insertions, 83 deletions
diff --git a/media-libs/tiff-compat/ChangeLog b/media-libs/tiff-compat/ChangeLog index d158ec088015..2ce331a8a5d6 100644 --- a/media-libs/tiff-compat/ChangeLog +++ b/media-libs/tiff-compat/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/tiff-compat # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff-compat/ChangeLog,v 1.2 2011/08/31 15:14:06 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff-compat/ChangeLog,v 1.3 2011/09/02 08:39:56 alexxy Exp $ + + 02 Sep 2011; Alexey Shvetsov <alexxy@gentoo.org> + -files/tiff-3.9.4-CVE-2011-0192.patch, -files/tiff-3.9.4-CVE-2011-1167.patch, + tiff-compat-3.9.5.ebuild: + Drop already included patches *tiff-compat-3.9.5 (31 Aug 2011) diff --git a/media-libs/tiff-compat/files/tiff-3.9.4-CVE-2011-0192.patch b/media-libs/tiff-compat/files/tiff-3.9.4-CVE-2011-0192.patch deleted file mode 100644 index dbeb8825db0a..000000000000 --- a/media-libs/tiff-compat/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-compat/files/tiff-3.9.4-CVE-2011-1167.patch b/media-libs/tiff-compat/files/tiff-3.9.4-CVE-2011-1167.patch deleted file mode 100644 index 5783a2b23a0c..000000000000 --- a/media-libs/tiff-compat/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-compat/tiff-compat-3.9.5.ebuild b/media-libs/tiff-compat/tiff-compat-3.9.5.ebuild index 8cbca6e74b6d..859a7f0ad094 100644 --- a/media-libs/tiff-compat/tiff-compat-3.9.5.ebuild +++ b/media-libs/tiff-compat/tiff-compat-3.9.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff-compat/tiff-compat-3.9.5.ebuild,v 1.1 2011/08/31 15:14:06 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff-compat/tiff-compat-3.9.5.ebuild,v 1.2 2011/09/02 08:39:56 alexxy Exp $ EAPI=3 inherit eutils libtool @@ -25,12 +25,6 @@ DEPEND="${RDEPEND}" S="${WORKDIR}"/${P/-compat} -src_prepare() { - epatch "${FILESDIR}"/${P/-compat}-CVE-2011-0192.patch - epatch "${FILESDIR}"/${P/-compat}-CVE-2011-1167.patch - elibtoolize -} - src_configure() { econf \ --disable-dependency-tracking \ |