Drop old version; version bump, bug #88831.

Package-Manager: portage-2.0.51.19

6 files changed, 27 insertions, 18 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index cdd57cd9dec4..994924d82142 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/phpmyadmin
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.102 2005/04/19 17:31:04 beu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.103 2005/04/25 11:00:38 beu Exp $
+
+*phpmyadmin-2.6.2-r1 (25 Apr 2005)
+
+  25 Apr 2005; Elfyn McBratney <beu@gentoo.org>
+  -phpmyadmin-2.6.1_p2-r1.ebuild, phpmyadmin-2.6.2.ebuild,
+  +phpmyadmin-2.6.2-r1.ebuild:
+  Drop old version and version bump (make sure the 'mysql create' script is not
+  world readable - it contains the initial pma@localhost password), bug #88831.
 
 *phpmyadmin-2.6.2 (19 Apr 2005)
 
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 1f3b1ada3cfe..c02bdb7b4a73 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA1
 
 MD5 7b6e6cf3eaafa0480ab619fadfb37e2e metadata.xml 162
-MD5 201fa4e310cd8fdd78d7ea50dc1bea21 ChangeLog 14404
-MD5 be80e52ff2f5bf4da91c8eb07716f050 phpmyadmin-2.6.1_p2-r1.ebuild 2475
+MD5 4a500aab8e6feff16352060fc571da2a ChangeLog 14739
 MD5 0101bf56e2017374f01c58dec71fca8f phpmyadmin-2.6.2_rc1.ebuild 2390
-MD5 97d0f97cb1482b8d601369ae93f77cca phpmyadmin-2.6.2.ebuild 2345
+MD5 6fa2bdf68166b9a6bf596e4ab4f4117a phpmyadmin-2.6.2.ebuild 2466
+MD5 9c487534f9e31310d62328e078988af3 phpmyadmin-2.6.2-r1.ebuild 2469
 MD5 182411f504d40f317a802da58ec5e176 files/digest-phpmyadmin-2.6.2 70
 MD5 c6a79ab6f3c9e6d657a5bee36b1f6565 files/phpmyadmin-config.patch 4857
 MD5 1a6c1907f5c2327b00453d7675c13178 files/mysql-setup.sql.in-2.5.6 3231
 MD5 f7405589420f250cead2a0d7d3855164 files/postinstall-en.txt 458
 MD5 85a86432c3f64acb068a7d2cfab311a9 files/config.inc.php-2.5.6.patch 5525
 MD5 278c189dfbc22e4f95fcb1f2c8a7622a files/digest-phpmyadmin-2.6.2_rc1 74
+MD5 182411f504d40f317a802da58ec5e176 files/digest-phpmyadmin-2.6.2-r1 70
 MD5 4c95d31af8becb428be471fcedf664a4 files/2.6.1_p2-no-wildcard-privs-for-you.patch 3731
-MD5 22a63a92c01eef5a268311e15594367b files/digest-phpmyadmin-2.6.1_p2-r1 74
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCZUB+jUHll2nfF60RAiqYAJ9hkhE7x4wO9By16gW4q0bJn2LTuwCff9Nq
-UoTKNAAK/xcNEoxt4kbU3Vw=
-=TaHM
+iD8DBQFCbM35jUHll2nfF60RAsk/AJ0TIASUHH6I1o/jC5ZkSTSVKgt6jQCfXRWv
+ga+R5ygYhM/XhnBjeb42FzU=
+=CJ/e
 -----END PGP SIGNATURE-----
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.1_p2-r1 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.1_p2-r1
deleted file mode 100644
index f8fec6e3ca1a..000000000000
--- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.1_p2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 787feeebe16ef7ab43e75e4046550da2 phpMyAdmin-2.6.1-pl2.tar.bz2 1541665
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.2-r1 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.2-r1
new file mode 100644
index 000000000000..148c15bd4d2d
--- /dev/null
+++ b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.2-r1
@@ -0,0 +1 @@
+MD5 7fc8cf4e7f9a84d725b159176e0621e1 phpMyAdmin-2.6.2.tar.bz2 1645396
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.6.1_p2-r1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.6.2-r1.ebuild
index 357812aa0aa9..9e1d11125351 100644
--- a/dev-db/phpmyadmin/phpmyadmin-2.6.1_p2-r1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-2.6.2-r1.ebuild
@@ -1,17 +1,15 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.6.1_p2-r1.ebuild,v 1.8 2005/03/29 14:57:06 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.6.2-r1.ebuild,v 1.1 2005/04/25 11:00:38 beu Exp $
 
 inherit eutils webapp
 
-MY_PV=${PV/_p/-pl}
-MY_PV=${MY_PV/_rc/-rc}
-MY_P=phpMyAdmin-${MY_PV}
+MY_P=phpMyAdmin-${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 ppc hppa sparc x86 amd64 ~mips"
+KEYWORDS="~alpha ~ppc ~hppa ~sparc ~x86 ~amd64 ~mips"
 IUSE=""
 DEPEND=">=dev-db/mysql-3.23.32 <dev-db/mysql-5.1
 	virtual/httpd-php
@@ -24,9 +22,6 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/config.inc.php-2.5.6.patch
 
-	# security bug #83792
-	epatch ${FILESDIR}/${PV}-no-wildcard-privs-for-you.patch
-
 	# Remove .cvs* files and CVS directories
 	find ${S} -name .cvs\* -or \( -type d -name CVS -prune \) | xargs rm -rf
 
@@ -88,4 +83,7 @@ src_install() {
 	# now we let the eclass strut its stuff ;-)
 
 	webapp_src_install
+
+	# bug #88831, make sure the create script it's word-readable.
+	fperms 0600 ${MY_SQLSCRIPTSDIR}/mysql/${PVR}_create.sql
 }
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.6.2.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.6.2.ebuild
index eb7e1609a369..7f1b8689421d 100644
--- a/dev-db/phpmyadmin/phpmyadmin-2.6.2.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-2.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.6.2.ebuild,v 1.1 2005/04/19 17:31:04 beu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.6.2.ebuild,v 1.2 2005/04/25 11:00:38 beu Exp $
 
 inherit eutils webapp
 
@@ -83,4 +83,7 @@ src_install() {
 	# now we let the eclass strut its stuff ;-)
 
 	webapp_src_install
+
+	# bug #88831, make sure the create script it's word-readable.
+	fperms 0600 ${MY_SQLSCRIPTSDIR}/mysql/${PVR}_create.sql
 }