Removing vulnerable older versions (bug #336462 et. al.)

(Portage version: 2.2_rc99/cvs/Linux x86_64)

7 files changed, 7 insertions, 243 deletions

diff --git a/dev-db/phpmyadmin/ChangeLog b/dev-db/phpmyadmin/ChangeLog
index 8a56a2d9efe5..bbce8c9d8628 100644
--- a/dev-db/phpmyadmin/ChangeLog
+++ b/dev-db/phpmyadmin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-db/phpmyadmin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.404 2010/09/14 20:59:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/ChangeLog,v 1.405 2010/10/22 17:29:20 a3li Exp $
+
+  22 Oct 2010; Alex Legler <a3li@gentoo.org> -files/reconfig-2.8,
+  -files/postinstall-en-2.8.0.txt,
+  -files/phpmyadmin-2.11.5-custom-cert.patch, -phpmyadmin-2.11.10.ebuild,
+  -phpmyadmin-3.3.5.1.ebuild, -phpmyadmin-3.3.6.ebuild:
+  Removing vulnerable older versions (bug #336462 et. al.)
 
   14 Sep 2010; Jeroen Roovers <jer@gentoo.org> phpmyadmin-3.3.7.ebuild:
   Stable for HPPA (bug #336462).
diff --git a/dev-db/phpmyadmin/files/phpmyadmin-2.11.5-custom-cert.patch b/dev-db/phpmyadmin/files/phpmyadmin-2.11.5-custom-cert.patch
deleted file mode 100644
index 9e75b8d877b0..000000000000
--- a/dev-db/phpmyadmin/files/phpmyadmin-2.11.5-custom-cert.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: phpMyAdmin-2.11.5-all-languages-utf-8-only/libraries/dbi/mysqli.dbi.lib.php
-===================================================================
---- phpMyAdmin-2.11.5-all-languages-utf-8-only.orig/libraries/dbi/mysqli.dbi.lib.php
-+++ phpMyAdmin-2.11.5-all-languages-utf-8-only/libraries/dbi/mysqli.dbi.lib.php
-@@ -97,6 +97,9 @@ function PMA_DBI_connect($user, $passwor
-     /* Optionally enable SSL */
-     if ($GLOBALS['cfg']['Server']['ssl'] && defined('MYSQLI_CLIENT_SSL')) {
-         $client_flags |= MYSQLI_CLIENT_SSL;
-+        if ($GLOBALS['cfg']['Server']['ssl-key'] && $GLOBALS['cfg']['Server']['ssl-cert'] && $GLOBALS['cfg']['Server']['ssl-ca']) {
-+            mysqli_ssl_set($link, $GLOBALS['cfg']['Server']['ssl-key'], $GLOBALS['cfg']['Server']['ssl-cert'], $GLOBALS['cfg']['Server']['ssl-ca'], null, null);
-+        }
-     }
- 
-     $return_value = @mysqli_real_connect($link, $GLOBALS['cfg']['Server']['host'], $user, $password, false, $server_port, $server_socket, $client_flags);
diff --git a/dev-db/phpmyadmin/files/postinstall-en-2.8.0.txt b/dev-db/phpmyadmin/files/postinstall-en-2.8.0.txt
deleted file mode 100644
index d297c7b46220..000000000000
--- a/dev-db/phpmyadmin/files/postinstall-en-2.8.0.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-If this is a new installation:
-
-1. Configure ${PN}:
-
-a) Create config.inc.php. You can use the web-based installer:
-
-   mkdir ${MY_INSTALLDIR}/config
-   chown ${VHOST_SERVER_UID}:${VHOST_SERVER_UID} ${MY_INSTALLDIR}/config
-
-   then go to http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/scripts/setup.php
-
-   once you've saved the configuration:
-
-   cp ${MY_INSTALLDIR}/config/config.inc.php ${MY_INSTALLDIR}/config.inc.php
-   rm -rf ${MY_INSTALLDIR}/config
-
-b) Alternatively, use an existing configuration:
-
-   cp <path to existing config.inc.php file> ${MY_INSTALLDIR}/
-
-c) Alternatively, use the sample config file:
-
-   cp ${MY_INSTALLDIR}/config.sample.inc.php ${MY_INSTALLDIR}/config.inc.php
-
-2. Be sure that the libraries/ directory is not visible. You can use the
-   provided .htaccess file.
-
-=================================================================
-
-If you are upgrading from an earlier version:
-
-1. If you are using ${PN}'s features for master/foreign tables, be sure to read
-   http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/Documentation.html#col_com
-
-   You will need to perform the ALTER TABLE step yourself.
diff --git a/dev-db/phpmyadmin/files/reconfig-2.8 b/dev-db/phpmyadmin/files/reconfig-2.8
deleted file mode 100644
index a73d90f088bf..000000000000
--- a/dev-db/phpmyadmin/files/reconfig-2.8
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-die() {
-	echo "#####"
-	echo $1
-	echo "#####"
-	exit 1
-}
-
-if [ $1 = "install" ]; then
-	cd ${MY_INSTALLDIR}/libraries
-	sed -e "s|\$cfg\['PmaAbsoluteUri'\] = '';|\$cfg\['PmaAbsoluteUri'\] = 'http://${VHOST_HOSTNAME}/${VHOST_APPDIR}';|g" -i config.default.php || die "sed failed"
-
-elif [ $1 = "clean" ]; then
-	echo $1
-fi
diff --git a/dev-db/phpmyadmin/phpmyadmin-2.11.10.ebuild b/dev-db/phpmyadmin/phpmyadmin-2.11.10.ebuild
deleted file mode 100644
index 57f54ec62df8..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-2.11.10.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-2.11.10.ebuild,v 1.8 2010/07/18 20:24:58 josejx 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 ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-need_httpd_cgi
-need_php_httpd
-
-S="${WORKDIR}"/${MY_P}
-
-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 "crypt 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
-		die "Re-install ${PHP_PKG}"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-2.11.5-custom-cert.patch
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc CREDITS Documentation.txt INSTALL README RELEASE-DATE-${MY_PV} TODO ChangeLog
-	rm -f LICENSE CREDITS INSTALL README RELEASE-DATE-${MY_PV} TODO
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	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-3.3.5.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-3.3.5.1.ebuild
deleted file mode 100644
index a23c04afb0f1..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-3.3.5.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-3.3.5.1.ebuild,v 1.6 2010/08/27 16:55:34 armin76 Exp $
-
-EAPI="2"
-
-inherit eutils webapp depend.php
-
-MY_PV=${PV/_/-}
-MY_P="phpMyAdmin-${MY_PV}-all-languages"
-
-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 ~ia64 ~ppc ~ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="
-	dev-lang/php[crypt,ctype,filter,session,unicode]
-	|| (
-		<dev-lang/php-5.3[spl,pcre]
-		>=dev-lang/php-5.3
-	)
-	|| (
-		dev-lang/php[mysqli]
-		dev-lang/php[mysql]
-	)
-"
-
-need_httpd_cgi
-need_php_httpd
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc CREDITS Documentation.txt INSTALL README RELEASE-DATE-${MY_PV} TODO ChangeLog || die
-	rm -f LICENSE CREDITS INSTALL README RELEASE-DATE-${MY_PV} TODO
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR}"/libraries/config.default.php
-	webapp_serverowned "${MY_HTDOCSDIR}"/libraries/config.default.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
-	# In recent versions, this should no longer be needed.
-	#webapp_hook_script "${FILESDIR}"/reconfig-2.8
-	webapp_src_install
-}
diff --git a/dev-db/phpmyadmin/phpmyadmin-3.3.6.ebuild b/dev-db/phpmyadmin/phpmyadmin-3.3.6.ebuild
deleted file mode 100644
index fed75492381e..000000000000
--- a/dev-db/phpmyadmin/phpmyadmin-3.3.6.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/phpmyadmin/phpmyadmin-3.3.6.ebuild,v 1.4 2010/09/06 20:58:07 ranger Exp $
-
-EAPI="2"
-
-inherit eutils webapp depend.php
-
-MY_PV=${PV/_/-}
-MY_P="phpMyAdmin-${MY_PV}-all-languages"
-
-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 ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="
-	dev-lang/php[crypt,ctype,filter,session,unicode]
-	|| (
-		<dev-lang/php-5.3[spl,pcre]
-		>=dev-lang/php-5.3
-	)
-	|| (
-		dev-lang/php[mysqli]
-		dev-lang/php[mysql]
-	)
-"
-
-need_httpd_cgi
-need_php_httpd
-
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc CREDITS Documentation.txt INSTALL README RELEASE-DATE-${MY_PV} TODO ChangeLog || die
-	rm -f LICENSE CREDITS INSTALL README RELEASE-DATE-${MY_PV} TODO
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_configfile "${MY_HTDOCSDIR}"/libraries/config.default.php
-	webapp_serverowned "${MY_HTDOCSDIR}"/libraries/config.default.php
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt
-	# In recent versions, this should no longer be needed.
-	#webapp_hook_script "${FILESDIR}"/reconfig-2.8
-	webapp_src_install
-}