Removed older versions

Package-Manager: portage-2.1.10.6/cvs/Linux x86_64
author: Ole Markus With <olemarkus@gentoo.org> 2011-09-07 11:24:20 +0000
committer: Ole Markus With <olemarkus@gentoo.org> 2011-09-07 11:24:20 +0000
commit: ff6e35dde236094f031af6f862f9b62ed53071d6 (patch)
tree: 2e8fa2525fe6dc4139765b17e6bcb8cd879ac800 /dev-php/PEAR-PEAR
parent: Oops also add VERSION to docs. (diff)
download: historical-ff6e35dde236094f031af6f862f9b62ed53071d6.tar.gz
historical-ff6e35dde236094f031af6f862f9b62ed53071d6.tar.bz2
historical-ff6e35dde236094f031af6f862f9b62ed53071d6.zip
7 files changed, 15 insertions, 494 deletions
diff --git a/dev-php/PEAR-PEAR/ChangeLog b/dev-php/PEAR-PEAR/ChangeLog
index bc88f25f577e..263a9736593f 100644
--- a/dev-php/PEAR-PEAR/ChangeLog
+++ b/dev-php/PEAR-PEAR/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-php/PEAR-PEAR
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/ChangeLog,v 1.149 2011/08/25 11:56:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/ChangeLog,v 1.150 2011/09/07 11:24:20 olemarkus Exp $
+
+  07 Sep 2011; Ole Markus With <olemarkus@gentoo.org>
+  -files/1.6.2-accept-encoding-bug_12116.patch, -PEAR-PEAR-1.9.2.ebuild,
+  -PEAR-PEAR-1.9.2-r1.ebuild, -PEAR-PEAR-1.9.2-r2.ebuild,
+  -files/symlink-attack-fix.patch:
+  Removed older versions
 
   25 Aug 2011; Jeroen Roovers <jer@gentoo.org> PEAR-PEAR-1.9.3.ebuild:
   Stable for HPPA (bug #374447).
diff --git a/dev-php/PEAR-PEAR/Manifest b/dev-php/PEAR-PEAR/Manifest
index 3fcd70801ba7..4e22d6e9c3d8 100644
--- a/dev-php/PEAR-PEAR/Manifest
+++ b/dev-php/PEAR-PEAR/Manifest
@@ -1,24 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 1.6.2-accept-encoding-bug_12116.patch 603 RMD160 d19b8be3352e479c7316f259cfb23f397de655fb SHA1 cab06556f29fbc9749a6566bf124678e7de60188 SHA256 7f15a8fe6c09c6846b4e052b6f6ee2052b0191b215f7e41bc56b6b89c952ae4a
 AUX gentoo-libtool-mismatch-fix.patch 718 RMD160 aba10f327eb1c5698e094ecb1efa1dfb0098a55c SHA1 68c5bcc3a32fcbca9059df2359a2dd3650024e0e SHA256 7ee96d72e09529f773c14db4da099fdb8beec12a370b76fb8901cc010cdb6fb5
 AUX pear.conf 291 RMD160 311e624d97640448754aa2f3e643aa53501f9c25 SHA1 47b350c2bf4b882b5981504ac6acfd7c708367e6 SHA256 cbe9363c760952d00b90070d4a41e88a175e12c65f99668fbe16d8158f5fa7ab
 AUX pear.conf-r1 379 RMD160 df2595353d3a0ee5474dff41a445ebd2e642a5ec SHA1 a9971714efca2a84ef54b5f7c71f3adbbe3d2930 SHA256 43e78396b7b91cf16a3d33d36c19096c9e7281b7f771c379f383a16c7756c490
 AUX pear.conf-r2 379 RMD160 adaf8e0edd442e7a612754af1f594d8e9e776023 SHA1 098fd2a554643380bf09cc36e03d556459e00eeb SHA256 33296ad828fdbe5447edc93aea6e81351f643fc2e845c6e4bdfad84b299023aa
-AUX symlink-attack-fix.patch 5860 RMD160 1fc6871359f78915be4b7cd8a26bbeb9705293e1 SHA1 87805d8fe243aa2a6e7e03b5199ecd9301bcb33a SHA256 d01dc9fe8fbb834d6c80ce4d943041526bea4af7f7a8925f9ae4278427ac3ead
-DIST PEAR-1.9.2.tgz 295120 RMD160 f12b6a0a4600b0b227a88687c124b515621ca803 SHA1 1dda2c7c1c87532f6a45a54b98521a2e9efa02b3 SHA256 7f1446f3d92b4e19d3d4ca38dff6f50b66882b9b11a901b069e89a60ff4aff82
 DIST PEAR-1.9.3.tgz 295774 RMD160 eb227ec284d63e9df3d78863d2b9cf2952befe93 SHA1 c214bb9d5e1fb9e3c5b99d2af9ae9501ccd55206 SHA256 8c53eabd441aecaf37ee1bd0c7d9ab60a8ec18fdb023edf942536c0bf29c1ab9
-EBUILD PEAR-PEAR-1.9.2-r1.ebuild 3706 RMD160 37c5ce81b113db052b4e9c4b7c4f63c9432b6207 SHA1 5aa34e0de8b6aee04834f4d217750360735ca9e5 SHA256 6d9cb517885cc6a15765a908215da7c5be0e31f617e4f06e6c3f7ca7ea01efc3
-EBUILD PEAR-PEAR-1.9.2-r2.ebuild 3790 RMD160 a20b2a905c3b241d2759cb87d1e48c743c64fc60 SHA1 e14109396073a51df418f1a81e639b00ccbbd82a SHA256 f51149e03ab5a16d1ebdbdb01b18c869e9420f62cef85db7c8f6a9fe4580bf84
-EBUILD PEAR-PEAR-1.9.2.ebuild 3636 RMD160 f88015f6e95a7250bef04756f69be35a5c1d7197 SHA1 d40a6dc8ded82e540d5cc4482ae1156b7c52b9a9 SHA256 2d565affd0b52d3d85b9914156fe04d49951c618a602b594061ae9eba68b7398
 EBUILD PEAR-PEAR-1.9.3.ebuild 3723 RMD160 f0a55d4c347923fb49e08701632abc754bcd69cd SHA1 259e43efdb424f7f6ea85da169e636ceba52481f SHA256 42f03b957a2b931d771acd8e81a535e4f396f2cdfd6380baf0963d83efe7b614
-MISC ChangeLog 20865 RMD160 370d04ec3f86a0b85c948bc4d650a584f98f57af SHA1 0df533795ff75ba350be9db94bf0c2a6c4b1fa13 SHA256 337368460c3b1460af9733d8a8c94b772d8764a9c0432f6a68c8c1ea7d8563e9
+MISC ChangeLog 21117 RMD160 b4fda2a2417e1e70acdf799fee9a1e201dfbfd92 SHA1 0d34e3f7c0035376d5374e9bd6d4c42ec1d71c6b SHA256 b1fa529d4f93796635cf1ff620e8dfcbf4510e891da2550877e9d40252812496
 MISC metadata.xml 248 RMD160 a52d2dcf8ab8231c5e8332d5022d921fb8b6754e SHA1 84c45cabf8e0959e44317f8db4449c0056c7959e SHA256 a98d66f97c0d4f6f57c10b1b2038cfb7c5a76a58ff187ddff241024dfa8dee51
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk5WOGQACgkQVWmRsqeSphM40gCcCPLz5GJrtmD5yFoN7sitkiJK
-1EYAnj015Qvrw5hi/zI5I1oL2Erb5c04
-=+nsd
+iQEcBAEBAgAGBQJOZ1SDAAoJEGurSuXEqSv155oH/AkTF+U+3qcZ/ybBV6gNt8ZT
+MvhI5b+PqELVmKZGm78UAgQRIg8Dj8PRZrzdmurg7xSvOoQgmnrs4quX5I89RsNm
+jZbg60RBi14o4Dv86LjKBndAUiCBsE5YRu/WSuFSfaHTspl+FR7hUBQPooorlS+Q
+HUfbpDa6ACvdnzVNza8RLibW3pkkpiSTgSftvszS3tGrYfHWxxUBKbguDQz5Qc74
+rTZPQ8svsQ+lRnPIf/WCBiYG8xvJ6VSzRLSvFa7S9VcYi1ILTcc4ukKb8HTnF9nF
+gd4gFlRYzHKmGMaY6H7joe4zGaSPNN03PXkTTdelweDh7gJ/zdPpH9VVH/Be9Sw=
+=R9vn
 -----END PGP SIGNATURE-----
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.2-r1.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.2-r1.ebuild
deleted file mode 100644
index c11e32176910..000000000000
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.2-r1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.2-r1.ebuild,v 1.9 2011/03/18 17:27:19 armin76 Exp $
-
-EAPI="3"
-
-inherit depend.php
-
-PEAR="${PV}"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-
-DESCRIPTION="PEAR Base System"
-HOMEPAGE="http://pear.php.net/package/PEAR"
-SRC_URI="http://pear.php.net/get/PEAR-${PEAR}.tgz"
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )
-		dev-lang/php[cli,xml,zlib]"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	has_php
-
-	[[ -z "${PEAR_CACHEDIR}" ]] && PEAR_CACHEDIR="${EPREFIX}/var/cache/pear"
-	[[ -z "${PEAR_DOWNLOADDIR}" ]] && PEAR_DOWNLOADDIR="${EPREFIX}/var/tmp/pear"
-	[[ -z "${PEAR_TEMPDIR}" ]] && PEAR_TEMPDIR="${EPREFIX}/tmp"
-
-	elog
-	elog "cache_dir is set to: ${PEAR_CACHEDIR}"
-	elog "download_dir is set to: ${PEAR_DOWNLOADDIR}"
-	elog "temp_dir is set to: ${PEAR_TEMPDIR}"
-	elog
-	elog "If you want to change the above values, you need to set"
-	elog "PEAR_CACHEDIR, PEAR_DOWNLOADDIR and PEAR_TEMPDIR variable(s)"
-	elog "accordingly in /etc/make.conf and re-emerge ${PN}."
-	elog
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/symlink-attack-fix.patch"
-
-}
-
-src_install() {
-	# Prevent SNMP related sandbox violoation.
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/
-
-	# install PEAR package
-	cd "${S}"/PEAR-${PEAR}
-
-	insinto /usr/share/php
-	doins -r PEAR/
-	doins -r OS/
-	doins PEAR.php PEAR5.php System.php
-	doins scripts/pearcmd.php
-	doins scripts/peclcmd.php
-
-	newbin scripts/pear.sh pear
-	newbin scripts/peardev.sh peardev
-	newbin scripts/pecl.sh pecl
-
-	# adjust some scripts for current version
-	for i in pearcmd.php peclcmd.php ; do
-		dosed "s:@pear_version@:${PEAR}:g" /usr/share/php/${i}
-	done
-
-	for i in pear peardev pecl ; do
-		dosed "s:@bin_dir@:${EPREFIX}/usr/bin:g" /usr/bin/${i}
-		dosed "s:@php_dir@:${EPREFIX}/usr/share/php:g" /usr/bin/${i}
-	done
-	dosed "s:-d output_buffering=1:-d output_buffering=1 -d memory_limit=32M:g" /usr/bin/pear
-
-	dosed "s:@package_version@:${PEAR}:g" /usr/share/php/PEAR/Command/Package.php
-	dosed "s:@PEAR-VER@:${PEAR}:g" /usr/share/php/PEAR/Dependency2.php
-	dosed "s:@PEAR-VER@:${PEAR}:g" /usr/share/php/PEAR/PackageFile/Parser/v1.php
-	dosed "s:@PEAR-VER@:${PEAR}:g" /usr/share/php/PEAR/PackageFile/Parser/v2.php
-
-	# finalize install
-	insinto /etc
-	newins "${FILESDIR}"/pear.conf-r2 pear.conf
-	dosed "s|s:PHPCLILEN:\"PHPCLI\"|s:${#PHPCLI}:\"${PHPCLI}\"|g" /etc/pear.conf
-	dosed "s|s:CACHEDIRLEN:\"CACHEDIR\"|s:${#PEAR_CACHEDIR}:\"${PEAR_CACHEDIR}\"|g" /etc/pear.conf
-	dosed "s|s:DOWNLOADDIRLEN:\"DOWNLOADDIR\"|s:${#PEAR_DOWNLOADDIR}:\"${PEAR_DOWNLOADDIR}\"|g" /etc/pear.conf
-	dosed "s|s:TEMPDIRLEN:\"TEMPDIR\"|s:${#PEAR_TEMPDIR}:\"${PEAR_TEMPDIR}\"|g" /etc/pear.conf
-
-	# Change the paths for eprefix!
-	dosed "s|s:19:\"/usr/share/php/docs\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/docs\"|g" /etc/pear.conf
-	dosed "s|s:19:\"/usr/share/php/data\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/data\"|g" /etc/pear.conf
-	dosed "s|s:20:\"/usr/share/php/tests\"|s:$(( ${#EPREFIX}+20 )):\"${EPREFIX}/usr/share/php/tests\"|g" /etc/pear.conf
-	dosed "s|s:14:\"/usr/share/php\"|s:$(( ${#EPREFIX}+14 )):\"${EPREFIX}/usr/share/php\"|g" /etc/pear.conf
-	dosed "s|s:8:\"/usr/bin\"|s:$(( ${#EPREFIX}+8 )):\"${EPREFIX}/usr/bin\"|g" /etc/pear.conf
-
-	[[ "${PEAR_TEMPDIR}" != "/tmp" ]] && keepdir "${PEAR_TEMPDIR#${EPREFIX}}"
-	keepdir "${PEAR_CACHEDIR#${EPREFIX}}"
-	diropts -m1777
-	keepdir "${PEAR_DOWNLOADDIR#${EPREFIX}}"
-}
-
-pkg_preinst() {
-	rm -f "${EROOT}/etc/pear.conf"
-}
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.2-r2.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.2-r2.ebuild
deleted file mode 100644
index e80e82ace7e4..000000000000
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.2-r2.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.2-r2.ebuild,v 1.1 2011/05/21 16:14:14 olemarkus Exp $
-
-EAPI="3"
-
-inherit depend.php
-
-PEAR="${PV}"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-
-DESCRIPTION="PEAR Base System"
-HOMEPAGE="http://pear.php.net/package/PEAR"
-SRC_URI="http://pear.php.net/get/PEAR-${PEAR}.tgz"
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )
-		dev-lang/php[cli,xml,zlib]"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	has_php
-
-	[[ -z "${PEAR_CACHEDIR}" ]] && PEAR_CACHEDIR="${EPREFIX}/var/cache/pear"
-	[[ -z "${PEAR_DOWNLOADDIR}" ]] && PEAR_DOWNLOADDIR="${EPREFIX}/var/tmp/pear"
-	[[ -z "${PEAR_TEMPDIR}" ]] && PEAR_TEMPDIR="${EPREFIX}/tmp"
-
-	elog
-	elog "cache_dir is set to: ${PEAR_CACHEDIR}"
-	elog "download_dir is set to: ${PEAR_DOWNLOADDIR}"
-	elog "temp_dir is set to: ${PEAR_TEMPDIR}"
-	elog
-	elog "If you want to change the above values, you need to set"
-	elog "PEAR_CACHEDIR, PEAR_DOWNLOADDIR and PEAR_TEMPDIR variable(s)"
-	elog "accordingly in /etc/make.conf and re-emerge ${PN}."
-	elog
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/symlink-attack-fix.patch"
-	cd PEAR-${PV}
-	epatch "${FILESDIR}/gentoo-libtool-mismatch-fix.patch"
-
-}
-
-src_install() {
-	# Prevent SNMP related sandbox violoation.
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/
-
-	# install PEAR package
-	cd "${S}"/PEAR-${PEAR}
-
-	insinto /usr/share/php
-	doins -r PEAR/
-	doins -r OS/
-	doins PEAR.php PEAR5.php System.php
-	doins scripts/pearcmd.php
-	doins scripts/peclcmd.php
-
-	newbin scripts/pear.sh pear
-	newbin scripts/peardev.sh peardev
-	newbin scripts/pecl.sh pecl
-
-	# adjust some scripts for current version
-	for i in pearcmd.php peclcmd.php ; do
-		dosed "s:@pear_version@:${PEAR}:g" /usr/share/php/${i}
-	done
-
-	for i in pear peardev pecl ; do
-		dosed "s:@bin_dir@:${EPREFIX}/usr/bin:g" /usr/bin/${i}
-		dosed "s:@php_dir@:${EPREFIX}/usr/share/php:g" /usr/bin/${i}
-	done
-	dosed "s:-d output_buffering=1:-d output_buffering=1 -d memory_limit=32M:g" /usr/bin/pear
-
-	dosed "s:@package_version@:${PEAR}:g" /usr/share/php/PEAR/Command/Package.php
-	dosed "s:@PEAR-VER@:${PEAR}:g" /usr/share/php/PEAR/Dependency2.php
-	dosed "s:@PEAR-VER@:${PEAR}:g" /usr/share/php/PEAR/PackageFile/Parser/v1.php
-	dosed "s:@PEAR-VER@:${PEAR}:g" /usr/share/php/PEAR/PackageFile/Parser/v2.php
-
-	# finalize install
-	insinto /etc
-	newins "${FILESDIR}"/pear.conf-r2 pear.conf
-	dosed "s|s:PHPCLILEN:\"PHPCLI\"|s:${#PHPCLI}:\"${PHPCLI}\"|g" /etc/pear.conf
-	dosed "s|s:CACHEDIRLEN:\"CACHEDIR\"|s:${#PEAR_CACHEDIR}:\"${PEAR_CACHEDIR}\"|g" /etc/pear.conf
-	dosed "s|s:DOWNLOADDIRLEN:\"DOWNLOADDIR\"|s:${#PEAR_DOWNLOADDIR}:\"${PEAR_DOWNLOADDIR}\"|g" /etc/pear.conf
-	dosed "s|s:TEMPDIRLEN:\"TEMPDIR\"|s:${#PEAR_TEMPDIR}:\"${PEAR_TEMPDIR}\"|g" /etc/pear.conf
-
-	# Change the paths for eprefix!
-	dosed "s|s:19:\"/usr/share/php/docs\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/docs\"|g" /etc/pear.conf
-	dosed "s|s:19:\"/usr/share/php/data\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/data\"|g" /etc/pear.conf
-	dosed "s|s:20:\"/usr/share/php/tests\"|s:$(( ${#EPREFIX}+20 )):\"${EPREFIX}/usr/share/php/tests\"|g" /etc/pear.conf
-	dosed "s|s:14:\"/usr/share/php\"|s:$(( ${#EPREFIX}+14 )):\"${EPREFIX}/usr/share/php\"|g" /etc/pear.conf
-	dosed "s|s:8:\"/usr/bin\"|s:$(( ${#EPREFIX}+8 )):\"${EPREFIX}/usr/bin\"|g" /etc/pear.conf
-
-	[[ "${PEAR_TEMPDIR}" != "/tmp" ]] && keepdir "${PEAR_TEMPDIR#${EPREFIX}}"
-	keepdir "${PEAR_CACHEDIR#${EPREFIX}}"
-	diropts -m1777
-	keepdir "${PEAR_DOWNLOADDIR#${EPREFIX}}"
-}
-
-pkg_preinst() {
-	rm -f "${EROOT}/etc/pear.conf"
-}
diff --git a/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.2.ebuild b/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.2.ebuild
deleted file mode 100644
index f2d57ec867cb..000000000000
--- a/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.2.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-PEAR/PEAR-PEAR-1.9.2.ebuild,v 1.7 2011/03/05 12:09:43 armin76 Exp $
-
-EAPI="3"
-
-inherit depend.php
-
-PEAR="${PV}"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
-
-DESCRIPTION="PEAR Base System"
-HOMEPAGE="http://pear.php.net/package/PEAR"
-SRC_URI="http://pear.php.net/get/PEAR-${PEAR}.tgz"
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND="|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )
-		dev-lang/php[cli,xml,zlib]"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	has_php
-
-	[[ -z "${PEAR_CACHEDIR}" ]] && PEAR_CACHEDIR="${EPREFIX}/var/cache/pear"
-	[[ -z "${PEAR_DOWNLOADDIR}" ]] && PEAR_DOWNLOADDIR="${EPREFIX}/var/tmp/pear"
-	[[ -z "${PEAR_TEMPDIR}" ]] && PEAR_TEMPDIR="${EPREFIX}/tmp"
-
-	elog
-	elog "cache_dir is set to: ${PEAR_CACHEDIR}"
-	elog "download_dir is set to: ${PEAR_DOWNLOADDIR}"
-	elog "temp_dir is set to: ${PEAR_TEMPDIR}"
-	elog
-	elog "If you want to change the above values, you need to set"
-	elog "PEAR_CACHEDIR, PEAR_DOWNLOADDIR and PEAR_TEMPDIR variable(s)"
-	elog "accordingly in /etc/make.conf and re-emerge ${PN}."
-	elog
-}
-
-src_install() {
-	# Prevent SNMP related sandbox violoation.
-	addpredict /usr/share/snmp/mibs/.index
-	addpredict /var/lib/net-snmp/
-
-	# install PEAR package
-	cd "${S}"/PEAR-${PEAR}
-
-	insinto /usr/share/php
-	doins -r PEAR/
-	doins -r OS/
-	doins PEAR.php PEAR5.php System.php
-	doins scripts/pearcmd.php
-	doins scripts/peclcmd.php
-
-	newbin scripts/pear.sh pear
-	newbin scripts/peardev.sh peardev
-	newbin scripts/pecl.sh pecl
-
-	# adjust some scripts for current version
-	for i in pearcmd.php peclcmd.php ; do
-		dosed "s:@pear_version@:${PEAR}:g" /usr/share/php/${i}
-	done
-
-	for i in pear peardev pecl ; do
-		dosed "s:@bin_dir@:${EPREFIX}/usr/bin:g" /usr/bin/${i}
-		dosed "s:@php_dir@:${EPREFIX}/usr/share/php:g" /usr/bin/${i}
-	done
-	dosed "s:-d output_buffering=1:-d output_buffering=1 -d memory_limit=32M:g" /usr/bin/pear
-
-	dosed "s:@package_version@:${PEAR}:g" /usr/share/php/PEAR/Command/Package.php
-	dosed "s:@PEAR-VER@:${PEAR}:g" /usr/share/php/PEAR/Dependency2.php
-	dosed "s:@PEAR-VER@:${PEAR}:g" /usr/share/php/PEAR/PackageFile/Parser/v1.php
-	dosed "s:@PEAR-VER@:${PEAR}:g" /usr/share/php/PEAR/PackageFile/Parser/v2.php
-
-	# finalize install
-	insinto /etc
-	newins "${FILESDIR}"/pear.conf-r2 pear.conf
-	dosed "s|s:PHPCLILEN:\"PHPCLI\"|s:${#PHPCLI}:\"${PHPCLI}\"|g" /etc/pear.conf
-	dosed "s|s:CACHEDIRLEN:\"CACHEDIR\"|s:${#PEAR_CACHEDIR}:\"${PEAR_CACHEDIR}\"|g" /etc/pear.conf
-	dosed "s|s:DOWNLOADDIRLEN:\"DOWNLOADDIR\"|s:${#PEAR_DOWNLOADDIR}:\"${PEAR_DOWNLOADDIR}\"|g" /etc/pear.conf
-	dosed "s|s:TEMPDIRLEN:\"TEMPDIR\"|s:${#PEAR_TEMPDIR}:\"${PEAR_TEMPDIR}\"|g" /etc/pear.conf
-
-	# Change the paths for eprefix!
-	dosed "s|s:19:\"/usr/share/php/docs\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/docs\"|g" /etc/pear.conf
-	dosed "s|s:19:\"/usr/share/php/data\"|s:$(( ${#EPREFIX}+19 )):\"${EPREFIX}/usr/share/php/data\"|g" /etc/pear.conf
-	dosed "s|s:20:\"/usr/share/php/tests\"|s:$(( ${#EPREFIX}+20 )):\"${EPREFIX}/usr/share/php/tests\"|g" /etc/pear.conf
-	dosed "s|s:14:\"/usr/share/php\"|s:$(( ${#EPREFIX}+14 )):\"${EPREFIX}/usr/share/php\"|g" /etc/pear.conf
-	dosed "s|s:8:\"/usr/bin\"|s:$(( ${#EPREFIX}+8 )):\"${EPREFIX}/usr/bin\"|g" /etc/pear.conf
-
-	[[ "${PEAR_TEMPDIR}" != "/tmp" ]] && keepdir "${PEAR_TEMPDIR#${EPREFIX}}"
-	keepdir "${PEAR_CACHEDIR#${EPREFIX}}"
-	diropts -m1777
-	keepdir "${PEAR_DOWNLOADDIR#${EPREFIX}}"
-}
-
-pkg_preinst() {
-	rm -f "${EROOT}/etc/pear.conf"
-}
diff --git a/dev-php/PEAR-PEAR/files/1.6.2-accept-encoding-bug_12116.patch b/dev-php/PEAR-PEAR/files/1.6.2-accept-encoding-bug_12116.patch
deleted file mode 100644
index 0ced6bcef340..000000000000
--- a/dev-php/PEAR-PEAR/files/1.6.2-accept-encoding-bug_12116.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-http://pear.php.net/bugs/bug.php?id=12116
-Index: PEAR/REST.php
-===================================================================
-RCS file: /repository/pear-core/PEAR/REST.php,v
-retrieving revision 1.22
-diff -u -r1.22 REST.php
---- PEAR/REST.php	10 Jun 2007 04:16:51 -0000	1.22
-+++ PEAR/REST.php	25 Sep 2007 18:40:13 -0000
-@@ -335,6 +335,7 @@
-         if ($accept) {
-             $request .= 'Accept: ' . implode(', ', $accept) . "\r\n";
-         }
-+        $request .= "Accept-Encoding:\r\n";
-         $request .= "Connection: close\r\n";
-         $request .= "\r\n";
-         if ($proxy_host != '') {
diff --git a/dev-php/PEAR-PEAR/files/symlink-attack-fix.patch b/dev-php/PEAR-PEAR/files/symlink-attack-fix.patch
deleted file mode 100644
index bd126e301ec0..000000000000
--- a/dev-php/PEAR-PEAR/files/symlink-attack-fix.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-Fixes issue with symlink attacks found in PEAR-PEAR-1.9.2
-Upstream bug: http://pear.php.net/bugs/bug.php?id=18056
-Gentoo bug: 356893
-
---- PEAR-1.9.2/PEAR/REST.php.old	2011-03-14 18:21:59.000000000 +0100
-+++ PEAR-1.9.2/PEAR/REST.php	2011-03-14 23:01:40.000000000 +0100
-@@ -102,7 +102,7 @@
-                 // reset the age of the cache if the server says it was unmodified
-                 $result = $this->saveCache($url, $ret, null, true, $cacheId);
-                 if (PEAR::isError($result)) {
--                    return PEAR::raiseErro($result->getMessage());
-+                    return PEAR::raiseError($result->getMessage());
-                 }
-             }
- 
-@@ -122,7 +122,7 @@
-         if ($forcestring) {
-             $result = $this->saveCache($url, $content, $lastmodified, false, $cacheId);
-             if (PEAR::isError($result)) {
--                return PEAR::raiseErro($result->getMessage());
-+                return PEAR::raiseError($result->getMessage());
-             }
- 
-             return $content;
-@@ -162,7 +162,7 @@
- 
-         $result = $this->saveCache($url, $content, $lastmodified, false, $cacheId);
-         if (PEAR::isError($result)) {
--            return PEAR::raiseErro($result->getMessage());
-+            return PEAR::raiseError($result->getMessage());
-         }
- 
-         return $content;
-@@ -228,59 +228,75 @@
-         $cacheidfile = $d . 'rest.cacheid';
-         $cachefile   = $d . 'rest.cachefile';
- 
-+        if (!is_dir($cache_dir)) {
-+            if (System::mkdir(array('-p', $cache_dir) === false)) {
-+              return PEAR::raiseError("The value of config option cache_dir ($cache_dir) is not a directory and attempts to create the directory failed.");
-+            }
-+        }
-+
-         if ($cacheid === null && $nochange) {
-             $cacheid = unserialize(implode('', file($cacheidfile)));
-         }
- 
--        if (is_link($cacheidfile)) {
--            return PEAR::raiseError('SECURITY ERROR: Will not write to ' . $cacheidfile . ' as it is symlinked to ' . readlink($cacheidfile) . ' - Possible symlink attack');
--        }
-+        $idData = serialize(array(
-+            'age'        => time(),
-+            'lastChange' => ($nochange ? $cacheid['lastChange'] : $lastmodified),
-+        ));
- 
--        if (is_link($cachefile)) {
--            return PEAR::raiseError('SECURITY ERROR: Will not write to ' . $cacheidfile . ' as it is symlinked to ' . readlink($cacheidfile) . ' - Possible symlink attack');
-+        $result = $this->saveCacheFile($cacheidfile, $idData);
-+        if (PEAR::isError($result)) {
-+            return $result;
-+        } elseif ($nochange) {
-+            return true;
-         }
- 
--        $cacheidfile_fp = @fopen($cacheidfile, 'wb');
--        if (!$cacheidfile_fp) {
--            if (is_dir($cache_dir)) {
--                return PEAR::raiseError("The value of config option cache_dir ($cache_dir) is not a directory. ");
-+        $result = $this->saveCacheFile($cachefile, serialize($contents));
-+        if (PEAR::isError($result)) {
-+            if (file_exists($cacheidfile)) {
-+              @unlink($cacheidfile);
-             }
- 
--            System::mkdir(array('-p', $cache_dir));
--            $cacheidfile_fp = @fopen($cacheidfile, 'wb');
--            if (!$cacheidfile_fp) {
--                return PEAR::raiseError("Could not open $cacheidfile for writing.");
--            }
-+            return $result;
-         }
- 
--        if ($nochange) {
--            fwrite($cacheidfile_fp, serialize(array(
--                'age'        => time(),
--                'lastChange' => $cacheid['lastChange'],
--                ))
--            );
--
--            fclose($cacheidfile_fp);
--            return true;
--        }
-+        return true;
-+    }
- 
--        fwrite($cacheidfile_fp, serialize(array(
--            'age'        => time(),
--            'lastChange' => $lastmodified,
--            ))
--        );
--        fclose($cacheidfile_fp);
-+    function saveCacheFile($file, $contents)
-+    {
-+        $len = strlen($contents);
- 
--        $cachefile_fp = @fopen($cachefile, 'wb');
--        if (!$cachefile_fp) {
--            if (file_exists($cacheidfile)) {
--                @unlink($cacheidfile);
-+        $cachefile_fp = @fopen($file, 'xb'); // x is the O_CREAT|O_EXCL mode
-+        if ($cachefile_fp !== false) { // create file
-+            if (fwrite($cachefile_fp, $contents, $len) < $len) {
-+                fclose($cachefile_fp);
-+                return PEAR::raiseError("Could not write $file.");
-+            }
-+        } else { // update file
-+            $cachefile_lstat = lstat($file);
-+            $cachefile_fp = @fopen($file, 'wb');
-+            if (!$cachefile_fp) {
-+                return PEAR::raiseError("Could not open $file for writing.");
-+            }
-+
-+            $cachefile_fstat = fstat($cachefile_fp);
-+            if (
-+              $cachefile_lstat['mode'] == $cachefile_fstat['mode'] &&
-+              $cachefile_lstat['ino']  == $cachefile_fstat['ino'] &&
-+              $cachefile_lstat['dev']  == $cachefile_fstat['dev'] &&
-+              $cachefile_fstat['nlink'] === 1
-+            ) {
-+                if (fwrite($cachefile_fp, $contents, $len) < $len) {
-+                    fclose($cachefile_fp);
-+                    return PEAR::raiseError("Could not write $file.");
-+                }
-+            } else {
-+                fclose($cachefile_fp);
-+                $link = function_exists('readlink') ? readlink($file) : $file;
-+                return PEAR::raiseError('SECURITY ERROR: Will not write to ' . $file . ' as it is symlinked to ' . $link . ' - Possible symlink attack');
-             }
--
--            return PEAR::raiseError("Could not open $cacheidfile for writing.");
-         }
- 
--        fwrite($cachefile_fp, serialize($contents));
-         fclose($cachefile_fp);
-         return true;
-     }
author	Ole Markus With <olemarkus@gentoo.org>	2011-09-07 11:24:20 +0000
committer	Ole Markus With <olemarkus@gentoo.org>	2011-09-07 11:24:20 +0000
commit	ff6e35dde236094f031af6f862f9b62ed53071d6 (patch)
tree	2e8fa2525fe6dc4139765b17e6bcb8cd879ac800 /dev-php/PEAR-PEAR
parent	Oops also add VERSION to docs. (diff)
download	historical-ff6e35dde236094f031af6f862f9b62ed53071d6.tar.gz historical-ff6e35dde236094f031af6f862f9b62ed53071d6.tar.bz2 historical-ff6e35dde236094f031af6f862f9b62ed53071d6.zip