From 1d57b270d9f4a6786ca14bcd9673b36e065adfa7 Mon Sep 17 00:00:00 2001
From: Steve Dibb <beandog@gentoo.org>
Date: Tue, 23 Jan 2007 10:22:11 +0000
Subject: [PATCH] amd64 stable, security bug 161460 Package-Manager:
 portage-2.1.1-r2

---
 dev-db/phpmyadmin/ChangeLog                   |  5 +++-
 dev-db/phpmyadmin/Manifest                    | 26 ++++++-------------
 dev-db/phpmyadmin/phpmyadmin-2.9.2_rc1.ebuild |  4 +--
 3 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 780620bad22b..2abb70698b37 100644
--- 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.238 2007/01/22 00:09:33 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.239 2007/01/23 10:22:11 beandog Exp $
+
+  23 Jan 2007; Steve Dibb <beandog@gentoo.org> phpmyadmin-2.9.2_rc1.ebuild:
+  amd64 stable, security bug 161460
 
 *phpmyadmin-2.9.2 (22 Jan 2007)
 
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index a938dda9b954..796b76f165fc 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,6 +1,3 @@
------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
@@ -36,14 +33,14 @@ EBUILD phpmyadmin-2.9.2.ebuild 2623 RMD160 4f1b2f5883c4014af15458706afbb68fbcec6
 MD5 9d0b43efe820ceae5c6466b58f21f04c phpmyadmin-2.9.2.ebuild 2623
 RMD160 4f1b2f5883c4014af15458706afbb68fbcec64df phpmyadmin-2.9.2.ebuild 2623
 SHA256 d09bdefe5a35ebdb33eb9ddbeed8a08fd467ae40a1fe722661be51b5773d2445 phpmyadmin-2.9.2.ebuild 2623
-EBUILD phpmyadmin-2.9.2_rc1.ebuild 2620 RMD160 dc1409e678b3fecc418b02809d3885b87501c497 SHA1 4cae82c801d24be4f1c5352c638848fe01786785 SHA256 de5d60645b5595b600719400c239496213bd7b6add6983c65fc508586f476dbd
-MD5 8d3acd102347595bd48635da44251f58 phpmyadmin-2.9.2_rc1.ebuild 2620
-RMD160 dc1409e678b3fecc418b02809d3885b87501c497 phpmyadmin-2.9.2_rc1.ebuild 2620
-SHA256 de5d60645b5595b600719400c239496213bd7b6add6983c65fc508586f476dbd phpmyadmin-2.9.2_rc1.ebuild 2620
-MISC ChangeLog 32550 RMD160 7ee6ca4a718826168db7e375f2a0b9098cce8a1d SHA1 bf239e7e74363edb3d03fe85d4a23104d03aebba SHA256 5f656bf5218b15ca3e6cbd7ed012759862ed1af17367d09e98e9923d1abafe96
-MD5 105f4a9f74e3a80cae912431cc1ef97f ChangeLog 32550
-RMD160 7ee6ca4a718826168db7e375f2a0b9098cce8a1d ChangeLog 32550
-SHA256 5f656bf5218b15ca3e6cbd7ed012759862ed1af17367d09e98e9923d1abafe96 ChangeLog 32550
+EBUILD phpmyadmin-2.9.2_rc1.ebuild 2623 RMD160 29c730c13ed82024bbb3d7c8204a945294480024 SHA1 a96c9a2414f534ce387c6881bd1b5fb4d6fbca8a SHA256 cd68fb36a8937bc44cb8675f2a96f710163be62d6cc49edb445679f48125c59a
+MD5 34ba2a88ea7880b0f9d010fedfa46484 phpmyadmin-2.9.2_rc1.ebuild 2623
+RMD160 29c730c13ed82024bbb3d7c8204a945294480024 phpmyadmin-2.9.2_rc1.ebuild 2623
+SHA256 cd68fb36a8937bc44cb8675f2a96f710163be62d6cc49edb445679f48125c59a phpmyadmin-2.9.2_rc1.ebuild 2623
+MISC ChangeLog 32666 RMD160 ca4b31828f5df8ef3bfcd75d3daf53df41490185 SHA1 333e21ec2d6d978d83c6e0eb479d3c3c2a47c371 SHA256 aecb6f65fe2831d292e62aa1d09f59e193ac66764e5c3d1be576be0dc90e42a0
+MD5 c94090e74cbd59bc4c1efb2297224351 ChangeLog 32666
+RMD160 ca4b31828f5df8ef3bfcd75d3daf53df41490185 ChangeLog 32666
+SHA256 aecb6f65fe2831d292e62aa1d09f59e193ac66764e5c3d1be576be0dc90e42a0 ChangeLog 32666
 MISC metadata.xml 182 RMD160 9b377947041edce61a201266f0c982e3b7c91d8d SHA1 a6d1f4b69883a0940325b7b4ad1de261c7b8c485 SHA256 cf12fb82ad3a864f109328701bfc9b17657184fdb51c04b4af301b3322def6c1
 MD5 4bfbfdac057f18787bab530fdaf64fdf metadata.xml 182
 RMD160 9b377947041edce61a201266f0c982e3b7c91d8d metadata.xml 182
@@ -57,10 +54,3 @@ SHA256 4c926a2915d3ef2b25754715d080a6fe22bf28f99827a6c0c59952619bb9972e 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.5 (GNU/Linux)
-
-iD8DBQFFtADGEzitwsaoONoRAulOAJ9Eaiaj0rzcCGxQnDLDOA/YR2DEFQCfVqOJ
-73T12P9xO5L8ZC/bcMm+hUQ=
-=lTju
------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 317f159468e4..76308a3a66a2 100644
--- 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.7 2007/01/16 05:03:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.9.2_rc1.ebuild,v 1.8 2007/01/23 10:22:11 beandog 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}
-- 
2.26.2