Removed insecure versions from the tree (see sec issue #196237).

Package-Manager: portage-2.1.3.14

7 files changed, 20 insertions, 186 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 2253a360642b..a63e7ea4f7a7 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,11 @@
 # 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.278 2007/10/24 18:05:01 yoswink Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.279 2007/10/25 06:57:43 wrobel Exp $
+
+  25 Oct 2007; wrobel@gentoo.org
+  -files/phpmyadmin-2.11.1-issue_195707.patch, -phpmyadmin-2.10.1.ebuild,
+  -phpmyadmin-2.11.1.1.ebuild:
+  Removed insecure versions from the tree (see sec issue #196237).
 
   24 Oct 2007; Jose Luis Rivero <yoswink@gentoo.org>
   phpmyadmin-2.11.1.2.ebuild:
diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest
index 0de434d27e38..544ea5e28c76 100644
--- a/dev-db/phpmyadmin/Manifest
+++ b/dev-db/phpmyadmin/Manifest
@@ -1,7 +1,6 @@
-AUX phpmyadmin-2.11.1-issue_195707.patch 1715 RMD160 b2cc1d4a74a3db9c6ad2c02c7f0895cb660693dd SHA1 07798a193d4424cb77dca2a1bd2eb90e7bdce15d SHA256 5ec62f30209ef85deb1ede0f599cd6abc57680aa6d375366d20f7f7f4a45e2e4
-MD5 2760b6d86040da2d8b86c0cba8c4aad9 files/phpmyadmin-2.11.1-issue_195707.patch 1715
-RMD160 b2cc1d4a74a3db9c6ad2c02c7f0895cb660693dd files/phpmyadmin-2.11.1-issue_195707.patch 1715
-SHA256 5ec62f30209ef85deb1ede0f599cd6abc57680aa6d375366d20f7f7f4a45e2e4 files/phpmyadmin-2.11.1-issue_195707.patch 1715
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX postinstall-en-2.8.0.txt 1146 RMD160 bf699b21596c24f8f08be4eb53c18a3154be39a9 SHA1 f61856930f39872a3af08a43f06583468024c221 SHA256 93836b091c71c0316744b3a4b601e465a2d98d9e7b74cfa98c17aa66d4fb31d7
 MD5 1f870e1e6f56206c8b7f809df6f5f1d2 files/postinstall-en-2.8.0.txt 1146
 RMD160 bf699b21596c24f8f08be4eb53c18a3154be39a9 files/postinstall-en-2.8.0.txt 1146
@@ -10,35 +9,26 @@ AUX reconfig-2.8 329 RMD160 993162aa564ab7d37c7f32db439518c5cab9ace5 SHA1 0557bd
 MD5 cf0af0543cb29eb88163220df6f14669 files/reconfig-2.8 329
 RMD160 993162aa564ab7d37c7f32db439518c5cab9ace5 files/reconfig-2.8 329
 SHA256 526f7efb31adde131ffaff0271ea12693315c2d4e8a1f96ae4af6947815d6612 files/reconfig-2.8 329
-DIST phpMyAdmin-2.10.1-all-languages-utf-8-only.tar.bz2 2155294 RMD160 55e769c92c20c0b90e87fb4291b49b8229844fd1 SHA1 5b9037148dff9251bdf6072fc7d7992763dd0782 SHA256 78bbb7b9affb3f4671ecb1c97ebdd9338206978b3aca5653ceb5e0747ec1c8c8
-DIST phpMyAdmin-2.11.1.1-all-languages-utf-8-only.tar.bz2 2227854 RMD160 61ffb49785252f351f53db79078ddbb69cc5258a SHA1 d8a0661137b530fe1600e156f152200c59166bf7 SHA256 63b1a57dec023ced9fcaa111b91be99a92822b1203593813492aa5c73b006964
 DIST phpMyAdmin-2.11.1.2-all-languages-utf-8-only.tar.bz2 2227937 RMD160 bef6c88de88b37b729d8b83a105c7bc234d72d0b SHA1 c456913fa8e87b0b22749f0eba53815a02c448ec SHA256 fefd4b43f8f8dbfbe616f30f65e358a4fc46742dee4dd08b576d50ff8e175adc
-EBUILD phpmyadmin-2.10.1.ebuild 1807 RMD160 035696f7c6b9deed7603d8337e21811299a67dc2 SHA1 faa55f196e9b5661796a42dc6124dcbad729c277 SHA256 59d69626457577ff2677cbb4b318a0e38ea80939c8cbd2f6158cc24bd812615f
-MD5 b5c589b04147f06ad6c537439e745041 phpmyadmin-2.10.1.ebuild 1807
-RMD160 035696f7c6b9deed7603d8337e21811299a67dc2 phpmyadmin-2.10.1.ebuild 1807
-SHA256 59d69626457577ff2677cbb4b318a0e38ea80939c8cbd2f6158cc24bd812615f phpmyadmin-2.10.1.ebuild 1807
-EBUILD phpmyadmin-2.11.1.1.ebuild 1825 RMD160 96376a96ea0eea3f530bae9ac6b91de0692e8471 SHA1 5c97215d0f9776a999007b75ca0e6ea36a5dadf3 SHA256 abf453974a4182593e1e968c8488e598263777cadd1bc97d1da987a26a7571eb
-MD5 c11c7d7a15b8c12161311bab5513ab50 phpmyadmin-2.11.1.1.ebuild 1825
-RMD160 96376a96ea0eea3f530bae9ac6b91de0692e8471 phpmyadmin-2.11.1.1.ebuild 1825
-SHA256 abf453974a4182593e1e968c8488e598263777cadd1bc97d1da987a26a7571eb phpmyadmin-2.11.1.1.ebuild 1825
 EBUILD phpmyadmin-2.11.1.2.ebuild 1825 RMD160 5a5d545e9c9f3324b4567147086b645fc9985ef7 SHA1 4ea1c96ec2c38d3b124b957ba5a71e6dabcf5185 SHA256 012f387173bd8bb0d0334b6c6f217c74b7198023cf3db43330bcd1b1b8ed6998
 MD5 f29da7546c3ca8c019aa84fe02913cee phpmyadmin-2.11.1.2.ebuild 1825
 RMD160 5a5d545e9c9f3324b4567147086b645fc9985ef7 phpmyadmin-2.11.1.2.ebuild 1825
 SHA256 012f387173bd8bb0d0334b6c6f217c74b7198023cf3db43330bcd1b1b8ed6998 phpmyadmin-2.11.1.2.ebuild 1825
-MISC ChangeLog 37738 RMD160 8a3f0b758594779c4dda85849f8e3150864529af SHA1 cb7ca9958f116eb7d9f06e240bd6b68bc3ad09cf SHA256 89ae58eaa2761cd7f8d860b46c02940de00657c4b8bbee07d9617276569394b5
-MD5 37e21425f4cb662e09e449152647d56c ChangeLog 37738
-RMD160 8a3f0b758594779c4dda85849f8e3150864529af ChangeLog 37738
-SHA256 89ae58eaa2761cd7f8d860b46c02940de00657c4b8bbee07d9617276569394b5 ChangeLog 37738
+MISC ChangeLog 37943 RMD160 9f49d8e9a070bdc63478556069a7521c9265fe92 SHA1 ee5d0e5d4a08d973130c92ffce3dda02fecd402f SHA256 0c536f65a1ab0daf76e55f8d4b6be6ff1af4bda5e0fe190e8c07244c4b423c4a
+MD5 1fa492d58f45026c756253b0aa962877 ChangeLog 37943
+RMD160 9f49d8e9a070bdc63478556069a7521c9265fe92 ChangeLog 37943
+SHA256 0c536f65a1ab0daf76e55f8d4b6be6ff1af4bda5e0fe190e8c07244c4b423c4a ChangeLog 37943
 MISC metadata.xml 182 RMD160 9b377947041edce61a201266f0c982e3b7c91d8d SHA1 a6d1f4b69883a0940325b7b4ad1de261c7b8c485 SHA256 cf12fb82ad3a864f109328701bfc9b17657184fdb51c04b4af301b3322def6c1
 MD5 4bfbfdac057f18787bab530fdaf64fdf metadata.xml 182
 RMD160 9b377947041edce61a201266f0c982e3b7c91d8d metadata.xml 182
 SHA256 cf12fb82ad3a864f109328701bfc9b17657184fdb51c04b4af301b3322def6c1 metadata.xml 182
-MD5 708dac35c296ff43badb904922bb78d3 files/digest-phpmyadmin-2.10.1 334
-RMD160 4ffa5fa85d809f0630b72382dac2aa2a6bcd62e8 files/digest-phpmyadmin-2.10.1 334
-SHA256 1cd6d3dff125817c44e1cc7799443b20863e6604263ac6c5e7d5410b06c89112 files/digest-phpmyadmin-2.10.1 334
-MD5 1012b41a9078ce8017c004203e8611b5 files/digest-phpmyadmin-2.11.1.1 340
-RMD160 966849936587f7abdf4b71d07af9c3781a5388de files/digest-phpmyadmin-2.11.1.1 340
-SHA256 10eb87f0e838e766a5bf05c5cdcb4b218e291ec6a90952c8afea587b61075924 files/digest-phpmyadmin-2.11.1.1 340
 MD5 38ae9a3a5a423809bd89dc5d38fd30b9 files/digest-phpmyadmin-2.11.1.2 340
 RMD160 cac1f55da26e7fd94ac512d9e1cf6c7d4d44c78d files/digest-phpmyadmin-2.11.1.2 340
 SHA256 5e1d61c434f4ff3df75bf5b2a7ec6644dcbae76b634c7736dc87c4e96ca705da files/digest-phpmyadmin-2.11.1.2 340
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFHID5sEEcxCpcDQ74RAjbaAJ9MWJ8IQsBJG56/lqgGOb8MqU6TJgCeKahr
+tt/O1R9EGWYGaz0XcqDUZ0c=
+=8SI5
+-----END PGP SIGNATURE-----
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.10.1 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.10.1
deleted file mode 100644
index 3141c26b1626..000000000000
--- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.10.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 4426bbc1eadb43707b3a947891ae4d9e phpMyAdmin-2.10.1-all-languages-utf-8-only.tar.bz2 2155294
-RMD160 55e769c92c20c0b90e87fb4291b49b8229844fd1 phpMyAdmin-2.10.1-all-languages-utf-8-only.tar.bz2 2155294
-SHA256 78bbb7b9affb3f4671ecb1c97ebdd9338206978b3aca5653ceb5e0747ec1c8c8 phpMyAdmin-2.10.1-all-languages-utf-8-only.tar.bz2 2155294
diff --git a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.11.1.1 b/dev-db/phpmyadmin/files/digest-phpmyadmin-2.11.1.1
deleted file mode 100644
index b1bc2718d33c..000000000000
--- a/dev-db/phpmyadmin/files/digest-phpmyadmin-2.11.1.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 463502c5003ba698ef8848b25dd582a2 phpMyAdmin-2.11.1.1-all-languages-utf-8-only.tar.bz2 2227854
-RMD160 61ffb49785252f351f53db79078ddbb69cc5258a phpMyAdmin-2.11.1.1-all-languages-utf-8-only.tar.bz2 2227854
-SHA256 63b1a57dec023ced9fcaa111b91be99a92822b1203593813492aa5c73b006964 phpMyAdmin-2.11.1.1-all-languages-utf-8-only.tar.bz2 2227854
diff --git a/dev-db/phpmyadmin/files/phpmyadmin-2.11.1-issue_195707.patch b/dev-db/phpmyadmin/files/phpmyadmin-2.11.1-issue_195707.patch
deleted file mode 100644
index d9fafb8a38ec..000000000000
--- a/dev-db/phpmyadmin/files/phpmyadmin-2.11.1-issue_195707.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- trunk/phpMyAdmin/scripts/setup.php	2007/06/03 23:30:40	10420
-+++ trunk/phpMyAdmin/scripts/setup.php	2007/10/10 07:30:59	10748
-@@ -1395,7 +1395,7 @@
-                         } else {
-                             mysql_close($conn);
-                         }
--                    } else { 
-+                    } else {
-                         $socket = empty($new_server['socket']) || $new_server['connect_type'] == 'tcp' ? NULL : $new_server['socket'];
-                         $port = empty($new_server['port']) || $new_server['connect_type'] == 'socket' ? NULL : $new_server['port'];
-                         $conn = @mysqli_connect($new_server['host'], $new_server['controluser'], $new_server['controlpass'], NULL, $port, $socket);
-@@ -1951,12 +1951,16 @@
-             if (empty($_SERVER['REQUEST_URI']) || empty($_SERVER['HTTP_HOST'])) {
-                 $redir = '';
-             } else {
--                $redir = ' If your server is also configured to accept HTTPS request follow <a href="https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] . '">this link</a> to use secure connection.';
-+                $redir = ' If your server is also configured to accept HTTPS request'
-+                    . ' follow <a href="https://'
-+                    . htmlspecialchars($_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'])
-+                    . '">this link</a> to use secure connection.';
-             }
-             message('warning', 'You are not using secure connection, all data (including sensitive, like passwords) are transfered unencrypted!' . $redir, 'Not secure connection');
-         }
-         break;
- }
-+echo $_SERVER['REQUEST_URI'];
- 
- // Should we show information?
- if ($show_info) {
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.10.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.10.1.ebuild
deleted file mode 100644
index f15c45933d56..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-2.10.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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.10.1.ebuild,v 1.9 2007/05/31 21:55:39 angelos Exp $
-
-inherit eutils webapp depend.php
-
-MY_PV=${PV/_/-}
-MY_P="phpMyAdmin-${MY_PV}-all-languages-utf-8-only"
-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"
-IUSE=""
-DEPEND="sys-apps/findutils"
-S=${WORKDIR}/${MY_P}
-
-need_php
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	if ! PHPCHECKNODIE="yes" require_php_with_use crypt ctype pcre session unicode \
-		|| ! PHPCHECKNODIE="yes" require_php_with_any_use mysql mysqli ; then
-		eerror
-		eerror "${PHP_PKG} needs to be re-installed with all of the following"
-		eerror "USE flags enabled:"
-		eerror
-		eerror "ctype pcre session unicode"
-		eerror
-		eerror "as well as any of the following USE flags enabled:"
-		eerror
-		eerror "mysql or mysqli if using dev-lang/php-5"
-		eerror "mysql if using dev-lang/php-4"
-		eerror
-		die "Re-install ${PHP_PKG}"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# Remove .cvs* files and CVS directories
-	find ${S} -name .cvs\* -or \( -type d -name CVS -prune \) | xargs rm -rf
-}
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="CREDITS Documentation.txt INSTALL README RELEASE-DATE-${MY_PV} TODO ChangeLog"
-
-	dodoc ${docs}
-	dohtml Documentation.html
-
-	cp -r . ${D}${MY_HTDOCSDIR}
-
-	webapp_configfile ${MY_HTDOCSDIR}/libraries/config.default.php
-	webapp_serverowned ${MY_HTDOCSDIR}/libraries/config.default.php
-
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en-2.8.0.txt
-	webapp_hook_script ${FILESDIR}/reconfig-2.8
-	webapp_src_install
-}
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.11.1.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.11.1.1.ebuild
deleted file mode 100644
index acc34a44a067..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-2.11.1.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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.11.1.1.ebuild,v 1.4 2007/10/16 20:10:24 cla Exp $
-
-inherit eutils webapp depend.php
-
-MY_PV=${PV/_/-}
-MY_P="phpMyAdmin-${MY_PV}-all-languages-utf-8-only"
-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"
-IUSE=""
-DEPEND="sys-apps/findutils"
-S=${WORKDIR}/${MY_P}
-
-need_php
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	if ! PHPCHECKNODIE="yes" require_php_with_use crypt ctype pcre session unicode \
-		|| ! PHPCHECKNODIE="yes" require_php_with_any_use mysql mysqli ; then
-		eerror
-		eerror "${PHP_PKG} needs to be re-installed with all of the following"
-		eerror "USE flags enabled:"
-		eerror
-		eerror "ctype pcre session unicode"
-		eerror
-		eerror "as well as any of the following USE flags enabled:"
-		eerror
-		eerror "mysql or mysqli if using dev-lang/php-5"
-		eerror "mysql if using dev-lang/php-4"
-		eerror
-		die "Re-install ${PHP_PKG}"
-	fi
-}
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-	# Remove .cvs* files and CVS directories
-	find "${S}" -name .cvs\* -or \( -type d -name CVS -prune \) | xargs rm -rf
-}
-
-src_install() {
-	webapp_src_preinst
-
-	local docs="CREDITS Documentation.txt INSTALL README RELEASE-DATE-${MY_PV} TODO ChangeLog"
-
-	dodoc ${docs}
-	dohtml Documentation.html
-
-	cp -r . "${D}${MY_HTDOCSDIR}"
-
-	webapp_configfile "${MY_HTDOCSDIR}"/libraries/config.default.php
-	webapp_serverowned "${MY_HTDOCSDIR}"/libraries/config.default.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-2.8.0.txt
-	webapp_hook_script "${FILESDIR}"/reconfig-2.8
-	webapp_src_install
-}