From: Tom William Payne <twp@gentoo.org>
Date: Wed, 13 Oct 2004 23:17:04 +0000 (+0000)
Subject: Version bump (security fix). Bug # 67409.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7b0ba014b8fc209391f2774014be3ad5b7584e5d;p=gentoo.git

Version bump (security fix). Bug # 67409.
---

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 900a2a085285..fefa20887552 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/phpmyadmin
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.57 2004/09/28 09:38:53 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.58 2004/10/13 23:17:04 twp Exp $
+
+*phpmyadmin-2.6.0_p2 (14 Oct 2004)
+
+  14 Oct 2004; Tom Payne <twp@gentoo.org> -phpmyadmin-2.6.0.ebuild,
+  +phpmyadmin-2.6.0_p2.ebuild:
+  Version bump (security fix). Bug # 67409.
 
 *phpmyadmin-2.6.0 (28 Sep 2004)
 
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 3498d61580fb..829cb984dbec 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,13 +1,13 @@
 MD5 d8dfd9b32aba26018bd1a78afad49541 phpmyadmin-2.5.7.ebuild 2577
-MD5 c668ee10ce1db99d31b56c2161932713 phpmyadmin-2.6.0.ebuild 2566
 MD5 12b248930666709caa74239d6d57032e phpmyadmin-2.5.7_p1.ebuild 2579
 MD5 319be547b5537b1cbcd3bdd509f6e26d phpmyadmin-2.5.6.ebuild 2953
-MD5 b93a3eaeb6e32833f4a3aaf7a767af52 ChangeLog 8668
+MD5 14a9d060aff28f4eff0cfdf2e72ff1f3 ChangeLog 8848
 MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
+MD5 7296dbcabdd9305dffed71aac471d051 phpmyadmin-2.6.0_p2.ebuild 2569
 MD5 71b5699d1654d0d17ffa926729ae202a phpmyadmin-2.5.6-r1.ebuild 2580
+MD5 a424f37ca165d4c8e3c7c0c4295902d8 files/digest-phpmyadmin-2.6.0_p2 74
 MD5 5367bc809b77e6374f18d126990fba75 files/digest-phpmyadmin-2.5.6 70
 MD5 09deb77d7dc18f657af1dc07afa81072 files/digest-phpmyadmin-2.5.7 70
-MD5 fc0d45fdd44daf421e1c3a70c08706c8 files/digest-phpmyadmin-2.6.0 70
 MD5 56dcb2efb84915a521c18a004f96d37c files/postinstall-en.txt 506
 MD5 85a86432c3f64acb068a7d2cfab311a9 files/config.inc.php-2.5.6.patch 5525
 MD5 c6a79ab6f3c9e6d657a5bee36b1f6565 files/phpmyadmin-config.patch 4857
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.0 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.0
deleted file mode 100644
index f7682a460fa1..000000000000
--- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7d8dc68a88aca0c5f36c5d8996bb563f phpMyAdmin-2.6.0.tar.bz2 1277016
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.0_p2 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.0_p2
new file mode 100644
index 000000000000..a2f75ceebd70
--- /dev/null
+++ b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.6.0_p2
@@ -0,0 +1 @@
+MD5 f9000262ce736ec21369e1be1522ea0d phpMyAdmin-2.6.0-pl2.tar.bz2 1278267
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.6.0.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.6.0_p2.ebuild
similarity index 97%
rename from dev-db/phpmyadmin/phpmyadmin-2.6.0.ebuild
rename to dev-db/phpmyadmin/phpmyadmin-2.6.0_p2.ebuild
index f02081f74cc0..12949f8f68fe 100644
--- a/dev-db/phpmyadmin/phpmyadmin-2.6.0.ebuild
+++ b/dev-db/phpmyadmin/phpmyadmin-2.6.0_p2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.6.0.ebuild,v 1.1 2004/09/28 09:38:53 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.6.0_p2.ebuild,v 1.1 2004/10/13 23:17:04 twp Exp $
 
 inherit eutils webapp