commit: 31355057ac5b1182312429923c4fa7e31daa66e9
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 4 16:54:21 2017 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Sat Feb 4 16:56:46 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31355057
dev-php/jpgraph: remove older unused versions.
Gentoo-Bug: 520566
Package-Manager: portage-2.3.3
dev-php/jpgraph/Manifest | 1 -
dev-php/jpgraph/files/cve-2009-4422.patch | 31 ----------
dev-php/jpgraph/jpgraph-3.0.7-r1.ebuild | 94 -------------------------------
dev-php/jpgraph/jpgraph-3.0.7-r2.ebuild | 94 -------------------------------
4 files changed, 220 deletions(-)
diff --git a/dev-php/jpgraph/Manifest b/dev-php/jpgraph/Manifest
index 68fcb83..281382d 100644
--- a/dev-php/jpgraph/Manifest
+++ b/dev-php/jpgraph/Manifest
@@ -1,2 +1 @@
-DIST jpgraph-3.0.7.tar.bz2 10541173 SHA256
412a1aaf47c7d70c5a4350d1c571ebb88c77138d9b95afd51895c44f188a03b6 SHA512
9385d8ac72a942faa4c2a46e7390c9b672fe45802ea37da8a90bca00e32d34421f7ce5dc8d78da934e2dfd8e748c21211af6556f11b3037898757555b0b529ee
WHIRLPOOL
83cbd6fd4be742af70a0d2790a2defb8ef6e5c1d9fb66f18f5c5913e3c6986d9a4063671ec3b8d6a0aa08859d58ee710ab644433340e62d9a5689d7715118eda
DIST jpgraph-4.0.2.tar.gz 13298314 SHA256
9cbcf565c2bfb211e1c85fef1ed4fac5a830435ab508d509d2f5cb724356e121 SHA512
db1877c09c13a26d24ef7df4aae50799f55c6d72ca0cdb0b8d8c05928c1bc860f8a86eb52a5fb05bdc1c07574931825baa2989f006e9a4cc57e60913e8b67a3e
WHIRLPOOL
e403e829058afb33606d393ad60e36a89018c94c4e46b235e6909679b1f53117753e99bcc528a5b13eaa132ff7587f0f2e5a1940d222c5f50600863a3aafe54a
diff --git a/dev-php/jpgraph/files/cve-2009-4422.patch
b/dev-php/jpgraph/files/cve-2009-4422.patch
deleted file mode 100644
index b092d43..00000000
--- a/dev-php/jpgraph/files/cve-2009-4422.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -ur jpgraph-3.0.7.orig/src/jpgraph.php jpgraph-3.0.7/src/jpgraph.php
---- jpgraph-3.0.7.orig/src/jpgraph.php 1970-01-01 10:13:08.000000000 +0100
-+++ jpgraph-3.0.7/src/jpgraph.php 2012-06-11 14:55:18.557995018 +0200
-@@ -1286,11 +1286,11 @@
- while( list($key,$value) = each($_GET) ) {
- if( is_array($value) ) {
- foreach ( $value as $k => $v ) {
-- $urlarg .= '&'.$key.'%5B'.$k.'%5D='.urlencode($v);
-+ $urlarg .=
'&'.urlencode($key).'%5B'.$k.'%5D='.urlencode($v);
- }
- }
- else {
-- $urlarg .= '&'.$key.'='.urlencode($value);
-+ $urlarg .= '&'.urlencode($key).'='.urlencode($value);
- }
- }
-
-@@ -1301,11 +1301,11 @@
- while( list($key,$value) = each($_POST) ) {
- if( is_array($value) ) {
- foreach ( $value as $k => $v ) {
-- $urlarg .= '&'.$key.'%5B'.$k.'%5D='.urlencode($v);
-+ $urlarg .=
'&'.htmlentities($key).'%5B'.$k.'%5D='.htmlentities($v);
- }
- }
- else {
-- $urlarg .= '&'.$key.'='.urlencode($value);
-+ $urlarg .=
'&'.htmlentities($key).'='.htmlentities($value);
- }
- }
-
diff --git a/dev-php/jpgraph/jpgraph-3.0.7-r1.ebuild
b/dev-php/jpgraph/jpgraph-3.0.7-r1.ebuild
deleted file mode 100644
index 46118fc..00000000
--- a/dev-php/jpgraph/jpgraph-3.0.7-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils
-
-KEYWORDS="alpha amd64 hppa ppc sparc x86"
-
-DESCRIPTION="Fully OO graph drawing library for PHP"
-HOMEPAGE="http://www.aditus.nu/jpgraph/";
-SRC_URI="http://hem.bredband.net/jpgraph2/${P}.tar.bz2";
-LICENSE="QPL-1.0"
-SLOT="0"
-IUSE="truetype +examples"
-
-DEPEND=""
-RDEPEND="truetype? ( media-fonts/corefonts )
- dev-lang/php[gd]
- "
-S="${WORKDIR}"
-
-[[ -z "${JPGRAPH_CACHEDIR}" ]] && JPGRAPH_CACHEDIR="/var/cache/jpgraph-php5/"
-
-pkg_setup() {
- # check to which user:group the cache dir will go
- if has_version "www-servers/apache" ; then
- HTTPD_USER="apache"
- HTTPD_GROUP="apache"
- einfo "Configuring ${JPGRAPH_CACHEDIR} for Apache."
- else
- HTTPD_USER="${HTTPD_USER:-root}"
- HTTPD_GROUP="${HTTPD_GROUP:-root}"
- ewarn "No Apache webserver detected - ${JPGRAPH_CACHEDIR} will
be"
- ewarn "owned by ${HTTPD_USER}:${HTTPD_GROUP} instead."
- ewarn "It this is not what you want, you can define"
- ewarn "HTTPD_USER and HTTPD_GROUP variables and re-emerge
${PN}."
- epause 3
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}/cve-2009-4422.patch"
-}
-
-src_install() {
- # some patches to adapt the config to Gentoo
- einfo "Patching jpg-config.inc.php"
-
- # patch 1:
- # make jpgraph use the correct group for file permissions
-
- sed -i
"s|^define('CACHE_FILE_GROUP','www');|define('CACHE_FILE_GROUP','${HTTPD_GROUP}');|"
src/jpg-config.inc.php \
- || die "sed failed in patch 1"
-
- # patch 2:
- # make jpgraph use the correct directory for caching
-
- sed -i
"s|.*define('CACHE_DIR','/tmp/jpgraph_cache/');|define('CACHE_DIR','${JPGRAPH_CACHEDIR}');|"
src/jpg-config.inc.php \
- || die "sed failed in patch 2"
-
- # patch 3:
- # make jpgraph use the correct directory for the corefonts if the
truetype USE flag is set
-
- if use truetype ; then
- sed -i
"s|.*define('TTF_DIR','/usr/X11R6/lib/X11/fonts/truetype/');|define('TTF_DIR','/usr/share/fonts/corefonts/');|"
src/jpg-config.inc.php \
- || die "sed failed in patch 3"
- fi
-
- # patch 4:
- # disable READ_CACHE in jpgraph
- sed -i "s|^define('READ_CACHE',true);|define('READ_CACHE',false);|"
src/jpg-config.inc.php \
- || die "sed failed in patch 4"
-
- # install php files
- einfo "Building list of files to install"
- insinto "/usr/share/php/${PN}"
- doins -r src/*
-
- # remove unwanted examples
- use examples || rm -rf "${D}/usr/share/php/${PN}/Examples"
-
- # install documentation
- einfo "Installing documentation"
- dodoc -r docportal/*
- dodoc README
-
- # setup the cache dir
- einfo "Setting up the cache dir"
- keepdir "${JPGRAPH_CACHEDIR}"
- fowners ${HTTPD_USER}:${HTTPD_GROUP} "${JPGRAPH_CACHEDIR}"
- fperms 750 "${JPGRAPH_CACHEDIR}"
-}
diff --git a/dev-php/jpgraph/jpgraph-3.0.7-r2.ebuild
b/dev-php/jpgraph/jpgraph-3.0.7-r2.ebuild
deleted file mode 100644
index 3aac6c6..00000000
--- a/dev-php/jpgraph/jpgraph-3.0.7-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils
-
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
-
-DESCRIPTION="Fully OO graph drawing library for PHP"
-HOMEPAGE="http://jpgraph.net/";
-SRC_URI="http://hem.bredband.net/jpgraph2/${P}.tar.bz2";
-LICENSE="QPL-1.0"
-SLOT="0"
-IUSE="truetype +examples"
-
-DEPEND=""
-RDEPEND="truetype? ( media-fonts/corefonts )
- dev-lang/php[gd,truetype?]
- "
-S="${WORKDIR}"
-
-[[ -z "${JPGRAPH_CACHEDIR}" ]] && JPGRAPH_CACHEDIR="/var/cache/jpgraph-php5/"
-
-pkg_setup() {
- # check to which user:group the cache dir will go
- if has_version "www-servers/apache" ; then
- HTTPD_USER="apache"
- HTTPD_GROUP="apache"
- einfo "Configuring ${JPGRAPH_CACHEDIR} for Apache."
- else
- HTTPD_USER="${HTTPD_USER:-root}"
- HTTPD_GROUP="${HTTPD_GROUP:-root}"
- ewarn "No Apache webserver detected - ${JPGRAPH_CACHEDIR} will
be"
- ewarn "owned by ${HTTPD_USER}:${HTTPD_GROUP} instead."
- ewarn "It this is not what you want, you can define"
- ewarn "HTTPD_USER and HTTPD_GROUP variables and re-emerge
${PN}."
- epause 3
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}/cve-2009-4422.patch"
-}
-
-src_install() {
- # some patches to adapt the config to Gentoo
- einfo "Patching jpg-config.inc.php"
-
- # patch 1:
- # make jpgraph use the correct group for file permissions
-
- sed -i
"s|^define('CACHE_FILE_GROUP','www');|define('CACHE_FILE_GROUP','${HTTPD_GROUP}');|"
src/jpg-config.inc.php \
- || die "sed failed in patch 1"
-
- # patch 2:
- # make jpgraph use the correct directory for caching
-
- sed -i
"s|.*define('CACHE_DIR','/tmp/jpgraph_cache/');|define('CACHE_DIR','${JPGRAPH_CACHEDIR}');|"
src/jpg-config.inc.php \
- || die "sed failed in patch 2"
-
- # patch 3:
- # make jpgraph use the correct directory for the corefonts if the
truetype USE flag is set
-
- if use truetype ; then
- sed -i
"s|.*define('TTF_DIR','/usr/share/fonts/truetype/');|define('TTF_DIR','/usr/share/fonts/corefonts/');|"
src/jpg-config.inc.php \
- || die "sed failed in patch 3"
- fi
-
- # patch 4:
- # disable READ_CACHE in jpgraph
- sed -i "s|^define('READ_CACHE',true);|define('READ_CACHE',false);|"
src/jpg-config.inc.php \
- || die "sed failed in patch 4"
-
- # install php files
- einfo "Building list of files to install"
- insinto "/usr/share/php/${PN}"
- doins -r src/*
-
- # remove unwanted examples
- use examples || rm -rf "${D}/usr/share/php/${PN}/Examples"
-
- # install documentation
- einfo "Installing documentation"
- dodoc -r docportal/*
- dodoc README
-
- # setup the cache dir
- einfo "Setting up the cache dir"
- keepdir "${JPGRAPH_CACHEDIR}"
- fowners ${HTTPD_USER}:${HTTPD_GROUP} "${JPGRAPH_CACHEDIR}"
- fperms 750 "${JPGRAPH_CACHEDIR}"
-}
