dev-db/phpmyadmin: dev-db/phpmyadmin: Add releases 4.0.10.20 and 4.7.0 - fixes bug 614522 (PMASA-2017-8). Drop vulnerable versions, keeping latest stable.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

4 files changed, 2 insertions, 64 deletions

diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index f83a89f582b5..9e8a79201453 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,4 +1,3 @@
-DIST phpMyAdmin-4.0.10.19-all-languages.tar.xz 4762856 SHA256 221bfb2d3d001a44e6b19398d927ccf9f71470b3d139e111ffa1ffa62c76b232 SHA512 276c6d807366c461836c1ab70945f7793778a84ff176fcb2860b5aa45f4dd1a34f41c0e96afb491c626f9a8628903d4b181d9a2b7f89f983416dbb0563af6d35 WHIRLPOOL bf9ab4913d797aa1e6474228459472933c09a2b1040aa1475d3357158e5795cae0faccfaf34fd32b6b52dea27856add7a730d631c1ef2c755b09156e8dd58684
-DIST phpMyAdmin-4.6.5.1-all-languages.tar.xz 6162164 SHA256 e163b08b6d1137fd7c48ea97e8e53be415b1937f5e5f7e070936a60c3b9a3df0 SHA512 e6f90af32b77785ff49d9be4033e29e5b64df84d1a37dbe214df9049ef25ecfaee8e443aa9b789c408993541ea85c8e670b350071bd7f3437711462e164afad8 WHIRLPOOL 7e4f5d8e214192c33700b321343510f23f772c5c1a322749c2aded037be9b5743899fd67965743c5498615ae4cf73d0d2d5954ddd11c71b63724e2225ab3f200
+DIST phpMyAdmin-4.0.10.20-all-languages.tar.xz 4323896 SHA256 16595dd62c8256caa999beb722d793674da86054e117b9968f82352d84233b24 SHA512 e1d8b8a503eaa19a090d24d5ad011241aab06c2767138424d875edd82a868b4ebcdf5bba154b7eefef23b41d1949dcd021defe17e9047d0bf5fcfd0d6a5f4d27 WHIRLPOOL 80983dbeeca9cf1a279c35c652f4c5c0f239ba2aa9456a0707a1686b1f0322a949cd42fa8d949efce1d9e849ee3030c8487faccc79c1f65458ac73b205f119a6
 DIST phpMyAdmin-4.6.6-all-languages.tar.xz 6147904 SHA256 b7b9e0f88ca740fcba249e7e3e7d51d1923b038b7742cde72de193a2b0a2654f SHA512 7bd18b83f205604dc653ef2daffb22d0bf99a4e2a7960958fb1687daf2a800a76e34477748c6239394e99ab060e789971b73cf8e66adb3182f1b17002345c054 WHIRLPOOL a18f525b999c855d5dfb48371c40957460bb3a361445d856d05f7348d23cea1392a53f11e99b0199878616e33a529c602639f9ba212f866df89490b32f552f87
-DIST phpMyAdmin-4.7.0-beta1-all-languages.tar.xz 5678136 SHA256 afe5e42e2b60f0a9371e26946a84a02800f2107805bfd615f47aa82d015cc55d SHA512 49c4c1006580b56a379defcbd9ba140557511a06af0b86792ee32383db400bcc5e2050b14f40698735a9972a1ca197ab7678524d1c7ac0dc96d2649b5eb7bba4 WHIRLPOOL caa053dd7da1de834744d4d4b86bf817d4922b0c749ffbf557c1f18032065785af974072f3b575fa58c1ae35a02fb5eb9389ac8abc9e274102532a0c94fbf34d
+DIST phpMyAdmin-4.7.0-all-languages.tar.xz 7600296 SHA256 6378d1f45f5356fda2d18a923c56a495e03bc1e7694e7b7c004dd688d2178f90 SHA512 03f3b56d3fed846e8e27e38a1bf32175b267a3cc2784ee499b64a48b6a37f0352302a9c150e1db1c99f633aabd8a373a834ad7ab2b694146b0ac13dd05bd27e3 WHIRLPOOL b7c65a1e47ef0358057052ca9d5b0a4a40f17157ba8b711b6c54b3e3a244da50b23840f67def30c13fabd0b4be7b03785dbbd69a31fa27cece19f256acbf4af2
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.0.10.19.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.0.10.20.ebuild
index da8f443b26a9..da8f443b26a9 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.0.10.19.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.0.10.20.ebuild
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.6.5.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.6.5.1.ebuild
deleted file mode 100644
index 3422d6c70f46..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-4.6.5.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils webapp
-
-MY_PV=${PV/_/-}
-MY_PN="phpMyAdmin"
-MY_P="${MY_PN}-${MY_PV}-all-languages"
-
-DESCRIPTION="Web-based administration for MySQL database in PHP"
-HOMEPAGE="https://www.phpmyadmin.net/"
-SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="setup"
-
-RDEPEND="
-	dev-lang/php[crypt,ctype,filter,json,session,unicode]
-	|| (
-		dev-lang/php[mysqli]
-		dev-lang/php[mysql]
-	)
-	virtual/httpd-php:*
-"
-
-need_httpd_cgi
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc README RELEASE-DATE-${MY_PV} ChangeLog || die
-	rm -f LICENSE README* RELEASE-DATE-${MY_PV}
-
-	if ! use setup; then
-		rm -rf setup || die "Cannot remove setup utility"
-		elog "The phpMyAdmin setup utility has been removed."
-		elog "It is a regular target of various exploits. If you need it, set USE=setup."
-	else
-		elog "You should consider disabling the setup USE flag"
-		elog "to exclude the setup utility if you don't use it."
-		elog "It regularly is the target of various exploits."
-	fi
-
-	insinto "${MY_HTDOCSDIR#${EPREFIX}}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-	webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
-	webapp_src_install
-}
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.7.0_beta1.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.7.0.ebuild
index 80ad74d42a80..80ad74d42a80 100644
--- a/dev-db/phpmyadmin/phpmyadmin-4.7.0_beta1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-4.7.0.ebuild