Fix for PHP segfault, bug #152933.

(Portage version: 2.1.2_pre1)
 (Signed Manifest commit)

3 files changed, 25 insertions, 102 deletions

diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 64341a65bdca..46b19f623f54 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,3 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX common.lib.php.diff 272 RMD160 47977c97e73ed2d5a09e9951c7f814eb993a04ec SHA1 3358710b668b33e348d640be2837fbb7c0cfad29 SHA256 066b0241e466db73d1f9ca694e96b6bb23a56e3e4fa16d9b31bf4e5d3fd6b57a
+MD5 da50258f238da90ef88e4600b6068a55 files/common.lib.php.diff 272
+RMD160 47977c97e73ed2d5a09e9951c7f814eb993a04ec files/common.lib.php.diff 272
+SHA256 066b0241e466db73d1f9ca694e96b6bb23a56e3e4fa16d9b31bf4e5d3fd6b57a files/common.lib.php.diff 272
 AUX config.default.php-2.8.0.patch 5553 RMD160 60869c33523751098a98a067fee3482c2c26795a SHA1 329047d7eaaf3c24bc1deb86809361fe6eb35b7c SHA256 78ab8d8910101accd03f8820210feb49a997571e66156d86255dc8fafebf16ce
 MD5 9dc203a856638d41f9992d0e54f8c8f8 files/config.default.php-2.8.0.patch 5553
 RMD160 60869c33523751098a98a067fee3482c2c26795a files/config.default.php-2.8.0.patch 5553
@@ -14,27 +21,33 @@ AUX reconfig-2.8 329 RMD160 993162aa564ab7d37c7f32db439518c5cab9ace5 SHA1 0557bd
 MD5 cf0af0543cb29eb88163220df6f14669 files/reconfig-2.8 329
 RMD160 993162aa564ab7d37c7f32db439518c5cab9ace5 files/reconfig-2.8 329
 SHA256 526f7efb31adde131ffaff0271ea12693315c2d4e8a1f96ae4af6947815d6612 files/reconfig-2.8 329
-DIST phpMyAdmin-2.8.2.tar.bz2 2013981 RMD160 56bf381358333f806d738c42891370d3b74d5d6e SHA1 1af7caee3c90e64e456fcc226d68f3ed88581289 SHA256 d359cfb70ae14dcfe055f4eacca9fbe10d13d88c93407c1816d2229125e56b7d
 DIST phpMyAdmin-2.9.0.2.tar.bz2 2041197 RMD160 d344a2a5c84bcfe4b915d151e7bfb8a60d4e1712 SHA1 64a0f6bfdf1d4f0de1456d4b5d8f9dc9d76e6b63 SHA256 e8f9089a8e87191be751e989e4a3e11c2698865a5bcb8507e3361a58bbb4376a
-EBUILD phpmyadmin-2.8.2.ebuild 2550 RMD160 40aac346f531916d4e81dc5e202b6822fd2915ab SHA1 6c0e9d50253531395becaeb12a70947db509c843 SHA256 61d765e923cbb14a92c6570005592656ba460c18c16c9bd90fa566265a6b08dd
-MD5 a0b9dd019b1c976aa27c107d5fd3ff43 phpmyadmin-2.8.2.ebuild 2550
-RMD160 40aac346f531916d4e81dc5e202b6822fd2915ab phpmyadmin-2.8.2.ebuild 2550
-SHA256 61d765e923cbb14a92c6570005592656ba460c18c16c9bd90fa566265a6b08dd phpmyadmin-2.8.2.ebuild 2550
+EBUILD phpmyadmin-2.9.0.2-r1.ebuild 2643 RMD160 f49ac11eefe1d3f7ef3f8cc9141c24a18b43cc19 SHA1 6ad5e0d43b1e97c8d57785d535afe974932c9167 SHA256 bd7672ab13c5d31bffcaa8c1dadefabfb76853aac349a9dd536b8d4ee140b816
+MD5 206d21dbc1c8eedfeac7c50421c8cdf8 phpmyadmin-2.9.0.2-r1.ebuild 2643
+RMD160 f49ac11eefe1d3f7ef3f8cc9141c24a18b43cc19 phpmyadmin-2.9.0.2-r1.ebuild 2643
+SHA256 bd7672ab13c5d31bffcaa8c1dadefabfb76853aac349a9dd536b8d4ee140b816 phpmyadmin-2.9.0.2-r1.ebuild 2643
 EBUILD phpmyadmin-2.9.0.2.ebuild 2559 RMD160 6795da4805d2f19e97bc3a0f56d162a500934019 SHA1 873fbdb3cc9ae4ea205bfbc05aaab33c8279e2d5 SHA256 dd422a4b7109d6b3bd4402455d2d7185a8245dc730912bf3b8c1e14e83ca14a4
 MD5 b0ff5e14b63bf07fdb97da849d8e02f8 phpmyadmin-2.9.0.2.ebuild 2559
 RMD160 6795da4805d2f19e97bc3a0f56d162a500934019 phpmyadmin-2.9.0.2.ebuild 2559
 SHA256 dd422a4b7109d6b3bd4402455d2d7185a8245dc730912bf3b8c1e14e83ca14a4 phpmyadmin-2.9.0.2.ebuild 2559
