* [gentoo-commits] proj/sci:master commit in: media-libs/tiff/files/, media-libs/tiff/
@ 2011-05-06 16:32 Christoph Junghans
0 siblings, 0 replies; 2+ messages in thread
From: Christoph Junghans @ 2011-05-06 16:32 UTC (permalink / raw
To: gentoo-commits
commit: f7f1ddc6922123c04073a0407fe42b3da07b8f3d
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Fri May 6 16:30:04 2011 +0000
Commit: Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Fri May 6 16:30:04 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f7f1ddc6
Version bump to avoid conflict with tree
(Portage version: 2.1.9.42/git/Linux i686, signed Manifest commit with key C2000586)
---
media-libs/tiff/ChangeLog | 11 ++++
.../tiff/files/tiff-3.9.4-CVE-2011-0192.patch | 13 ++++
.../tiff/files/tiff-3.9.4-CVE-2011-1167.patch | 62 ++++++++++++++++++++
.../{tiff-3.9.4-r1.ebuild => tiff-3.9.4-r2.ebuild} | 25 ++++++--
4 files changed, 105 insertions(+), 6 deletions(-)
diff --git a/media-libs/tiff/ChangeLog b/media-libs/tiff/ChangeLog
new file mode 100644
index 0000000..432cbf7
--- /dev/null
+++ b/media-libs/tiff/ChangeLog
@@ -0,0 +1,11 @@
+# ChangeLog for media-libs/tiff
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*tiff-3.9.4-r2 (06 May 2011)
+
+ 06 May 2011; Christoph Junghans <ottxor@gentoo.org> -tiff-3.9.4-r1.ebuild,
+ +tiff-3.9.4-r2.ebuild, +files/tiff-3.9.4-CVE-2011-0192.patch,
+ +files/tiff-3.9.4-CVE-2011-1167.patch:
+ Version bump to avoid conflict with tree
+
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
new file mode 100644
index 0000000..dbeb882
--- /dev/null
+++ b/media-libs/tiff/files/tiff-3.9.4-CVE-2011-0192.patch
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 0000000..5783a2b
--- /dev/null
+++ b/media-libs/tiff/files/tiff-3.9.4-CVE-2011-1167.patch
@@ -0,0 +1,62 @@
+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-r2.ebuild
similarity index 64%
rename from media-libs/tiff/tiff-3.9.4-r1.ebuild
rename to media-libs/tiff/tiff-3.9.4-r2.ebuild
index 79e2a7b..1087aa6 100644
--- a/media-libs/tiff/tiff-3.9.4-r1.ebuild
+++ b/media-libs/tiff/tiff-3.9.4-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.ebuild,v 1.10 2010/07/23 20:43:04 ssuominen Exp $
+# $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 libtool
+inherit eutils libtool
# This is ebuild for libtiff.so.3 only for SONAME binary compatibility
@@ -16,14 +16,16 @@ SLOT="3"
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"
-DEPEND="
+RDEPEND="jpeg? ( virtual/jpeg )
!=media-libs/tiff-3*
- jpeg? ( virtual/jpeg )
jbig? ( media-libs/jbigkit )
zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
+
+DEPEND="${RDEPEND}"
src_prepare() {
+ epatch "${FILESDIR}"/${P}-CVE-2011-0192.patch
+ epatch "${FILESDIR}"/${P}-CVE-2011-1167.patch
elibtoolize
}
@@ -44,3 +46,14 @@ src_install() {
doexe libtiff/.libs/libtiff.so.3 || die
doexe libtiff/.libs/libtiffxx.so.3 || die
}
+
+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
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/sci:master commit in: media-libs/tiff/files/, media-libs/tiff/
@ 2011-05-09 12:01 Justin Lecher
0 siblings, 0 replies; 2+ messages in thread
From: Justin Lecher @ 2011-05-09 12:01 UTC (permalink / raw
To: gentoo-commits
commit: 44e3e0cf80cdb068601e3a16140ac6098e481ca0
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon May 9 11:58:45 2011 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon May 9 11:58:45 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=44e3e0cf
tiff -> tiff-compat
---
media-libs/tiff/ChangeLog | 17 -----
.../tiff/files/tiff-3.9.4-CVE-2011-0192.patch | 13 ----
.../tiff/files/tiff-3.9.4-CVE-2011-1167.patch | 62 --------------------
media-libs/tiff/metadata.xml | 12 ----
media-libs/tiff/tiff-3.9.4-r1.ebuild | 59 -------------------
5 files changed, 0 insertions(+), 163 deletions(-)
diff --git a/media-libs/tiff/ChangeLog b/media-libs/tiff/ChangeLog
deleted file mode 100644
index baad88d..0000000
--- a/media-libs/tiff/ChangeLog
+++ /dev/null
@@ -1,17 +0,0 @@
-# ChangeLog for media-libs/tiff
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*tiff-3.9.4-r1 (07 May 2011)
-
- 07 May 2011; Christoph Junghans <ottxor@gentoo.org> +tiff-3.9.4-r1.ebuild,
- -tiff-3.9.4-r2.ebuild:
- Undo the bump (see bug #364181)
-
-*tiff-3.9.4-r2 (06 May 2011)
-
- 06 May 2011; Christoph Junghans <ottxor@gentoo.org> -tiff-3.9.4-r1.ebuild,
- +tiff-3.9.4-r2.ebuild, +files/tiff-3.9.4-CVE-2011-0192.patch,
- +files/tiff-3.9.4-CVE-2011-1167.patch:
- Version bump to avoid conflict with tree
-
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 dbeb882..0000000
--- 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 5783a2b..0000000
--- 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/metadata.xml b/media-libs/tiff/metadata.xml
deleted file mode 100644
index afea603..0000000
--- a/media-libs/tiff/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>graphics</herd>
-<maintainer>
- <email>nerdboy@gentoo.org</email>
- <name>Steve Arnold</name>
- <description>Primary Maintainer</description>
-</maintainer>
-<longdescription>TIFF image library and tools, mostly for scanner and fax
- support, but also used by GIS and other imaging tools.</longdescription>
-</pkgmetadata>
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 1087aa6..0000000
--- a/media-libs/tiff/tiff-3.9.4-r1.ebuild
+++ /dev/null
@@ -1,59 +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
-
-# This is ebuild for libtiff.so.3 only for SONAME binary compatibility
-
-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="3"
-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 )
- !=media-libs/tiff-3*
- 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() {
- exeinto /usr/$(get_libdir)
- doexe libtiff/.libs/libtiff.so.3 || die
- doexe libtiff/.libs/libtiffxx.so.3 || die
-}
-
-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
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-05-09 12:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-09 12:01 [gentoo-commits] proj/sci:master commit in: media-libs/tiff/files/, media-libs/tiff/ Justin Lecher
-- strict thread matches above, loose matches on Subject: below --
2011-05-06 16:32 Christoph Junghans
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox