Stable on x86, security bug #161460.

Package-Manager: portage-2.1.2_rc4-r8

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index fe6cfe02c885edf2b1b03ff8caee47c02319d723..43b958ba48948f627c49435a9f1b6d8e87a49e19 100644 (file)
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-db/phpmyadmin
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.232 2007/01/15 07:45:49 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.233 2007/01/15 15:33:54 ticho Exp $
+
+  15 Jan 2007; Andrej Kacian <ticho@gentoo.org> phpmyadmin-2.9.2_rc1.ebuild:
+  Stable on x86, security bug #161460.
 
   15 Jan 2007; Markus Rothe <corsair@gentoo.org>
   phpmyadmin-2.9.2_rc1.ebuild:

diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 8b28603456fa1c71498c1dced6216c8d8e9bb088..2e35e5e43a84996cc316288fc51c126fad27e8e0 100644 (file)
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,3 +1,6 @@
+-----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
@@ -28,14 +31,14 @@ EBUILD phpmyadmin-2.9.1.1.ebuild 2619 RMD160 b25e4aa08897cc309855f96f2d442b434ca
 MD5 2fa9a492f4be08eedb5b56c229b27de4 phpmyadmin-2.9.1.1.ebuild 2619
 RMD160 b25e4aa08897cc309855f96f2d442b434ca0b7b2 phpmyadmin-2.9.1.1.ebuild 2619
 SHA256 2e4c429b4780acd323e2805b3b2a35e9b63293ca648a79dfc9f7a99cc8c0b4ef phpmyadmin-2.9.1.1.ebuild 2619
-EBUILD phpmyadmin-2.9.2_rc1.ebuild 2629 RMD160 cba6d64c5d303a6e40a429e0e1f2104e40fc781b SHA1 2aea3fd8a2fd2990b5fddc2ebcbd27f2122b12c7 SHA256 a0cecbe13204d1e643944ff057dfb18c5222b569a81c44513bed44272c5b7cab
-MD5 3e998ac805cf655a37289b4fc7c27974 phpmyadmin-2.9.2_rc1.ebuild 2629
-RMD160 cba6d64c5d303a6e40a429e0e1f2104e40fc781b phpmyadmin-2.9.2_rc1.ebuild 2629
-SHA256 a0cecbe13204d1e643944ff057dfb18c5222b569a81c44513bed44272c5b7cab phpmyadmin-2.9.2_rc1.ebuild 2629
-MISC ChangeLog 31843 RMD160 72c9d9d04e478e7b349bbaa3affc04e3e5f90682 SHA1 1eb9f33f960ba81e8802ecc54eb1e5c52fc4dc77 SHA256 cd694023d38f2d02092579833631adafa95954de5869eaa3b3e8ca4193e22f3a
-MD5 f8da7ce834d863f2c2148becead3c4b2 ChangeLog 31843
-RMD160 72c9d9d04e478e7b349bbaa3affc04e3e5f90682 ChangeLog 31843
-SHA256 cd694023d38f2d02092579833631adafa95954de5869eaa3b3e8ca4193e22f3a ChangeLog 31843
+EBUILD phpmyadmin-2.9.2_rc1.ebuild 2626 RMD160 e0277f49af08dae1b830eaeba399be6d93157775 SHA1 c85f802f811a6e5ba190f6cb6df63aab47b9b542 SHA256 b454988a4ef4fb7af1b1ffe1fe4acc50948411bb974003b5a9a5b7ebac2b3ff5
+MD5 aead1f9d01049f3cbf44bb895a81aca8 phpmyadmin-2.9.2_rc1.ebuild 2626
+RMD160 e0277f49af08dae1b830eaeba399be6d93157775 phpmyadmin-2.9.2_rc1.ebuild 2626
+SHA256 b454988a4ef4fb7af1b1ffe1fe4acc50948411bb974003b5a9a5b7ebac2b3ff5 phpmyadmin-2.9.2_rc1.ebuild 2626
+MISC ChangeLog 31958 RMD160 318c86472839b8e9212b34202d09eead5e2d5249 SHA1 5c4881102d0544b04c363841001225ba7c200ea7 SHA256 9cda350839f51469c7dc2b8d729fae99d420eaea130c2d401bf996893f1fb14b
+MD5 189d992330a6470a6136006f13a85e22 ChangeLog 31958
+RMD160 318c86472839b8e9212b34202d09eead5e2d5249 ChangeLog 31958
+SHA256 9cda350839f51469c7dc2b8d729fae99d420eaea130c2d401bf996893f1fb14b ChangeLog 31958
 MISC metadata.xml 182 RMD160 9b377947041edce61a201266f0c982e3b7c91d8d SHA1 a6d1f4b69883a0940325b7b4ad1de261c7b8c485 SHA256 cf12fb82ad3a864f109328701bfc9b17657184fdb51c04b4af301b3322def6c1
 MD5 4bfbfdac057f18787bab530fdaf64fdf metadata.xml 182
 RMD160 9b377947041edce61a201266f0c982e3b7c91d8d metadata.xml 182
@@ -46,3 +49,10 @@ SHA256 439b479648f77327d77f2e01224bdaf5a9d280dd23beb5a12b46b3c6319334f1 files/di
 MD5 9f43e978247073c7e88b034c1c29caf0 files/digest-phpmyadmin-2.9.2_rc1 343
 RMD160 8adf920c095f0b1bb8e678e081ca057cc59d7de5 files/digest-phpmyadmin-2.9.2_rc1 343
 SHA256 8ea1ccd705a491d9e2290b09f54864fa97169f62531a426a789296d8c85efd1f files/digest-phpmyadmin-2.9.2_rc1 343
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFFq57vQlM6RnzZP+IRAodnAJ9y+9AXyhKCjFSmLrtTtR8woTTOgwCfdHKw
+M7dVXyXae4eF4HACNgSrx6A=
+=hhGh
+-----END PGP SIGNATURE-----

diff --git a/dev-db/phpmyadmin/phpmyadmin-2.9.2_rc1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.9.2_rc1.ebuild
index 838b67d7ae5df5b8f29b614e89800e79bff75292..e1dc8bbcef0efad514c441abeeab0005dfc33e35 100644 (file)
--- a/dev-db/phpmyadmin/phpmyadmin-2.9.2_rc1.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-2.9.2_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.9.2_rc1.ebuild,v 1.2 2007/01/15 07:45:49 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.9.2_rc1.ebuild,v 1.3 2007/01/15 15:33:54 ticho Exp $
 
 inherit eutils webapp depend.php
 
@@ -10,7 +10,7 @@ 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 ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE=""
 DEPEND="sys-apps/findutils"
 S=${WORKDIR}/${MY_P}