[gentoo-commits] repo/gentoo:master commit in: media-libs/glpng/, media-libs/glpng/files/

[gentoo-commits] repo/gentoo:master commit in: media-libs/glpng/, media-libs/glpng/files/

[James Le Cuirot]

commit:     905183fbf7340c229cdc38e08b1ddddb1ed3d041
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 26 08:31:52 2015 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Wed Aug 26 08:32:41 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=905183fb

media-libs/glpng: Remove old and vulnerable wrt bug #332511

Package-Manager: portage-2.2.20.1

 media-libs/glpng/Manifest                        |  1 -
 media-libs/glpng/files/glpng-1.45-libpng15.patch | 40 ------------------------
 media-libs/glpng/glpng-1.45-r1.ebuild            | 30 ------------------
 3 files changed, 71 deletions(-)

diff --git a/media-libs/glpng/Manifest b/media-libs/glpng/Manifest
index 9dc535d..8f49473 100644
--- a/media-libs/glpng/Manifest
+++ b/media-libs/glpng/Manifest
@@ -1,2 +1 @@
-DIST glpng-1.45.tar.bz2 64426 SHA256 a002aa60f460b0f363267d10c79c730b9dba4c834d0ee43eac15460c2e05f2e8 SHA512 002d6ca05c603d2728454c4daafddca3be23afabd17181d69d7993734306e71c65cf4562e6598ca09b5a50e0c94ecbb0e3b1622788d50af53f54abfae5904747 WHIRLPOOL 643c3dc658068c397fdfe4002a7e0f098c79dbd74189926b4fbbcad70302fe666cec170169562bf776c022894c5910685c247474d8fa37196eef887ccc020892
 DIST glpng-1.46.tar.gz 41024 SHA256 4a3e489deca733524780470c4fb89806e354515b541efb58d44f2e11936dc39e SHA512 82fbd6154a0ca16102b4c31f7fbd907cf8c18b20c1693c60f8dcdd1fe42ebe579f98da2b36c00fc080b2880c720e8099dac0d460a8de1b2bf1145abbf05a20ae WHIRLPOOL 1bad8a51377fed856cfba3309ae7c4069517d31d372b297f3f8d60616e561d3cc042751ff50bb11aaac73d27198b47c4d428139ce4f27d5f38dd4d7a80678b78

diff --git a/media-libs/glpng/files/glpng-1.45-libpng15.patch b/media-libs/glpng/files/glpng-1.45-libpng15.patch
deleted file mode 100644
index 06a3e9e..0000000
--- a/media-libs/glpng/files/glpng-1.45-libpng15.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- include/GL/glpng.h
-+++ include/GL/glpng.h
-@@ -57,7 +57,7 @@
- #define PNG_SIMPLEMIPMAP PNG_SIMPLEMIPMAPS
- 
- /* Transparency parameters */
--#define PNG_CALLBACK  -3 /* Call the callback function to generate alpha   */
-+#define PNG_CALLBACKT  -3 /* Call the callback function to generate alpha   */
- #define PNG_ALPHA     -2 /* Use alpha channel in PNG file, if there is one */
- #define PNG_SOLID     -1 /* No transparency                                */
- #define PNG_STENCIL    0 /* Sets alpha to 0 for r=g=b=0, 1 otherwise       */
---- src/glpng.c
-+++ src/glpng.c
-@@ -276,7 +276,7 @@
- 	endinfo = png_create_info_struct(png);
- 
- 	// DH: added following lines
--	if (setjmp(png->jmpbuf))
-+	if (setjmp(png_jmpbuf(png)))
- 	{
- 		png_destroy_read_struct(&png, &info, &endinfo);
- 		return 0;
-@@ -380,7 +380,7 @@
- 	endinfo = png_create_info_struct(png);
- 
- 	// DH: added following lines
--	if (setjmp(png->jmpbuf))
-+	if (setjmp(png_jmpbuf(png)))
- 	{
- 		png_destroy_read_struct(&png, &info, &endinfo);
- 		return 0;
-@@ -559,7 +559,7 @@
- 			#define ALPHA *q
- 
- 			switch (trans) {
--				case PNG_CALLBACK:
-+				case PNG_CALLBACKT:
- 					FORSTART
- 						ALPHA = AlphaCallback((unsigned char) r, (unsigned char) g, (unsigned char) b);
- 					FOREND

diff --git a/media-libs/glpng/glpng-1.45-r1.ebuild b/media-libs/glpng/glpng-1.45-r1.ebuild
deleted file mode 100644
index 235fd56..0000000
--- a/media-libs/glpng/glpng-1.45-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit cmake-utils eutils multilib
-
-DESCRIPTION="An OpenGL png image library"
-HOMEPAGE="http://www.fifi.org/doc/libglpng-dev/glpng.html"
-SRC_URI="http://dev.gentooexperimental.org/~scarabeus/${P}.tar.bz2"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="virtual/opengl
-	virtual/glu
-	media-libs/libpng
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libpng15.patch
-
-	# fix libdir placement
-	sed -i \
-		-e "s:CMAKE_INSTALL_LIBDIR lib:CMAKE_INSTALL_LIBDIR $(get_libdir):g"\
-		CMakeLists.txt || die
-}