Remove vulnerable copies bundling all of zlib, tiff, jpeg and png. Revert back to ~arch only.

(Portage version: 2.2.0_alpha61/cvs/Linux x86_64)

6 files changed, 7 insertions, 399 deletions

diff --git a/dev-tcltk/tkimg/ChangeLog b/dev-tcltk/tkimg/ChangeLog
index 9ea074742ee0..cda9473a88cd 100644
--- a/dev-tcltk/tkimg/ChangeLog
+++ b/dev-tcltk/tkimg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-tcltk/tkimg
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.30 2011/10/03 20:04:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/ChangeLog,v 1.31 2011/10/08 08:13:20 ssuominen Exp $
+
+  08 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> -tkimg-1.4.ebuild,
+  -tkimg-1.4-r1.ebuild, -tkimg-1.4.20100510.ebuild,
+  -files/tkimg-1.4.20100510-gentoo.patch, -files/tkimg-1.4-nojbig.patch:
+  Remove vulnerable copies bundling all of zlib, tiff, jpeg and png. Revert
+  back to ~arch only.
 
 *tkimg-1.4.20100510-r1 (03 Oct 2011)
 
diff --git a/dev-tcltk/tkimg/files/tkimg-1.4-nojbig.patch b/dev-tcltk/tkimg/files/tkimg-1.4-nojbig.patch
deleted file mode 100644
index 8ac8969cdcd0..000000000000
--- a/dev-tcltk/tkimg/files/tkimg-1.4-nojbig.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- tkimg1.4/libtiff/configure.in	2010-07-06 15:48:46.000000000 +0200
-+++ tkimg1.4.new/libtiff/configure.in	2011-02-28 23:24:18.471259943 +0100
-@@ -67,7 +67,7 @@
- else
-     TIFFHOST="$host"
- fi
--${srcdir}/../compat/libtiff/configure --disable-zlib --disable-pixarlog --disable-jpeg \
-+${srcdir}/../compat/libtiff/configure --disable-zlib --disable-pixarlog --disable-jpeg --disable-jbig \
- 	"--with-CC=$TIFFCC" $TIFFHOST
- mv -f tifftcl_confdefs.h confdefs.h
- 
---- tkimg1.4/libtiff/configure	2010-07-07 10:09:46.000000000 +0200
-+++ tkimg1.4.new/libtiff/configure	2011-02-28 23:25:53.529824614 +0100
-@@ -5133,7 +5133,7 @@
- else
-     TIFFHOST="$host"
- fi
--${srcdir}/../compat/libtiff/configure --disable-zlib --disable-pixarlog --disable-jpeg \
-+${srcdir}/../compat/libtiff/configure --disable-zlib --disable-pixarlog --disable-jpeg --disable-jbig \
- 	"--with-CC=$TIFFCC" $TIFFHOST
- mv -f tifftcl_confdefs.h confdefs.h
- 
diff --git a/dev-tcltk/tkimg/files/tkimg-1.4.20100510-gentoo.patch b/dev-tcltk/tkimg/files/tkimg-1.4.20100510-gentoo.patch
deleted file mode 100644
index 7c7dcadede92..000000000000
--- a/dev-tcltk/tkimg/files/tkimg-1.4.20100510-gentoo.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-diff --git a/libpng/Makefile.in b/libpng/Makefile.in
-index b84c3c5..9078062 100644
---- a/libpng/Makefile.in
-+++ b/libpng/Makefile.in
-@@ -37,8 +37,8 @@ zlibtcl_VERSION		= @zlibtcl_VERSION@
- # $(srcdir) or in the generic, win or unix subdirectory.
- #========================================================================
- 
--PKG_SOURCES	= @PKG_SOURCES@
--PKG_OBJECTS	= @PKG_OBJECTS@
-+PKG_SOURCES	= pngtcl.c pngtclStubInit.c
-+PKG_OBJECTS	= pngtcl.o pngtclStubInit.o
- 
- PKG_STUB_SOURCES = @PKG_STUB_SOURCES@
- PKG_STUB_OBJECTS = @PKG_STUB_OBJECTS@
-@@ -111,7 +111,7 @@ RANLIB		= @RANLIB@
- RANLIB_STUB	= @RANLIB_STUB@
- SHLIB_CFLAGS	= @SHLIB_CFLAGS@
- SHLIB_LD	= @SHLIB_LD@
--SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
-+SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@ -lpng
- STLIB_LD	= @STLIB_LD@
- TCL_DEFS	= @TCL_DEFS@
- TCL_BIN_DIR	= @TCL_BIN_DIR@
-diff --git a/libpng/pngtclDecls.h b/libpng/pngtclDecls.h
-index 834bd23..259e069 100644
---- a/libpng/pngtclDecls.h
-+++ b/libpng/pngtclDecls.h
-@@ -16,7 +16,7 @@
- 
- #include "tcl.h"
- #include "pngtclDeclsMask.h"
--#include "../compat/libpng/png.h"
-+#include "@GENTOO_PORTAGE_EPREFIX@/usr/include/png.h"
- #include "pngtclDeclsUnmask.h"
- 
- /* !BEGIN!: Do not edit below this line. */
-@@ -309,7 +309,7 @@ PNGTCLAPI void		png_data_freer(png_structp png_ptr,
- 				png_uint_32 mask);
- /* 98 */
- PNGTCLAPI png_voidp	png_malloc_default(png_structp png_ptr,
--				png_uint_32 size);
-+				png_alloc_size_t size);
- /* 99 */
- PNGTCLAPI void		png_free_default(png_structp png_ptr, png_voidp ptr);
- /* Slot 100 is reserved */
-@@ -1067,10 +1067,10 @@ typedef struct PngtclStubs {
-     void (*png_read_endPtr) (png_structp png_ptr, png_infop info_ptr); /* 59 */
-     void (*png_destroy_info_structPtr) (png_structp png_ptr, png_infopp info_ptr_ptr); /* 60 */
-     void (*png_destroy_read_structPtr) (png_structpp png_ptr_ptr, png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr); /* 61 */
--    void (*png_read_destroyPtr) (png_structp png_ptr, png_infop info_ptr, png_infop end_info_ptr); /* 62 */
-+/*    void (*png_read_destroyPtr) (png_structp png_ptr, png_infop info_ptr, png_infop end_info_ptr); */ /* 62 */
-     void (*png_destroy_write_structPtr) (png_structpp png_ptr_ptr, png_infopp info_ptr_ptr); /* 63 */
-     void *reserved64;
--    void (*png_write_destroyPtr) (png_structp png_ptr); /* 65 */
-+/*    void (*png_write_destroyPtr) (png_structp png_ptr); */ /* 65 */
-     void (*png_set_crc_actionPtr) (png_structp png_ptr, int crit_action, int ancil_action); /* 66 */
-     void (*png_set_filterPtr) (png_structp png_ptr, int method, int filters); /* 67 */
-     void (*png_set_filter_heuristicsPtr) (png_structp png_ptr, int heuristic_method, int num_weights, png_doublep filter_weights, png_doublep filter_costs); /* 68 */
-diff --git a/libpng/pngtclStubInit.c b/libpng/pngtclStubInit.c
-index f8d2d9b..3309ee9 100644
---- a/libpng/pngtclStubInit.c
-+++ b/libpng/pngtclStubInit.c
-@@ -197,10 +197,10 @@ const PngtclStubs pngtclStubs = {
-     png_read_end, /* 59 */
-     png_destroy_info_struct, /* 60 */
-     png_destroy_read_struct, /* 61 */
--    png_read_destroy, /* 62 */
-+/*    png_read_destroy, */ /* 62 */
-     png_destroy_write_struct, /* 63 */
-     NULL, /* 64 */
--    png_write_destroy, /* 65 */
-+/*    png_write_destroy, */ /* 65 */
-     png_set_crc_action, /* 66 */
-     png_set_filter, /* 67 */
- #if !defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED) || !defined(PNG_FLOATING_POINT_SUPPORTED)
-diff --git a/libtiff/Makefile.in b/libtiff/Makefile.in
-index 4592093..e32f5d2 100644
---- a/libtiff/Makefile.in
-+++ b/libtiff/Makefile.in
-@@ -35,8 +35,8 @@
- 
- # tif_fax3sm is special. It is generated.
- 
--PKG_SOURCES	= @PKG_SOURCES@ tif_fax3sm.c
--PKG_OBJECTS	= @PKG_OBJECTS@ tif_fax3sm.$(OBJEXT)
-+PKG_SOURCES	= tifftcl.c tifftclStubInit.c 
-+PKG_OBJECTS	= tifftcl.o tifftclStubInit.o 
- 
- PKG_STUB_SOURCES = @PKG_STUB_SOURCES@
- PKG_STUB_OBJECTS = @PKG_STUB_OBJECTS@
-@@ -109,7 +109,7 @@ RANLIB		= @RANLIB@
- RANLIB_STUB	= @RANLIB_STUB@
- SHLIB_CFLAGS	= @SHLIB_CFLAGS@
- SHLIB_LD	= @SHLIB_LD@
--SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
-+SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@ -ltiff
- STLIB_LD	= @STLIB_LD@
- TCL_DEFS	= @TCL_DEFS@
- TCL_BIN_DIR	= @TCL_BIN_DIR@
-diff --git a/libtiff/tifftclDecls.h b/libtiff/tifftclDecls.h
-index b30485d..7dd700b 100644
---- a/libtiff/tifftclDecls.h
-+++ b/libtiff/tifftclDecls.h
-@@ -24,8 +24,9 @@
- #undef INLINE
- 
- #include "tifftclDeclsMask.h"
--#include "../compat/libtiff/libtiff/tiffio.h"
- #include "../compat/libtiff/libtiff/tiffiop.h"
-+#include "@GENTOO_PORTAGE_EPREFIX@/usr/include/tiff.h"
-+#include "@GENTOO_PORTAGE_EPREFIX@/usr/include/tiffio.h"
- #include "../compat/libtiff/libtiff/tif_predict.h"
- #include "tifftclDeclsUnmask.h"
- 
-diff --git a/tiff/tiff.c b/tiff/tiff.c
-index a5d5949..826da9a 100644
---- a/tiff/tiff.c
-+++ b/tiff/tiff.c
-@@ -17,6 +17,7 @@
- #include "tcl.h"
- #include "tifftcl.h"
- #include "zlibtcl.h"
-+#include "init.c"
- 
- #ifdef HAVE_STDLIB_H
- #undef HAVE_STDLIB_H
-@@ -29,7 +30,6 @@ static int SetupTiffLibrary(Tcl_Interp *interp);
- #define MORE_INITIALIZATION \
-     if (SetupTiffLibrary (interp) != TCL_OK) { return TCL_ERROR; }
- 
--#include "init.c"
- 
- #include "tiffInt.h"
- 
-diff --git a/zlib/Makefile.in b/zlib/Makefile.in
-index cb71481..eb51145 100644
---- a/zlib/Makefile.in
-+++ b/zlib/Makefile.in
-@@ -33,8 +33,8 @@
- # $(srcdir) or in the generic, win or unix subdirectory.
- #========================================================================
- 
--PKG_SOURCES	= @PKG_SOURCES@
--PKG_OBJECTS	= @PKG_OBJECTS@
-+PKG_SOURCES	= zlibtcl.c zlibtclStubInit.c
-+PKG_OBJECTS	= zlibtcl.o zlibtclStubInit.o
- 
- PKG_STUB_SOURCES = @PKG_STUB_SOURCES@
- PKG_STUB_OBJECTS = @PKG_STUB_OBJECTS@
-@@ -107,7 +107,7 @@ RANLIB		= @RANLIB@
- RANLIB_STUB	= @RANLIB_STUB@
- SHLIB_CFLAGS	= @SHLIB_CFLAGS@
- SHLIB_LD	= @SHLIB_LD@
--SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
-+SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@ -lz
- STLIB_LD	= @STLIB_LD@
- TCL_DEFS	= @TCL_DEFS@
- TCL_BIN_DIR	= @TCL_BIN_DIR@
-diff --git a/zlib/configure.in b/zlib/configure.in
-index 292d3aa..bc045d6 100644
---- a/zlib/configure.in
-+++ b/zlib/configure.in
-@@ -51,17 +51,12 @@ TEA_SETUP_COMPILER
- #-----------------------------------------------------------------------
- 
- TEA_ADD_SOURCES([zlibtcl.c zlibtclStubInit.c])
--TEA_ADD_SOURCES([../compat/zlib/adler32.c	../compat/zlib/compress.c	../compat/zlib/crc32.c])
--TEA_ADD_SOURCES([../compat/zlib/deflate.c	../compat/zlib/gzclose.c	../compat/zlib/gzlib.c])
--TEA_ADD_SOURCES([../compat/zlib/gzread.c	../compat/zlib/gzwrite.c	../compat/zlib/infback.c])
--TEA_ADD_SOURCES([../compat/zlib/inffast.c	../compat/zlib/inflate.c	../compat/zlib/inftrees.c])
--TEA_ADD_SOURCES([../compat/zlib/trees.c	../compat/zlib/uncompr.c	../compat/zlib/zutil.c])
- 
- TEA_ADD_HEADERS([zlibtcl.h zlibtclDecls.h])
- TEA_ADD_HEADERS([zlibtclDeclsMask.h zlibtclDeclsUnmask.h])
- 
- TEA_ADD_INCLUDES([-I\"`\${CYGPATH} \${srcdir}`\"])
--TEA_ADD_LIBS([])
-+TEA_ADD_LIBS([-lz])
- TEA_ADD_CFLAGS([])
- TEA_ADD_STUB_SOURCES([zlibtclStubLib.c])
- TEA_ADD_SOURCES([zlibtclStubLib.c])
-diff --git a/zlib/zlibtclDecls.h b/zlib/zlibtclDecls.h
-index c91496f..630abc7 100644
---- a/zlib/zlibtclDecls.h
-+++ b/zlib/zlibtclDecls.h
-@@ -16,7 +16,7 @@
- 
- #include "tcl.h"
- #include "zlibtclDeclsMask.h"
--#include "../compat/zlib/zlib.h"
-+#include "@GENTOO_PORTAGE_EPREFIX@/usr/include/zlib.h"
- #include "zlibtclDeclsUnmask.h"
- 
- /* !BEGIN!: Do not edit below this line. */
diff --git a/dev-tcltk/tkimg/tkimg-1.4-r1.ebuild b/dev-tcltk/tkimg/tkimg-1.4-r1.ebuild
deleted file mode 100644
index 7fd0b3e882a3..000000000000
--- a/dev-tcltk/tkimg/tkimg-1.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/dev-tcltk/tkimg/tkimg-1.4-r1.ebuild,v 1.4 2011/09/19 16:18:00 jlec Exp $
-
-EAPI=3
-
-VIRTUALX_USE=test
-
-inherit eutils virtualx autotools
-
-MYP="${PN}${PV}"
-
-DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
-HOMEPAGE="http://tkimg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${MYP}.tar.bz2"
-
-IUSE="doc test"
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-lang/tk
-	>=dev-tcltk/tcllib-1.11"
-DEPEND="${RDEPEND}
-	test? (
-		x11-apps/xhost
-		media-fonts/font-misc-misc
-		media-fonts/font-cursor-misc )"
-
-S="${WORKDIR}/${MYP}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-nojbig.patch
-}
-
-src_test() {
-	Xmake test || die "Xmake failed"
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		INSTALL_ROOT="${D}" \
-		install || die "emake install failed"
-	# Make library links
-	for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
-		bl=$(basename $l)
-		dosym Img1.4/${bl} /usr/$(get_libdir)/${bl}
-	done
-
-	dodoc ChangeLog README Reorganization.Notes.txt changes ANNOUNCE || die
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins demo.tcl || die
-		insinto /usr/share/doc/${PF}/html
-		doins -r doc/* || die
-	fi
-}
diff --git a/dev-tcltk/tkimg/tkimg-1.4.20100510.ebuild b/dev-tcltk/tkimg/tkimg-1.4.20100510.ebuild
deleted file mode 100644
index 277f53e741bc..000000000000
--- a/dev-tcltk/tkimg/tkimg-1.4.20100510.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.4.20100510.ebuild,v 1.7 2011/09/17 17:32:28 ssuominen Exp $
-
-EAPI="3"
-
-inherit eutils prefix virtualx
-
-DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
-HOMEPAGE="http://sourceforge.net/projects/tkimg/"
-# src built with:
-# svn export https://tkimg.svn.sourceforge.net/svnroot/tkimg/trunk tkimg-1.4.YYYYMMDD
-# tar cvfj tkimg-1.4.YYYYMMDD.tar.bz2  tkimg-1.4.YYYYMMDD
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-IUSE="doc"
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	dev-lang/tk
-	>=dev-tcltk/tcllib-1.11
-	>=media-libs/libpng-1.4
-	virtual/jpeg
-	media-libs/tiff"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if has_version ">=media-libs/libpng-1.5"; then
-		local msg="Sorry, but libpng 1.5 is not yet supported. See bug 378261"
-		eerror "${msg}"
-		die "${msg}"
-	fi
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gentoo.patch \
-		"${FILESDIR}"/${P}-boolean.patch
-
-	eprefixify \
-		libjpeg/jpegtclDecls.h \
-		libpng/pngtclDecls.h \
-		libtiff/tifftclDecls.h \
-		zlib/zlibtclDecls.h
-}
-
-src_test() {
-	Xemake test || die
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		INSTALL_ROOT="${D}" \
-		install || die "emake install failed"
-	# Make library links
-	for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
-		bl=$(basename $l)
-		dosym Img1.4/${bl} /usr/$(get_libdir)/${bl}
-	done
-
-	dodoc ChangeLog README Reorganization.Notes.txt changes ANNOUNCE || die
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins demo.tcl || die
-		insinto /usr/share/doc/${PF}/html
-		doins -r doc/* || die
-	fi
-}
diff --git a/dev-tcltk/tkimg/tkimg-1.4.ebuild b/dev-tcltk/tkimg/tkimg-1.4.ebuild
deleted file mode 100644
index 537815cb0cf6..000000000000
--- a/dev-tcltk/tkimg/tkimg-1.4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/tkimg/tkimg-1.4.ebuild,v 1.7 2011/09/19 16:18:00 jlec Exp $
-
-EAPI="3"
-VIRTUALX_USE=test
-inherit eutils virtualx autotools
-
-MYP="${PN}${PV}"
-
-DESCRIPTION="Adds a lot of image formats to Tcl/Tk"
-HOMEPAGE="http://tkimg.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${MYP}.tar.bz2"
-
-IUSE="doc test"
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha amd64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-lang/tk
-	>=dev-tcltk/tcllib-1.11"
-DEPEND="${RDEPEND}
-	test? ( x11-apps/xhost
-			media-fonts/font-misc-misc
-			media-fonts/font-cursor-misc )"
-
-S="${WORKDIR}/${MYP}"
-
-src_test() {
-	Xmake test || die "Xmake failed"
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		INSTALL_ROOT="${D}" \
-		install || die "emake install failed"
-	# Make library links
-	for l in "${ED}"/usr/lib*/Img*/*tcl*.so; do
-		bl=$(basename $l)
-		dosym Img1.4/${bl} /usr/$(get_libdir)/${bl}
-	done
-
-	dodoc ChangeLog README Reorganization.Notes.txt changes ANNOUNCE || die
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins demo.tcl || die
-		insinto /usr/share/doc/${PF}/html
-		doins -r doc/* || die
-	fi
-}