commit: b8a2722b67204f0f5ea716d1d147a900aea43b0e
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo
<DOT> org>
AuthorDate: Fri Sep 18 18:41:41 2015 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Fri Sep 18 18:41:41 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8a2722b
Bump phpmyadmin to releases 4.4.13.3, 4.4.14.1 and 4.5.0_rc1 - fixes bug 560408
(CVE-2015-6830).
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT>
gentoo.org>
dev-db/phpmyadmin/Manifest | 5 +-
dev-db/phpmyadmin/phpmyadmin-4.3.13.1-r1.ebuild | 61 ----------------------
...in-4.4.14.ebuild => phpmyadmin-4.3.13.3.ebuild} | 0
...in-4.4.14.ebuild => phpmyadmin-4.4.14.1.ebuild} | 0
....0_beta1.ebuild => phpmyadmin-4.5.0_rc1.ebuild} | 0
5 files changed, 3 insertions(+), 63 deletions(-)
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 5f0e403..40eb949 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,6 +1,7 @@
DIST phpMyAdmin-4.0.10.10-all-languages.tar.xz 4775140 SHA256
5f4522227ad9ffce9193b1c25c2fc17f5b014b9da32137cc122f011dcd190b15 SHA512
3f4f06c574f941586d7e48fba45023a5d3126fe8ed29527ddf4de3401f0076c678342b9e493ed99290d5b748df90360c0e2f0612766a993f5f7147685ed144d5
WHIRLPOOL
bd0ba9cd5f3de88a33b8e8a87568b3f54d923a0d99bc1b75b772baf42b47e76e4059921300a9b03847f3c8f93c5bc4a1c651ca79d550af21f2fd74b1aa96fa9b
DIST phpMyAdmin-4.2.13.3-all-languages.tar.xz 5205440 SHA256
2d78bd91dc90d95d9f21c7e41294f2995a36dbbe1e4d1209e972b1d855c4877e SHA512
77ad296931666896613b7363c35c5546da66bddcda37fb31609ca5fb78f4b12241f6c976d1916a6491fbbc33d5f837163bcd0c0e0f227458d055076a971b640f
WHIRLPOOL
c4bb8f0689b0aa2ae7a67793f9c26b761e1a1e28e4e684f495815caf89ef527f4fced30aa53986c10d41ec000f3e295677739d5e73cbfc336466591c9fcf6a3e
DIST phpMyAdmin-4.3.13.1-all-languages.tar.xz 5446988 SHA256
d7484e2449453eae52613aae59e5f3a9342014aba7db88598ad6a90504ebfbd3 SHA512
b08a41721876a4c7c8fcc162f0f1f43bbd67b4f87fc1c0668672addb8eb6f56695755401a2de2c75fc944b074f5187c6df942bec0ff03c16ad34c27b505b87a0
WHIRLPOOL
a72b7e4247bb7de68820d5583967b04b8dfd0917383f88d707b48235d119e0ad4fd45a04352dda0f43b11b2ba4def5a4648eca01e2f7ceabd3f788e429dc83ca
-DIST phpMyAdmin-4.4.14-all-languages.zip 10049779 SHA256
4e57593e22a90cd31dbc1f0b03c4c5740dde50a113acb55ed817f7dbd558f348 SHA512
ec56210f106c0076b68ca4ec91288e5b020e02b22369667a65cd27a152696c78b6575bc110aec43f189079601b3c2b1dfae8b3ec2f66411ec46e0db997f4f892
WHIRLPOOL
6cb18df2c393fb9ed00c798277472bc7a080d1177749370b236fe34271b14bbe73a51d3f241cd74425f8d2081749244a91b07f0ac5512688ca899e34ffad88f7
+DIST phpMyAdmin-4.3.13.3-all-languages.zip 9538582 SHA256
d61045d48d2f4f4f8e5d2d6cc04d13d43f266bc945864de81e84459bbf5078cc SHA512
482733937971636869274bb0eccb94f3f9036a4d73cefa3f874d33a3aaf162da978680f56ce9a3f5bc35a1a103e00b6fcf159b62c973465910f76363a9e6ac04
WHIRLPOOL
0049b4798b8cc428161d5a2e525c4b38865afd5bef0df71f6b0fe32b826088d5f11c590b4da252e368b7da4a279187b984a5643b16f9edbba80882a0fa9c9f06
+DIST phpMyAdmin-4.4.14.1-all-languages.zip 10057503 SHA256
223fc8f7fd135ca5d6389724b77bd6926acc41f81e050a64712d5f9a0a88c6b1 SHA512
17302b90cc74f37d0e0c881cfa6821f2806040cc23b70c67dfb8d3ba237a387ce3665aa477b5d5aff0117d19200b73f64ce13490c28488ba21e68bbbebbe8731
WHIRLPOOL
36c84f38ecfc6ce669ad5cc151f46a81b1327c74a997fe948ff5abd45891e02ad9d714a49ae582cd34628074130da181593257a57be181ed43b0da65687d1c9e
DIST phpMyAdmin-4.4.6.1-all-languages.tar.xz 5635832 SHA256
d423a81868f01b4ce77f90113d83df96590446acdbe8f00a46aeb670c4a9ac5c SHA512
d25c63f9d354ae3f488d1837c710cfc5bacde3d6421d71eb96ff5868971132ea570aad9875f35d862d22d0318b5e16b208a2d6a7d542424ee2a04e329a619978
WHIRLPOOL
8c5f5e9349e801e328ddafe89322e457b89bfa4c5dbe593be9990ac3168a5d0cfada260ef275388b95f2c806952a682445baff23d6092dd5a66766681759172b
-DIST phpMyAdmin-4.5.0-beta1-all-languages.zip 10325210 SHA256
9f30442eada57d6bb183b437440e5b6e38b5c7304ae00ba1f0cf94d75e0cba4a SHA512
e851ad09d4cd89875b74f7fdc6d1c30ca9480f6e6de4b2529bd4126ad96bc47dfe1f0423b081cbf998d18d08c3995aa79fd930cccb366557bcf3b48cd52ad4c2
WHIRLPOOL
8f4e46440ea6bf75b831f6f2cad9df3c4fdb6d618149f1c31808db2607e385797cb5373c43bfa5504926bd4b89d60cc0d7d951620333c264f401bcc14e40b226
+DIST phpMyAdmin-4.5.0-rc1-all-languages.zip 10324767 SHA256
c78acebc2e35974cd030624aac9b71537d5228d3f2f0e0bf222f98b1f69a108d SHA512
7a34f43da0803b6812843c4ee57fa4304e51bc481097de8c66872fe03252fde6d35caf94afadf4c7f0dbe69dcdfe47a2046c1b10d66d349ec1843029c782e08b
WHIRLPOOL
cc364f011676b7c290b2a092f13726b1ba7cf0eccab67d562752d62ac30b0a57a49b153f9b8638b5d92c15681862149c04cac166d1a6802e8d47958946e51836
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.3.13.1-r1.ebuild
b/dev-db/phpmyadmin/phpmyadmin-4.3.13.1-r1.ebuild
deleted file mode 100644
index fdba1e2..0000000
--- a/dev-db/phpmyadmin/phpmyadmin-4.3.13.1-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils webapp
-
-MY_PV=${PV/_/-}
-MY_P="phpMyAdmin-${MY_PV}-all-languages"
-
-DESCRIPTION="Web-based administration for MySQL database in PHP"
-HOMEPAGE="http://www.phpmyadmin.net/";
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~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.4.14.ebuild
b/dev-db/phpmyadmin/phpmyadmin-4.3.13.3.ebuild
similarity index 100%
copy from dev-db/phpmyadmin/phpmyadmin-4.4.14.ebuild
copy to dev-db/phpmyadmin/phpmyadmin-4.3.13.3.ebuild
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.4.14.ebuild
b/dev-db/phpmyadmin/phpmyadmin-4.4.14.1.ebuild
similarity index 100%
rename from dev-db/phpmyadmin/phpmyadmin-4.4.14.ebuild
rename to dev-db/phpmyadmin/phpmyadmin-4.4.14.1.ebuild
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.5.0_beta1.ebuild
b/dev-db/phpmyadmin/phpmyadmin-4.5.0_rc1.ebuild
similarity index 100%
rename from dev-db/phpmyadmin/phpmyadmin-4.5.0_beta1.ebuild
rename to dev-db/phpmyadmin/phpmyadmin-4.5.0_rc1.ebuild