-MISC ChangeLog 28821 RMD160 ed0e29acd56ae2dd93b490fec2ed06e9e6888beb SHA1 ca4ba8464b7db60c0f26bee7d5669bd62895340e SHA256 466f200c5194ed59ea45aec50462c80ace9e29b5f3f6ec01e67ac29c2a79ce08
-MD5 d332338262bfd2ad2d37340ddc5bb971 ChangeLog 28821
-RMD160 ed0e29acd56ae2dd93b490fec2ed06e9e6888beb ChangeLog 28821
-SHA256 466f200c5194ed59ea45aec50462c80ace9e29b5f3f6ec01e67ac29c2a79ce08 ChangeLog 28821
+MISC ChangeLog 29027 RMD160 d341aa4d0d89564c30ef798d32911e09d10e5c05 SHA1 95d0e3f2d010b90e4158dc754b09e73e3dd2611e SHA256 5ef53583fd4235a311040ca7ad8a8d37f6a315d7474c0d13fefaa48a18d8bddd
+MD5 8fd35da6f12f34523870034a05d2187a ChangeLog 29027
+RMD160 d341aa4d0d89564c30ef798d32911e09d10e5c05 ChangeLog 29027
+SHA256 5ef53583fd4235a311040ca7ad8a8d37f6a315d7474c0d13fefaa48a18d8bddd ChangeLog 29027
 MISC metadata.xml 162 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 SHA1 671b30dafbea01228c8bb606af451a0795922840 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0
 MD5 7b6e6cf3eaafa0480ab619fadfb37e2e metadata.xml 162
 RMD160 0b015f5ff17c4d8e7aee826d48b326cc19b1fed4 metadata.xml 162
 SHA256 84ff2fc6c9a4af1b9dbe32aa81ab84c2958bc1bd65a9977686df2dcab6e420d0 metadata.xml 162
-MD5 787a7a740a00675635448b770bcbc5d9 files/digest-phpmyadmin-2.8.2 256
-RMD160 0d1628619a79fc51fd12606bba983321ea938288 files/digest-phpmyadmin-2.8.2 256
-SHA256 23b7988ccb64df8bb408618c70956da0954dff8d87673e5db550ea799692b33d files/digest-phpmyadmin-2.8.2 256
 MD5 e18685b04b3ca2bcba6bd098a14ff02d files/digest-phpmyadmin-2.9.0.2 262
 RMD160 6e873b0cb5415a5400527ca22b3c4f4de188c01a files/digest-phpmyadmin-2.9.0.2 262
 SHA256 9f3d9858f0dcaf4f07f0e3816ca9be7b3919c72f9c3bbde3716062afb221f291 files/digest-phpmyadmin-2.9.0.2 262
