commit: 4b6e129beac8a2cfe917da2b0c1d3eab8a2a760f
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo
<DOT> org>
AuthorDate: Sat Mar 14 13:25:36 2015 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sat Mar 14 13:25:36 2015 +0000
URL: https://gitweb.gentoo.org/dev/jmbsvicetto.git/commit/?id=4b6e129b
Bump phpmyadmin to the latest releases and add 4.4.0_beta1.
Address CVE-2014-{9218,9219} - fixes bug 531684.
Address PMASA-2015-1 - fixes bug 542218.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT>
gentoo.org>
dev-db/phpmyadmin/Manifest | 8 +--
dev-db/phpmyadmin/phpmyadmin-4.0.10.8.ebuild | 61 ----------------------
...in-4.3.10.ebuild => phpmyadmin-4.0.10.9.ebuild} | 0
...-4.2.13.1.ebuild => phpmyadmin-4.2.13.2.ebuild} | 0
...in-4.3.10.ebuild => phpmyadmin-4.3.11.1.ebuild} | 0
...4.3.10.ebuild => phpmyadmin-4.4.0_beta1.ebuild} | 0
6 files changed, 4 insertions(+), 65 deletions(-)
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 76fdbf6..22f8ebe 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,5 +1,5 @@
-DIST phpMyAdmin-4.0.10.8-all-languages.tar.xz 4776844 SHA256
50b4038d6b3335291fc1204cc3959db30afd69165db327b8c3eaeb5b38ef817d SHA512
98d5c843154e0c926678ab8ed9f40bede84a14dc477fee36936c20811a4e270952f756400701c407f9535c05b7fac2272eebe3a43d8e8dbcf989eb6940b4b493
WHIRLPOOL
3b8e06fa7cc16dd57cf9912ccc9e6122afe11150eb8ce983bb83f471df4b63f3af58074a026989af38465a45a1160088155fdda56e9e3b93008d2e0b47d9fb12
+DIST phpMyAdmin-4.0.10.9-all-languages.tar.xz 4776232 SHA256
ca8399711dcd613f3e13de706ced326885001a0891b31dc9677dd3a23cc78258 SHA512
fbc973b2719162c2aa8a7c88d395d513c2425259a3b69ecbdfc08f954c6dc25146fae41e4d67c57815782e3cf36580ef50ed870ee245463f59948f9062882b2a
WHIRLPOOL
6dc1c230f3ed95ee828909d6b96fadcca25c19ea90fcdc38359d7ddd8ee8acf1724e9f4fd592ef60a6a41498badc1ec3ab983a36ca9f41f4e4e4efbed59952d0
DIST phpMyAdmin-4.1.14.8-all-languages.tar.xz 4881004 SHA256
e2a2fee1658e3108048907a257b8f291fcfbd5840690e8f4711f9ea28233dce8 SHA512
34d28f04d6a808565ecc3d7187b2719d1e25e55d6248e3ea516e5914bd5a70aab0d9c4df3525cb8e77b37949a78671235af46e22871fe26ba999aa01b01c44d2
WHIRLPOOL
a2e236a47154117c1bee3b9a51d4c3da9d1bd5834e3167174cbd80e562b5c14424b7e75de814f85d1ade1f6501b665a2af21cedd1c87be2ea6a9e151c0d8a2cf
-DIST phpMyAdmin-4.2.13.1-all-languages.tar.xz 5205324 SHA256
bc179dd35f6aa6d01b573f1e11b594d357fb2c09405b7fec06de5059adbec7c4 SHA512
121e6f063d7f4c4e8eaf048c9f68aaff713206ae077090fed671328f3fbd6f7d723309719c38e3a800c149630c1e2038b3f002bff7b48337278925cecf178b58
WHIRLPOOL
0bf85889e37f68907e8565a41d2e9ba804d41f8ad223a6d650117a93bd0900de242bed318a3cb467556b17eb2618d46571908090165cab666a2782a6f7465b3c
-DIST phpMyAdmin-4.3.10-all-languages.tar.xz 5443264 SHA256
9485bc83366ff0f556005941d74b5f93499937e213e8bfcef3e20368eeeedcbb SHA512
4524ed3bde2b5df870e3e7fb452e1ca6a28360ba1346752d54c8bbe1d6cc412d42352147da67a00ef198ea1f1ad5c8324ec8f6ddcb17dc167e89792191140762
WHIRLPOOL
06c40a7ae38c714dfbb25deadb434dcfe6257c97038153ae3ef7abfd56bc97a701c80b0948b6053ed7f7c177b08d14af8482ccb0c2cddb5d317859c717e5b755
-DIST phpMyAdmin-4.3.8-all-languages.tar.xz 5364656 SHA256
6d3a41382d878f59a959ceb25a671c8ed3a4ac9d0dc54e8de567c3ba264460e7 SHA512
e1ebb87a93e8557524b491be332f45af406de34a44f585692828276f5bfa6e65567f0747e466dbfbcc728715ab3702032b5172bc0cb48a8e2cb4bfedf632d177
WHIRLPOOL
130c00e3ca1145846ce5ef1eb2fb50dca216a7d12ecc7a6130afaa41aeaaba3dac8583989682ca223631e1e3779e4eeade1a876807b915bdbc09f3e5dd09593c
+DIST phpMyAdmin-4.2.13.2-all-languages.tar.xz 5204448 SHA256
3a8262fe392337d1963e8bc4364e280ced8ecace32c94cae0a4394cbf19256ee SHA512
944a324269b28290e57d15d7ed247594ab62c7117c763069ee4739c4bde2b09dbc59297745459dde4ec083771318ccb1f462eb828bdca31451fa13c5e9e2f6bd
WHIRLPOOL
bdeced7f9ff774be06c68c2b0dfd461133012530795b1530155f67d36a6ad6b9e9da418ce842ed1b79e900cf19fe0659547b0cd4c2ffd696e9f96b69d9b8eefb
+DIST phpMyAdmin-4.3.11.1-all-languages.tar.xz 5446076 SHA256
6c4dd0fcf331d53668824a6b857745a5c3774c2bbd483ba453c37488417d16d5 SHA512
a924f5b9200ea05c82ddd0fefbff7200f707324267c27065ed7f3afa358c2998ecf108761b4c9be8e69955fe54887d5e526a921b864b77dbb6b6b3deb8775c36
WHIRLPOOL
6d0df5f38585e9e3c6440e1020e6a781e93d4830b8cad6b7ba42a97c46dfb8dfc5d41f1e2d1c2e67bdb8e8e240acddb6813db8f0d119922f5b55fcbfda4feff5
+DIST phpMyAdmin-4.4.0-beta1-all-languages.tar.xz 5665800 SHA256
7d3379b377618850d358e6d2760c71f48616068fd7b454662866fa8f8ce90854 SHA512
8d77b437122da5f2315628d442eae9eacacab0c03f85a15026f991d09d7c5f0a5e8148414f77353a2f4b55a913eb4828e3c1781e84cf7a346791d7d5af21d15c
WHIRLPOOL
89f6dc1b7fa64a33fa09b2a7cf0bf9510f5eee65f74e08f6920bdd64ae968d4182704f712a9d193c5ba301480c9b4ef29003d4d5b0a6c1e8c3945c730932b3b5
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.0.10.8.ebuild
b/dev-db/phpmyadmin/phpmyadmin-4.0.10.8.ebuild
deleted file mode 100644
index 0ae36c8..0000000
--- a/dev-db/phpmyadmin/phpmyadmin-4.0.10.8.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-
-inherit eutils webapp depend.php
-
-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]
- )
-"
-
-need_httpd_cgi
-need_php_httpd
-
-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.3.10.ebuild
b/dev-db/phpmyadmin/phpmyadmin-4.0.10.9.ebuild
similarity index 100%
copy from dev-db/phpmyadmin/phpmyadmin-4.3.10.ebuild
copy to dev-db/phpmyadmin/phpmyadmin-4.0.10.9.ebuild
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.2.13.1.ebuild
b/dev-db/phpmyadmin/phpmyadmin-4.2.13.2.ebuild
similarity index 100%
rename from dev-db/phpmyadmin/phpmyadmin-4.2.13.1.ebuild
rename to dev-db/phpmyadmin/phpmyadmin-4.2.13.2.ebuild
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.3.10.ebuild
b/dev-db/phpmyadmin/phpmyadmin-4.3.11.1.ebuild
similarity index 100%
copy from dev-db/phpmyadmin/phpmyadmin-4.3.10.ebuild
copy to dev-db/phpmyadmin/phpmyadmin-4.3.11.1.ebuild
diff --git a/dev-db/phpmyadmin/phpmyadmin-4.3.10.ebuild
b/dev-db/phpmyadmin/phpmyadmin-4.4.0_beta1.ebuild
similarity index 100%
rename from dev-db/phpmyadmin/phpmyadmin-4.3.10.ebuild
rename to dev-db/phpmyadmin/phpmyadmin-4.4.0_beta1.ebuild