+MD5 e18685b04b3ca2bcba6bd098a14ff02d files/digest-phpmyadmin-2.9.0.2-r1 262
+RMD160 6e873b0cb5415a5400527ca22b3c4f4de188c01a files/digest-phpmyadmin-2.9.0.2-r1 262
+SHA256 9f3d9858f0dcaf4f07f0e3816ca9be7b3919c72f9c3bbde3716062afb221f291 files/digest-phpmyadmin-2.9.0.2-r1 262
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFFQWKaEzitwsaoONoRAoZpAKCX86mcHLeTpBVha7vOVfqfq426JACeNGN5
+BJxbkOtPF49yI8QLoALAuX0=
+=R+Tl
+-----END PGP SIGNATURE-----
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.8.2 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.8.2
deleted file mode 100644
index ccf287c41492..000000000000
--- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.8.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c4a08948d9e461c917ae20f26976aa6e phpMyAdmin-2.8.2.tar.bz2 2013981
-RMD160 56bf381358333f806d738c42891370d3b74d5d6e phpMyAdmin-2.8.2.tar.bz2 2013981
-SHA256 d359cfb70ae14dcfe055f4eacca9fbe10d13d88c93407c1816d2229125e56b7d phpMyAdmin-2.8.2.tar.bz2 2013981
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.8.2.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.8.2.ebuild
deleted file mode 100644
index 707150bb9972..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-2.8.2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.8.2.ebuild,v 1.7 2006/07/10 16:16:33 tsunam Exp $
-
-inherit eutils webapp depend.php
-
-MY_PV=${PV/_/-}
-MY_P=phpMyAdmin-${MY_PV}
-DESCRIPTION="Web-based administration for MySQL database in PHP"
-HOMEPAGE="http://www.phpmyadmin.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 hppa ppc sparc x86 ~x86-fbsd"
-IUSE=""
-DEPEND=">=dev-db/mysql-3.23.32 <dev-db/mysql-5.1
-	sys-apps/findutils"
-S=${WORKDIR}/${MY_P}
-
-need_php
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	if ! PHPCHECKNODIE="yes" require_php_with_use pcre session unicode \
-		|| ! PHPCHECKNODIE="yes" require_php_with_any_use mysql mysqli ; then
-		eerror
-		eerror "${PHP_PKG} needs to be re-installed with all of the following"
-		eerror "USE flags enabled:"
-		eerror
-		eerror "pcre session unicode"
-		eerror
-		eerror "as well as any of the following USE flags enabled:"
-		eerror
-		eerror "mysql or mysqli if using dev-lang/php-5"
-		eerror "mysql if using dev-lang/php-4"
-		eerror
-		die "Re-install ${PHP_PKG}"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/config.default.php-2.8.0.patch
-
-	# Remove .cvs* files and CVS directories
-	find ${S} -name .cvs\* -or \( -type d -name CVS -prune \) | xargs rm -rf
-}
-
-src_compile() {
-	einfo "Setting random user/password details for the controluser"
-
-	local pmapass="${RANDOM}${RANDOM}${RANDOM}${RANDOM}"
-	sed -e "s/@pmapass@/${pmapass}/g" -i libraries/config.default.php
-	sed -e "s/@pmapass@/${pmapass}/g" \
-		${FILESDIR}/mysql-setup.sql.in-2.5.6 > ${T}/mysql-setup.sql
-}
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="CREDITS Documentation.txt INSTALL README RELEASE-DATE-${MY_PV} TODO ChangeLog"
-
-	# install the SQL scripts available to us
-	#
-	# unfortunately, we do not have scripts to upgrade from older versions
-	# these are things we need to add at a later date
-
-	webapp_sqlscript mysql ${T}/mysql-setup.sql
-
-	dodoc ${docs}
-	dohtml Documentation.html
-
-	# Copy the app's main files
-
-	einfo "Installing main files"
-	cp -r . ${D}${MY_HTDOCSDIR}
-
-	webapp_configfile ${MY_HTDOCSDIR}/libraries/config.default.php
-	webapp_serverowned ${MY_HTDOCSDIR}/libraries/config.default.php
-
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en-2.8.0.txt
-	webapp_hook_script ${FILESDIR}/reconfig-2.8
-	webapp_src_install
-	# bug #88831, make sure the create script is world-readable.
-	fperms 0600 ${MY_SQLSCRIPTSDIR}/mysql/${PVR}_create.sql
-}